consul-templaterb 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66b33121c7949683986ddb7ff40573e6110ff98294bca01b944e9aa268a2dc66
-  data.tar.gz: e309df0ebc89ecf50c5e4c18733a1f617ba0f1714845822215c8a8871f335b42
+  metadata.gz: 0b4a47eabba659837253d921211008b5e44d625f6b0229d38da9dfbdfe2570b4
+  data.tar.gz: 5bfae8c915b2a263f6f5e3d9867f48e1b43abb6a7bcba5e31754efdb5a6c905b
 SHA512:
-  metadata.gz: e127b2aa026380d0acad164fc2263582609940e09d2554fdfb468bc63b4be1821f58124299e29d4e83dec42a2c16c62138a9828d728a4c89af63063dd1adb42a
-  data.tar.gz: b23008ed571d5172177332dbaf848db958bfedbbacfeeb7f7f01a056f753bfa8d047552ad8e9870e350caf328879fc6c105eb676c1ef5089a8a44c760b903972
+  metadata.gz: e6f34ac0190a98f5a27e1250a2c8c4aa7c49687857337e83ac7cd02bd4c3659e367e821805cec08625ad42a797419018d707fdccdede1a15bf879a259d346e86
+  data.tar.gz: aef9aaa4acab258920984b042333e1190a49f50d0ec67f0e4c86613e1adcc908c7899dce9922da2395e3efb07404e5be32e887d66ee3d89790d861298fc64db0

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## (UNRELEASED)
 
+## 1.5.2 (September 12, 2018)
+
+IMPROVEMENTS:
+
+ * added support for Weights in Consul-UI
+ * new `debug/compare_connect_services.txt.erb`
+ * new erb .map() function to iterate over all values
+
 ## 1.5.1 (September 4, 2018)
 
 BUG FIXES:

data/lib/consul/async/consul_template.rb

@@ -255,7 +255,7 @@ module Consul
 
     class ConsulTemplateAbstract
       extend Forwardable
-      def_delegators :result_delegate, :each, :[], :sort, :select, :each_value, :count, :empty?
+      def_delegators :result_delegate, :each, :[], :sort, :select, :each_value, :count, :empty?, :map
       attr_reader :result, :endpoint, :seen_at
       def initialize(consul_endpoint)
         @endpoint = consul_endpoint

data/lib/consul/async/version.rb

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

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

@@ -87,6 +87,7 @@
                  port:    snode['Service']['Port'],
                  tags:    snode['Service']['Tags'],
                  checks:  checks,
+                 weights: snode['Service']['Weights'],
       }
       kind_of_service = snode['Service']['Kind']
       service['kind'] = kind_of_service if kind_of_service

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

@@ -18,6 +18,10 @@
   overflow: hidden;
 }
 
+.weights {
+  float: right;
+}
+
 #service-wrapper .list-group-item:last-child, #instances-wrapper .list-group-item:last-child,
 #keys-wrapper .list-group-item:last-child {
   border-bottom-width: 0px;

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

@@ -225,13 +225,13 @@ class ConsulService {
       var instance = service['instances'][key];
       var serviceHtml = document.createElement('div');
       serviceHtml.setAttribute('class','list-group-item');
-
+      var state = nodeState(instance.checks);
+      serviceHtml.appendChild(weightsGenerator(instance.weights, state));
       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);
       $("#instances-list").append(serviceHtml);
     }

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

@@ -148,6 +148,41 @@ function serviceMetaGenerator(instanceMeta) {
   return top;
 }
 
+function weightsGenerator(instanceWeights, instanceStatus) {
+  var weights = document.createElement('div');
+  if (instanceWeights != null) {
+    weights.setAttribute('class', 'weights weight-passing badge badge-' + toCSSClass(instanceStatus));
+    weights.appendChild(document.createTextNode("Weights: "));
+    {
+      var passing = document.createElement("span");
+      passing.setAttribute("class", "weight-passing badge badge-success");
+      passing.appendChild(document.createTextNode(instanceWeights['Passing']));
+      passing.setAttribute('title', "DNS Weight when in warning state")
+      weights.appendChild(passing);
+    }
+    weights.appendChild(document.createTextNode(' '));
+    {
+      var warning = document.createElement("span");
+      warning.setAttribute("class", "weight-warning badge badge-warning");
+      warning.setAttribute('title', "DNS Weight when in warning state")
+      warning.appendChild(document.createTextNode(instanceWeights['Warning']));
+      weights.appendChild(warning);
+    }
+    return weights;
+  } else {
+    weights.setAttribute('class', 'weights-absent');
+  }
+  return weights
+}
+
+function toCSSClass(state) {
+  switch(state) {
+    case 'passing': return 'success';
+    case 'critical': return 'danger';
+  }
+  return state;
+}
+
 function servicesGenerator(instanceServices) {
   var services = document.createElement('div');
   services.className = 'instance-services';
@@ -161,11 +196,7 @@ function servicesGenerator(instanceServices) {
     service.setAttribute('target', '_blank');
     nodeAddr = instanceServices[serviceKey]['Service']['Address'];
     service.setAttribute('href', 'http://' + nodeAddr + ':' + servicePort);
-    switch(nodeState(instanceServices[serviceKey]['Checks'])) {
-        case 'passing': service.classList.add('btn-outline-success'); break;
-        case 'warning': service.classList.add('btn-outline-warning'); break;
-        case 'critical': service.classList.add('btn-outline-danger'); break;
-    }
+    service.classList.add('btn-outline-'+toCSSClass(nodeState(instanceServices[serviceKey]['Checks'])))
     service.appendChild(document.createTextNode(serviceName + ':' + servicePort));
     services.appendChild(service);
   }
@@ -180,11 +211,7 @@ function checksStatusGenerator(instanceChecks) {
 
   for (var checkKey in instanceChecks) {
     checkId = Math.floor(Math.random()*10000);
-    switch(instanceChecks[checkKey]['status']) {
-      case 'passing': var btn = 'btn-success'; break;
-      case 'warning': var btn = 'btn-warning'; break;
-      case 'critical': var btn = 'btn-danger'; break;
-    }
+    var btn = 'btn-' + toCSSClass(instanceChecks[checkKey]['status'])
     var check = document.createElement('div');
 
     var btnCheck = document.createElement('button');

data/samples/debug/compare_connect_services.txt.erb

@@ -0,0 +1,32 @@
++ List of all datacenters
+-------------------------
+# This template compares the number of proxies with the number of services
+# Following https://github.com/hashicorp/consul/issues/4648
+<%
+  dammaged_nodes = []
+  datacenters.each do |dc|
+    services(dc: dc).each do |service_name, tags|
+      if service_name.end_with? '-proxy'
+        num_proxies = service(service_name, dc:dc).count
+        service_name_non_proxy = service_name[0..-7]
+        num_services = service(service_name_non_proxy, dc:dc).count
+        message = '[  OK  ]'
+        instance_proxies = service(service_name, dc:dc).map{ |snode| snode['Node']['Node'] + "::" + snode['Service']['ID'][0..-8] }.sort
+        instance_services = service(service_name_non_proxy, dc:dc).map{ |snode| snode['Node']['Node'] + "::" + snode['Service']['ID'] }.sort
+        diff = instance_proxies - instance_services
+        if diff.count > 0
+          message = "[FAILED] (DIFF:= #{diff.inspect} not in #{instance_services.inspect})"
+          dammaged_nodes += diff.map{|k| k[0..k.index('::')]}
+        end
+%><%= message %> <%= dc %> <%= service_name_non_proxy %>  (<%= num_proxies %> / <%= num_services %>)
+<%
+    end
+  end
+end
+%>
+List of dammaged_nodes
+======================
+<%
+dammaged_nodes.uniq.each do |n|
+%> <%= n %>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -196,6 +196,7 @@ files:
 - samples/criteo/haproxy.cfg.erb
 - samples/criteo_choregraphies.html.erb
 - samples/criteo_choregraphies.txt.erb
+- samples/debug/compare_connect_services.txt.erb
 - samples/ha_proxy.cfg.erb
 - samples/keys.html.erb
 - samples/nodes.html.erb