consul-templaterb 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc502021c589486d5467570135c409154b48de0829358bc0f5a261c93cb4bf83
-  data.tar.gz: 77d2214c3b8d4db64d28911f76d7f4148f0e54aa00a504f116f0b06ed7d227fd
+  metadata.gz: 66b33121c7949683986ddb7ff40573e6110ff98294bca01b944e9aa268a2dc66
+  data.tar.gz: e309df0ebc89ecf50c5e4c18733a1f617ba0f1714845822215c8a8871f335b42
 SHA512:
-  metadata.gz: 730e29b4453d6e6b298bc2b1b3b5d57b39ccf6d88231b84ac60fe04998ca131a5294d450219f7432f7de80813de8ee32c279ed11d88547fe11a7926122136920
-  data.tar.gz: 9b8fe26cee53f5417418ce9574e076fc3ffc40a2a61f9f211cd516bfcb591d5fd146ec7b664fd86d8170fc6d25e6eef3c8c964e7e2fbe52ca1bc8468bd7a081b
+  metadata.gz: e127b2aa026380d0acad164fc2263582609940e09d2554fdfb468bc63b4be1821f58124299e29d4e83dec42a2c16c62138a9828d728a4c89af63063dd1adb42a
+  data.tar.gz: b23008ed571d5172177332dbaf848db958bfedbbacfeeb7f7f01a056f753bfa8d047552ad8e9870e350caf328879fc6c105eb676c1ef5089a8a44c760b903972

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## (UNRELEASED)
 
+## 1.5.1 (September 4, 2018)
+
+BUG FIXES:
+
+ * fixed non valid regexp lookups in Consul-UI
+
+IMPROVEMENTS:
+
+ * Added Support for Consul Connect in Consul-UI
+
 ## 1.5.0 (August 17, 2018)
 
 IMPROVEMENTS:

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.5.0'.freeze
+    VERSION = '1.5.1'.freeze
   end
 end

data/samples/consul-ui/consul-services-ui.html.erb

@@ -5,14 +5,20 @@
       <div class="row mx-0">
         <div id="filter-menu" class="col-4 col-m-3 px-4 pt-4">
           <div class="form-group">
-            <div class="form-check">
+            <div class="form-check form-check-inline">
               <label class="form-check-label">
                 <input id="showTagsInList" type="checkbox" title="show tags" onclick="consulService.showTags(this.checked)" class="form-check-input" />
                 Show Tags
               </label>
             </div>
+            <div class="form-check form-check-inline">
+              <label class="form-check-label">
+                <input id="showProxiesInList" type="checkbox" title="show Consul Connect Proxies" onclick="consulService.showProxies(this.checked)" class="form-check-input" />
+                Show Connect Proxies
+              </label>
+            </div>
             <div class="input-group">
-            <input id="service-filter" type="text" placeholder="filter services by name or tags" class="form-control" />
+              <input id="service-filter" type="text" placeholder="filter services by name or tags" class="form-control" />
               <div class="input-group-append">
                 <span class="input-group-text" id="service-counter"></span>
               </div>
@@ -50,5 +56,6 @@
   <script type="text/javascript">
     consulService = new ConsulService('<%= datasource %>','<%= refresh %>');
   </script>
+  <script src="vendors/highlight/highlight.pack.js"></script>
   </body>
 </html>

data/samples/consul-ui/consul_services.json.erb

@@ -82,11 +82,14 @@
                  id:      snode['Service']['ID'],
                  name:    snode['Node']['Node'],
                  sMeta:   meta ? meta : {},
+                 connect: snode['Service']['Connect'],
                  addr:    snode.service_address,
                  port:    snode['Service']['Port'],
                  tags:    snode['Service']['Tags'],
                  checks:  checks,
       }
+      kind_of_service = snode['Service']['Kind']
+      service['kind'] = kind_of_service if kind_of_service
       service[:instances] << server
     end
   end

data/samples/consul-ui/css/style.css

@@ -151,3 +151,11 @@ pre, code {
   height: 100%;
   margin-bottom: 0px;
 }
+
+.connect-enabled{
+  float:right;
+  border: 1px #ccc solid;
+}
+.connect-disabled{
+  display: none;
+}

data/samples/consul-ui/js/service.js

@@ -11,7 +11,12 @@ class ConsulService {
     this.filterStatus = null;
     this.serviceFilterCounter = $("#service-counter");
     this.serviceFilterCount = 0;
-    this.showTags($('#showTagsInList').checked)
+    this.showProxiesInList = false;
+    var cs = this
+    window.setTimeout(function(){
+      cs.showTags($('#showTagsInList:checked').length > 0);
+      cs.showProxies($('#showProxiesInList:checked').length > 0);
+    }, 100);
   }
 
   showTags(showTags) {
@@ -19,6 +24,14 @@ class ConsulService {
     stylesheet.textContent = '.service-tags { display: ' + (showTags? 'block':'none') + ';}';
   }
 
+  showProxies(showProxies) {
+    if (showProxies != this.showProxiesInList) {
+      this.showProxiesInList = showProxies;
+      console.log("showProxies:= "+this.showProxiesInList+", reloading list")
+      this.reloadServiceList();
+    }
+  }
+
   fetchRessource() {
     $.ajax({url: this.ressourceURL, cache: false, dataType: "json", sourceObject: this, success: function(result){
       consulService.initRessource(result);
@@ -57,6 +70,9 @@ class ConsulService {
   }
 
   reloadServiceList() {
+    if (!this.data || !this.data.services) {
+      console.log("No data to display");
+    }
     this.serviceList.html('');
     this.serviceFilterCount = 0;
     for (var serviceName in this.data.services) {
@@ -68,7 +84,7 @@ class ConsulService {
       listItem.setAttribute('onfocus','consulService.onClickServiceName(this)');
       listItem.setAttribute('onclick','consulService.onClickServiceName(this)');
       listItem.setAttribute('value',serviceName);
-      listItem.setAttribute('class','list-group-item list-group-item-action');
+      var listItemClass = 'list-group-item list-group-item-action';
 
       var statuses = document.createElement('div');
       statuses.setAttribute('class','statuses float-right');
@@ -90,6 +106,14 @@ class ConsulService {
 
       statuses.appendChild(createBadge('badge-dark', (serviceStatus['total'] || 0)));
       listItem.appendChild(statuses);
+      if (!!service['kind']) {
+        var kind = document.createElement('div');
+        kind.setAttribute('class','kind float-right');
+        kind.appendChild(createBadge('badge-info kind', service['kind']));
+        listItem.appendChild(kind);
+        listItemClass+= " kind-" + service['kind'];
+      }
+      listItem.setAttribute('class', listItemClass);
 
       var serviceNameItem = document.createElement('div');
       serviceNameItem.setAttribute('class', 'service-name');
@@ -113,11 +137,20 @@ class ConsulService {
   }
 
   filterService() {
-    var filter = new RegExp(consulService.serviceFilter.val());
+    var filter;
+    var serviceVal = consulService.serviceFilter.val();
+    try {
+      filter = new RegExp(serviceVal);
+    } catch (e) {
+      var safeReg = serviceVal.replace(/[-[\]{}()*+?.,\\^$|]/g, "\\$&")
+      console.log("Failed to compile regexp for '" + serviceVal + "', using strict lookup due to: " + e);
+      filter = new RegExp(safeReg);
+    }
     consulService.serviceFilterCount = 0;
+    var showProxiesInList = this.showProxiesInList;
     consulService.serviceList.children('button').each(function (){
       var ui = $(this);
-      if(serviceMatcher(this, filter)) {
+      if(serviceMatcher(this, filter, showProxiesInList)) {
         ui.removeClass('d-none');
         ui.addClass('d-block');
         consulService.serviceFilterCount += 1;
@@ -196,6 +229,7 @@ class ConsulService {
       serviceHtml.appendChild(serviceTitleGenerator(instance));
       serviceHtml.appendChild(tagsGenerator(instance.tags));
       serviceHtml.appendChild(serviceMetaGenerator(instance.sMeta));
+      serviceHtml.appendChild(connectGenerator(instance))
       serviceHtml.appendChild(checksStatusGenerator(instance.checks));
       var state = nodeState(instance.checks);
       serviceHtml.setAttribute('status', state);
@@ -212,6 +246,9 @@ class ConsulService {
     resizeWrapper('instances-wrapper', 'instances-list');
     $('#instances-list .list-group-item').resize(resizeAll);
     this.filterInstances();
+    $('pre code').each(function(i, block) {
+      hljs.highlightBlock(block);
+    });
   }
 }
 

data/samples/consul-ui/js/utils.js

@@ -104,6 +104,29 @@ function tagsGenerator(instanceTags) {
   return tags;
 }
 
+function connectGenerator(instance) {
+  var connectItem = document.createElement('div');
+  var connectValue = instance['connect']
+  if (connectValue != null && connectValue["Proxy"]) {
+    connectItem.setAttribute('class', 'connect-enabled');
+    var badge = document.createElement("span");
+    badge.setAttribute("class", "badge badge-primary");
+    badge.appendChild(document.createTextNode("Consul Connect Enabled"));
+    connectItem.appendChild(badge);
+    var content = document.createElement("pre");
+    content.setAttribute("class", "connect-data");
+    var code = document.createElement("code");
+    code.setAttribute("class", "connect-source");
+    code.appendChild(document.createTextNode(JSON.stringify(connectValue)));
+    content.appendChild(code);
+    connectItem.appendChild(content);
+    return connectItem;
+  } else {
+    connectItem.setAttribute('class', 'connect-disabled');
+  }
+  return connectItem
+}
+
 function serviceMetaGenerator(instanceMeta) {
   var top = document.createElement('div');
   top.className = 'instance-meta';
@@ -248,8 +271,11 @@ function createBadge(classes, data) {
   return badge;
 }
 
-function serviceMatcher(service, regex) {
+function serviceMatcher(service, regex, showProxiesInList) {
   if(service.getElementsByClassName('service-name')[0].innerHTML.match(regex)) {
+    if(!showProxiesInList && service.classList.contains('kind-connect-proxy')){
+      return false;
+    }
     return true;
   }
   var tags = service.getElementsByClassName('service-tags')[0].getElementsByClassName('badge');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request