consul-templaterb 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f5db899f30382d8fe310ab54f5c8d7ca8c7f2a46a1dc0e1f66522d5eb6c5bf7c
-  data.tar.gz: 2b5a94664f2ab8409b1d1e763d8aca620138f11546a6c610e9baad711ad30988
+SHA1:
+  metadata.gz: 188b824f4573d3c8483b279e7e73705ee4e48628
+  data.tar.gz: 0f781084e76bfe687402ebb9c0ebce0df986cd30
 SHA512:
-  metadata.gz: 97c454b170b61ac2ec93a84aefbf006a6e90cfe0369caab1d321d1aa0e5761686036e693603a67ec051207b48665981c4e1d6c31a11d9c2ad403dfc0e7e966b5
-  data.tar.gz: 21fd3ad5e6c602a6bfc6b9edea7a85bf9415605869d5a9f13595bb23940a974d525a0b70c3c418be5959bdd4b1469a887b49d7a01797869e1e884a50801be043
+  metadata.gz: 399422eb1ec5564bbb09abf9ed3a82eb2a4647df095350928c372be06e6d6eac65c5dd251ce66bbc72a50863282333aa11bc980f2fb386de305706207055c680
+  data.tar.gz: 70b630427515451230d14a3a17ac3c44caa3e58b241aa51d51953f74722f0f5c23f66a35b7580fe37fca6806a5483295b6b0577933db52856ea612f37203251a

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## (UNRELEASED)
 
+## 1.17.1 (July 15, 2019)
+
+NEW FEATURES:
+
+ * consul-ui now supports displaying coordinates and evaluating RTT for any node
+
 ## 1.17.0 (July 15, 2019)
 
 IMPROVEMENTS:

data/bin/consul-templaterb

@@ -60,6 +60,9 @@ options = {
       '/v1/catalog/nodes': {
         min_duration: 15,    # Do not wake up before 15 seconds when node appear/disappear
       },
+      '/v1/coordinate/nodes': {
+        min_duration: 60,    # Since coordinates change a lot, refresh coordinates every 30 seconds
+      },
       '/v1/catalog/datacenters': {
         min_duration: 60,    # Datacenters are not added every minute, right?
       },

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.17.0'.freeze
+    VERSION = '1.17.1'.freeze
   end
 end

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

@@ -15,6 +15,7 @@
   services_blacklist = services_blacklist_raw.map { |v| Regexp.new(v) }  # Compute the health of a Service
 
   service_per_node = {}
+  all_coordinates = coordinate.nodes.map { |c| [c['Node'], c['Coord']] }.to_h
   services.each do |service_name, tags|
     if ! services_blacklist.any? {|r| r.match(service_name)}
       service(service_name, tag: service_tag_filter).sort {|a,b| a['Node']['Node'] <=> b['Node']['Node'] }.each do |snode|
@@ -55,6 +56,7 @@
           Service: node_services_data,
           # Only put Checks on a Node
           checks: snode["Checks"].select{|c| c['ServiceID'].empty? }.map{|c| {output: c['Output'], notes: c['Notes'], name: c['Name'], checkid: c['CheckID'], status: c['Status']}},
+          Coord: all_coordinates[node_node_data[:Name]],
         }
 
         service_per_node[snode['Node']['Node']] = node_data

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

@@ -211,6 +211,10 @@ html, body {
   display: flex;
 }
 
+.distancesButton {
+  float: right;
+}
+
 .instance-content-header h5 {
   margin-right: 10px;
 }

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

@@ -60,12 +60,99 @@ class ConsulNodes {
     })
   }
 
+  // taken from https://www.consul.io/docs/internals/coordinates.html#working-with-coordinates
+  compute_dist(a, b) {
+    var sumsq = 0.0
+    for (var i = 0; i < a.Vec.length; i++) {
+        var diff = a.Vec[i] - b.Vec[i]
+        sumsq += diff * diff
+    }
+    var rtt = Math.sqrt(sumsq) + a.Height + b.Height
+
+    // Apply the adjustment components, guarding against negatives.
+    var adjusted = rtt + a.Adjustment + b.Adjustment
+    if (adjusted > 0.0) {
+        rtt = adjusted
+    }
+
+    // Go's times are natively nanoseconds, so we convert from seconds.
+    const secondsToNanoseconds = 1.0e9
+    return rtt
+  }
+
+  compute_all_distances(instances, node) {
+    const asc = function(arr) { return arr.sort((a, b) => a - b); }
+    // sample standard deviation
+    const std = function (arr) {
+      const mu = mean(arr);
+      const diffArr = arr.map(a => (a - mu) ** 2);
+      return Math.sqrt(sum(diffArr) / (arr.length - 1));
+    };
+
+    const quantile = function(sorted, q) {
+      //const sorted = asc(arr);
+      const pos = ((sorted.length) - 1) * q;
+      //console.log("pos", pos, "for", q);
+      const base = Math.floor(pos);
+      const rest = pos - base;
+      if ((sorted[base + 1] !== undefined)) {
+          return sorted[base] + rest * (sorted[base + 1] - sorted[base]);
+      } else {
+          return sorted[base];
+      }
+    };
+
+    var sum = 0;
+    var count = 0;
+    var ret = {
+      min: 3600,
+      min_node: null,
+      max: 0,
+      max_node: null,
+    };
+    var all_values = [];
+    var myCoords = instances[node]['Coord']
+    if (myCoords == null) {
+      console.log("Coords are not defined for ", node)
+      return null;
+    } else {
+      for (var key in instances) {
+        var instance = instances[key];
+        if (key != node && instance != null && instance['Coord'] != null) {
+          count++
+          var coord = instance['Coord'];
+          if (coord != null) {
+            const rtt = this.compute_dist(myCoords, coord);
+            all_values.push(rtt);
+            if (rtt < ret.min) {
+              ret.min = rtt;
+              ret.min_node = key
+            }
+            if (rtt > ret.max) {
+              ret.max = rtt;
+              ret.max_node = key;
+            }
+            sum += rtt;
+          }
+        }
+      }
+    }
+    all_values = all_values.sort();
+    ret.avg = sum / count;
+    ret.q50 = quantile(all_values, .50);
+    ret.q90 = quantile(all_values, .90);
+    ret.q99 = quantile(all_values, .99);
+    ret.q999 = quantile(all_values, .999);
+    ret.q9999 = quantile(all_values, .9999);
+    return ret;
+  }
+
   displayInstances(instances) {
     $("#instances-list").html("");
 
     // var serviceStatus = buildServiceStatus(service);
     this.displayedCount = 0;
-
+    var nodesInfo = this;
     for (var key in instances) {
       var instance = instances[key];
 
@@ -95,6 +182,40 @@ class ConsulNodes {
       contentHead.appendChild(nodeAddressGenator(instance['Node']['Address']));
       contentHead.appendChild(nodeMetaGenerator(instance['Node']['Meta']));
       content.appendChild(contentHead);
+      var distances = document.createElement('div');
+      var distancesRefresh = document.createElement("button");
+      distancesRefresh.appendChild(document.createTextNode("Show/Hide Node Latency"));
+      distancesRefresh.setAttribute("class", "distancesButton");
+      distances.appendChild(distancesRefresh);
+      var distancesContent = document.createElement("div");
+      distances.appendChild(distancesContent);
+      (function() {
+        var nodeName = instance['Node']['Name'];
+        var distancesContentToUpdate = distancesContent;
+        var buttonToHide = $(distancesRefresh);
+        $(distancesRefresh).click(function(){
+          if (distancesContentToUpdate.children.length == 0){
+            var x = nodesInfo.compute_all_distances(instances, nodeName);
+            var dl = document.createElement(dl);
+            dl.className = 'row';
+            for (var i in x) {
+              var dt = document.createElement("dt");
+              dt.appendChild(document.createTextNode(i));
+              dt.className = 'col-sm-4';
+              dl.appendChild(dt);
+              var dd = document.createElement("dd");
+              dd.appendChild(document.createTextNode(x[i]));
+              dd.className = 'col-sm-8';
+              dl.appendChild(dd);
+            }
+            distancesContentToUpdate.appendChild(dl);
+          } else {
+            distancesContentToUpdate.innerHTML = '';
+          }
+        });
+      })();
+      content.appendChild(distances);
+      //distances.appendChild()
       var nodesChecks = document.createElement('div');
       nodesChecks.setAttribute('class','nodes-checks');
       nodesChecks.appendChild(checksStatusGenerator(instance, instance['Node']['Name']));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -242,7 +242,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language