consul-templaterb 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd867895d0b63e9a0fdde0c9a2719549dec7dc3a
-  data.tar.gz: 98fe2a5ff52ec3d1520d316ea3efeacccc4aaaf4
+  metadata.gz: ba3e953ddc4da2445e08a84bbd39c1a309855bac
+  data.tar.gz: '08c115b11cf6006014940030fea37f68c7ece703'
 SHA512:
-  metadata.gz: 024d966c9a88484ef403e2381479d69db68f2ecf4a318a7dd62eb0b06aaf28c3bec5b6c7e32114546d61e591bd345de78b02418380cf571b6401e9479183fc6c
-  data.tar.gz: fc00d4e684443f556c490584203d40bf3eccd4939158e029cd82900238f482190fcb958a54876418594a1a21c4bacb9590b0941828e564a63dca992188136684
+  metadata.gz: f778131a4db7c8ddf4464911a8969e8dfb841ad8cbdecca5e49a3d0d15887634915c4c5b68d80b59878e1fbd47c41fa99b8dfd75234bcc2808f47392b9a4ed42
+  data.tar.gz: 9d63155dad550910c3b6b7aec5f2ab677f62cfcf0996f16daf91c060d9528df40bdbe81fee86a8a62205d136219d99e6a83004146655eeecba776b543e13382e

data/.rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
   TargetRubyVersion: 2.4
 
 Metrics/AbcSize:
-  Max: 80
+  Max: 82
 
 Metrics/BlockLength:
   Max: 145
@@ -22,13 +22,13 @@ Metrics/LineLength:
   Max: 175
 
 Metrics/MethodLength:
-  Max: 55
+  Max: 65
 
 Metrics/ParameterLists:
   Max: 12
 
 Metrics/PerceivedComplexity:
-  Max: 22
+  Max: 23
 
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## (UNRELEASED)
 
+## 1.13.0 (April 10, 2019)
+
+IMPROVEMENTS:
+
+ * On Windows, ensure a proper error message is displayed when watching more than 2048 endpoints
+ * consul-ui now allow better searches in instances, display node meta in service details, fixed display of tags on Ffx
+
 ## 1.12.0 (April 4, 2019)
 
 NEW FEATURES:

data/README.md

@@ -110,13 +110,11 @@ You can now use it directly using the binary `consul-templaterb` in your path.
 
 On Windows, a bug exists with Ruby greater than 2.4.
 
-In order to make it work, use those commands as explained in
+In order to make it work, use this commands as explained in
 https://github.com/oneclick/rubyinstaller2/issues/96#issuecomment-434619796
 
 ```
-bundle install consul-templaterb
-gem uninstall eventmachine
-gem install eventmachine --platform ruby
+gem install eventmachine consul-templaterb --platform ruby
 ```
 
 ### Playing with the samples templates
@@ -304,6 +302,7 @@ push git commits and tags, and push the `.gem` file to [rubygems.org](https://ru
 Here are the known bugs of the application:
 
 * [ ] `render_file` might create an infinite recursion if a template includes itself indirectly.
+* [ ] On Windows, the consul-templaterb cannot work with more than 2048 endpoints watched (see https://github.com/oneclick/rubyinstaller/issues/104#issuecomment-7681074)
 
 Please consult [CHANGELOG.md](CHANGELOG.md) for fixed bugs.
 

data/lib/consul/async/consul_endpoint.rb

@@ -257,7 +257,13 @@ module Consul
           http.errback do
             unless @stopping
               _handle_error(http, consul_index) do
-                ::Consul::Async::Debug.puts_error "[RETRY][#{path}] (#{@consecutive_errors} errors) due to #{http.error}" if (@consecutive_errors % 10) == 1
+                if (@consecutive_errors % 10) == 1
+                  add_msg = http.error
+                  if Gem.win_platform? && http.error.include?('unable to create new socket: Too many open files')
+                    add_msg += "\n *** Windows does not support more than 2048 watches, watch less endpoints ***"
+                  end
+                  ::Consul::Async::Debug.puts_error "[RETRY][#{path}] (#{@consecutive_errors} errors) due to #{add_msg}"
+                end
               end
             end
           end

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.12.0'.freeze
+    VERSION = '1.13.0'.freeze
   end
 end

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

@@ -14,20 +14,6 @@
   services_blacklist_raw = (ENV['EXCLUDE_SERVICES'] || 'lbl7.*,netsvc-probe.*,consul-probed.*').split(',')
   services_blacklist = services_blacklist_raw.map { |v| Regexp.new(v) }
 
-  def compute_attributes(snode)
-    w = 100
-    snode['Service']['Tags'].each do |tag|
-      match = /^weight-([1-9][0-9])*$/.match(tag)
-      w = match[1].to_i if match
-    end
-    attributes = ""
-    node_status = snode.status
-    attributes = "#{attributes} disabled" if node_status == 'critical'
-    if node_status == 'warning'
-      w = w / 8
-    end
-    attributes = "#{attributes} weight #{w}" if w.positive?
-  end
   backends = {}
   tags_per_service = {}
   services(tag: service_tag_filter).each do |service_name, tags|
@@ -45,6 +31,7 @@
     end
   end
 %><%
+  all_nodes = {}
   json_backends = {}
   backends.each_pair do |service_name, nodes|
     service = {
@@ -66,9 +53,12 @@
         checks.push(check)
       end
       meta = snode['Service']['Meta']
+      node_meta = snode['Node']['Meta'] || {}
+      node_name = snode['Node']['Node']
+      all_nodes[node_name] = { meta: node_meta } if node_name
       server = { frontend_id: "backend_http__#{service_name}",
                  id:      snode['Service']['ID'],
-                 name:    snode['Node']['Node'],
+                 name:    node_name,
                  sMeta:   meta ? meta : {},
                  connect: snode['Service']['Connect'],
                  addr:    snode.service_address,
@@ -83,5 +73,5 @@
     end
   end
   json_datacenters = datacenters.to_a
-  json = { services: json_backends, datacenters: json_datacenters, generated_at: Time.now}
+  json = { nodes: all_nodes, services: json_backends, datacenters: json_datacenters, generated_at: Time.now}
 %><%= JSON.pretty_generate(json) %>

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

@@ -3,6 +3,18 @@
    box-shadow: none;
 }
 
+.btn-outline-danger::before, .btn-danger::before{
+  content: '✖ ';
+}
+
+.btn-outline-success::before, .btn-success::before{
+  content: '✔ ';
+}
+
+.btn-outline-warning::before, .btn-warning::before{
+  content: '⚠ ';
+}
+
 #service-wrapper, #instances-wrapper, #keys-wrapper {
   overflow: scroll;
   border-top-left-radius: 0px;
@@ -202,12 +214,18 @@ html, body {
 .instance-content-header h5 {
   margin-right: 10px;
 }
-
-.meta-tags {
+.service-instance dt, .service-instance dl {
+  line-height: 1em;
+}
+.node-meta {
   text-align: right;
   flex: 2 0 0;
 }
 
+.service-instance .node-meta {
+  text-align: left;
+}
+
 #data-wrapper {
   overflow: scroll;
 }

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

@@ -96,7 +96,7 @@ class ConsulNodes {
       contentHead.setAttribute('class','instance-content-header');
       contentHead.appendChild(nodeNameGenator(instance['Node']['Name'],instance['Node']['Address']));
       contentHead.appendChild(nodeAddressGenator(instance['Node']['Address']));
-      contentHead.appendChild(nodeMetaGenator(instance['Node']['Meta']));
+      contentHead.appendChild(nodeMetaGenerator(instance['Node']['Meta']));
       content.appendChild(contentHead);
       var nodesChecks = document.createElement('div');
       nodesChecks.setAttribute('class','nodes-checks');

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

@@ -20,9 +20,9 @@ class ConsulService {
     }, 100);
   }
 
-  showTags(showTags) {
+  showTags(enableTags) {
     var stylesheet = document.getElementById('css-states');
-    stylesheet.textContent = '.service-tags { display: ' + (showTags? 'block':'none') + ';}';
+    stylesheet.textContent = '.service-tags { display: ' + (enableTags? 'block':'none') + '!important ;}';
   }
 
   showProxies(showProxies) {
@@ -239,10 +239,10 @@ class ConsulService {
     this.selectedService = source.closest('li');
     $(this.selectedService).addClass('active');
 
-    this.displayService(this.data.services[serviceName]);
+    this.displayService(this.data.services[serviceName], this.data.nodes);
   }
 
-  displayService(service) {
+  displayService(service, nodes) {
     var titleText = service['name'] + ' <a href="consul-timeline-ui.html?service=' + service['name'] + '">timeline</a>';
     $("#service-title").html(titleText);
     $("#instances-list").html("");
@@ -252,13 +252,22 @@ class ConsulService {
     for (var key in service['instances']) {
       var instance = service['instances'][key];
       var serviceHtml = document.createElement('div');
-      serviceHtml.setAttribute('class','list-group-item');
+      serviceHtml.setAttribute('class','list-group-item service-instance');
       var state = nodeState(instance.checks);
       serviceHtml.appendChild(weightsGenerator(instance.weights, state));
       serviceHtml.appendChild(serviceTitleGenerator(instance));
-      serviceHtml.appendChild(tagsGenerator(instance.tags));
+      var node_info = nodes[instance.name];
+      if (node_info != null) {
+        node_info = node_info.meta;
+        serviceHtml.appendChild(nodeMetaGenerator(node_info));
+        serviceHtml.appendChild(document.createElement('hr'));
+      }
+      if (instance.tags && instance.tags.length > 0) {
+        serviceHtml.appendChild(tagsGenerator(instance.tags));
+        serviceHtml.appendChild(document.createElement('hr'));
+      }
       serviceHtml.appendChild(serviceMetaGenerator(instance.sMeta));
-      serviceHtml.appendChild(connectGenerator(instance))
+      serviceHtml.appendChild(connectGenerator(instance));
       serviceHtml.appendChild(checksStatusGenerator(instance, instance.name));
       serviceHtml.setAttribute('status', state);
       $("#instances-list").append(serviceHtml);

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

@@ -53,12 +53,12 @@ function serviceTitleGenerator(instance) {
 
   var htmlTitle = document.createElement('h5');
   htmlTitle.setAttribute('title', 'Node Name: ' + instance.name +
-                                  '\nAddress : ' + instance.addr +
+                                  '\nAddress: ' + instance.addr +
                                   '\nService ID: ' + instance.id +
-                                  '\nService Port : ' + instance.port);
+                                  '\nService Port: ' + instance.port);
 
+  htmlTitle.setAttribute('class',  'instance-name');
   var instanceLink = document.createElement('a');
-  instanceLink.setAttribute('class',  'instance-name');
   var appendPort = "";
   if (instance.port > 0) {
     appendPort = ':' + instance.port;
@@ -70,6 +70,8 @@ function serviceTitleGenerator(instance) {
 
   instanceLink.appendChild(document.createTextNode(instance.name + appendPort));
   htmlTitle.appendChild(instanceLink);
+  htmlTitle.appendChild(document.createTextNode(' '));
+  htmlTitle.appendChild(document.createTextNode(instance.addr));
 
   return htmlTitle;
 }
@@ -93,20 +95,21 @@ function nodeNameGenator(nodename, nodeaddr) {
 
 function nodeAddressGenator(nodeaddr) {
   var htmlAddress = document.createElement('h5');
-  htmlAddress.className = 'instance-addr';
+  htmlAddress.className = 'instance-addr lookup';
   htmlAddress.appendChild(document.createTextNode(nodeaddr));
   return htmlAddress;
 }
 
-function nodeMetaGenator(nodeMetaTags) {
+function nodeMetaGenerator(nodeMetaTags) {
   var metaTags = document.createElement('div');
-  metaTags.className = 'meta-tags';
+  metaTags.setAttribute('title', 'Node Meta')
+  metaTags.className = 'node-meta';
   for (var tagKey in nodeMetaTags) {
     if(!nodeMetaTags[tagKey]) {
       continue;
     }
     var metaTag = document.createElement('span');
-    metaTag.setAttribute('class', 'badge badge-primary mx-1');
+    metaTag.setAttribute('class', 'badge badge-primary mx-1 lookup');
     metaTag.appendChild(document.createTextNode(tagKey + ':' + nodeMetaTags[tagKey]));
     metaTags.appendChild(metaTag);
   }
@@ -117,11 +120,10 @@ function tagsGenerator(instanceTags) {
   var tags = document.createElement('div');
 
   tags.className = 'instance-tags';
-  tags.appendChild(document.createTextNode("Tags: "));
-  tags.appendChild(document.createElement('br'));
+  tags.setAttribute('title', 'Tags of Service');
   for (var tagKey in instanceTags) {
     var tag = document.createElement('span');
-    tag.setAttribute('class', 'badge badge-secondary mx-1');
+    tag.setAttribute('class', 'badge badge-secondary mx-1 lookup');
     tag.appendChild(document.createTextNode(instanceTags[tagKey]));
     tags.appendChild(tag);
   }
@@ -160,11 +162,11 @@ function serviceMetaGenerator(instanceMeta) {
     container.className = 'row';
     for (var meta in instanceMeta) {
       var metaH = document.createElement('dt');
-      metaH.className = 'col-sm-4';
+      metaH.className = 'col-sm-4 lookup';
       metaH.appendChild(document.createTextNode(meta));
       container.appendChild(metaH);
       var metaVH = document.createElement('dd');
-      metaVH.className = 'col-sm-8';
+      metaVH.className = 'col-sm-8 lookup';
       metaVH.appendChild(document.createTextNode(instanceMeta[meta]));
       container.appendChild(metaVH);
     }
@@ -216,7 +218,7 @@ function servicesGenerator(instanceServices) {
     var service = document.createElement('a');
     var serviceName = instanceServices[serviceKey]['Service']['Service'];
     var servicePort = instanceServices[serviceKey]['Service']['Port'];
-    service.setAttribute('class', 'btn btn-sm m-1');
+    service.setAttribute('class', 'btn btn-sm m-1 lookup');
     service.setAttribute('target', '_blank');
     nodeAddr = instanceServices[serviceKey]['Service']['Address'];
     service.setAttribute('href', 'http://' + nodeAddr + ':' + servicePort);
@@ -231,8 +233,7 @@ function checksStatusGenerator(instance, prefix) {
   var instanceChecks = instance.checks;
   var checks = document.createElement('div');
   checks.className = 'checks';
-  checks.appendChild(document.createTextNode("Checks: "));
-  checks.appendChild(document.createElement('br'));
+  checks.setAttribute('title', 'Checks of Node/Service')
 
   for (var checkKey in instanceChecks) {
     var checkInstance = instanceChecks[checkKey];
@@ -354,19 +355,22 @@ function keyMatcher(service, regex) {
   }
 }
 
+function hasMatches(instance, regex) {
+  var toLookup = instance.getElementsByClassName('lookup');
+  for (var i = 0 ; i < toLookup.length; i++) {
+    if(toLookup[i].innerHTML.match(regex)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 function instanceMatcher(instance, regex) {
   if(instance.getElementsByClassName('instance-name')[0].innerHTML.match(regex)) {
     return true;
   }
 
-  var tags = instance.getElementsByClassName('instance-tags')[0].getElementsByClassName('badge');
-
-  for (var i=0; i < tags.length; i++) {
-    if(tags[i].innerHTML.match(regex)) {
-      return true;
-    }
-  }
-  return false;
+  return hasMatches(instance, regex);
 }
 
 function nodeMatcher(instance, regex) {
@@ -375,23 +379,7 @@ function nodeMatcher(instance, regex) {
       return true;
     }
 
-    if(instance.getElementsByClassName('instance-addr')[0].innerHTML.match(regex)) {
-      return true;
-    }
-
-    var metaTags = instance.getElementsByClassName('meta-tags')[0].getElementsByClassName('badge');
-    for (var i=0; i < metaTags.length; i++) {
-      if(metaTags[i].innerHTML.match(regex)) {
-        return true;
-      }
-    }
-
-    var services = instance.getElementsByClassName('instance-services')[0].getElementsByClassName('btn');
-    for (var i=0; i < services.length; i++) {
-      if(services[i].innerHTML.match(regex)) {
-        return true;
-      }
-    }
+    return hasMatches(instance, regex);
 }
 
 function getTagsNode(node) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request