consul-templaterb 1.27.0 → 1.28.2

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.27.0'.freeze
+    VERSION = '1.28.2'.freeze
   end
 end

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

@@ -15,6 +15,10 @@
   content: '⚠ ';
 }
 
+.btn-outline-success a:hover, .btn-outline-warning a:hover, .btn-outline-danger a:hover{
+  color: #fff;
+}
+
 #service-wrapper, #instances-wrapper, #keys-wrapper {
   overflow-y: scroll;
   border-top-left-radius: 0px;

data/samples/consul-ui/decorators.js.erb

@@ -36,6 +36,13 @@ function usefullLinksGenerator(instance, serviceName, node_meta_info) {
     return top;
 }
 
+/**
+ * createNodeDisplayElement resolves and displays the node name.
+ */
+function createNodeDisplayElement(nodeName, nodemeta) {
+  return document.createTextNode(nodeName);
+}
+
 /**
  * serviceInstanceDecorator is called to decorate an instance.
  */

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

@@ -71,7 +71,7 @@ class NodeMainSelector extends MainSelector {
         content.setAttribute('class', 'instance-content');
         var contentHead = document.createElement('div');
         contentHead.setAttribute('class', 'instance-content-header');
-        contentHead.appendChild(nodeNameGenator(node['Node']['Name'], node['Node']['Address']));
+        contentHead.appendChild(nodeNameGenator(node['Node']));
         contentHead.appendChild(nodeAddressGenator(node['Node']['Address']));
         contentHead.appendChild(nodeMetaGenerator(node['Node']['Meta']));
         content.appendChild(contentHead);
@@ -111,7 +111,7 @@ class NodeMainSelector extends MainSelector {
         nodesChecks.appendChild(checksStatusGenerator(node, node['Node']['Name']));
         content.appendChild(nodesChecks);
 
-        content.appendChild(servicesGenerator(node['Service']));
+        content.appendChild(servicesGenerator(node['Service'], node));
         content.appendChild(tagsGenerator(getTagsNode(node)));
 
         sidebar.setAttribute('status', state);

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

@@ -304,8 +304,8 @@ class ServiceMainSelector extends MainSelector {
         element.setAttribute("class", "list-group-item service-instance");
         var state = nodeState(instance.checks);
         element.appendChild(weightsGenerator(instance.weights, state));
-        element.appendChild(serviceTitleGenerator(instance));
         var node_info = this.nodes[instance.name];
+        element.appendChild(serviceTitleGenerator(instance, serviceName, node_info));
         if (node_info != null) {
             node_info = node_info.meta;
             element.appendChild(nodeMetaGenerator(node_info, instance.sMeta));

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

@@ -63,7 +63,7 @@ function nodeState(checks) {
 
 supported_protocols = ['https', 'http', 'sftp', 'ftp', 'ssh', 'telnet']
 
-function serviceTitleGenerator(instance) {
+function serviceTitleGenerator(instance, serviceName, node_info) {
     var protocol = null;
     for (i in supported_protocols) {
         var protoc = supported_protocols[i]
@@ -74,10 +74,6 @@ function serviceTitleGenerator(instance) {
     }
 
     var htmlTitle = document.createElement('h5');
-    htmlTitle.setAttribute('title', 'Node Name: ' + instance.name +
-        '\nAddress: ' + instance.addr +
-        '\nService ID: ' + instance.id +
-        '\nService Port: ' + instance.port);
 
     htmlTitle.setAttribute('class', 'instance-name');
     var instanceLink = document.createElement('a');
@@ -90,7 +86,19 @@ function serviceTitleGenerator(instance) {
         instanceLink.setAttribute('target', '_blank');
     }
 
-    instanceLink.appendChild(document.createTextNode(instance.name + appendPort));
+    var nodemeta = (node_info != null) ? node_info.meta : null; 
+    instanceLink.appendChild(createNodeDisplayElement(instance.name, nodemeta));
+    instanceLink.appendChild(document.createTextNode(appendPort));
+
+    const nodeInfo = document.createElement('a');
+    nodeInfo.appendChild(document.createTextNode('\u24D8'));
+    nodeInfo.setAttribute('title', 'Click to see details of Node: ' + instance.name +
+        '\nAddress: ' + instance.addr +
+        '\nService ID: ' + instance.id +
+        '\nService Port: ' + instance.port);
+    nodeInfo.setAttribute('href', 'consul-nodes-ui.html?node_filter=^' + encodeURIComponent(instance.name) + '$');
+    htmlTitle.appendChild(nodeInfo);
+    htmlTitle.appendChild(document.createTextNode(' '));
     htmlTitle.appendChild(instanceLink);
     htmlTitle.appendChild(document.createTextNode(' '));
     htmlTitle.appendChild(document.createTextNode(instance.addr));
@@ -98,7 +106,7 @@ function serviceTitleGenerator(instance) {
     return htmlTitle;
 }
 
-function nodeNameGenator(nodename, nodeaddr) {
+function nodeNameGenator(node) {
     var protocol = 'ssh://'
 
     var htmlTitle = document.createElement('h5');
@@ -106,10 +114,10 @@ function nodeNameGenator(nodename, nodeaddr) {
     var instanceLink = document.createElement('a');
     instanceLink.setAttribute('class', 'instance-name');
     if (protocol != null) {
-        instanceLink.setAttribute('href', protocol + nodeaddr);
+        instanceLink.setAttribute('href', protocol + node['Address']);
         instanceLink.setAttribute('target', '_blank');
     }
-    instanceLink.appendChild(document.createTextNode(nodename));
+    instanceLink.appendChild(createNodeDisplayElement(node['Name'], node['Meta']));
     htmlTitle.appendChild(instanceLink);
 
     return htmlTitle;
@@ -216,24 +224,44 @@ function toCSSClass(state) {
     return state;
 }
 
-function servicesGenerator(instanceServices) {
-    var services = document.createElement('div');
-    services.className = 'instance-services';
-    services.appendChild(document.createTextNode("Services: "));
-    services.appendChild(document.createElement('br'));
+function servicesGenerator(instanceServices, node) {
+    var servicesTop = document.createElement('div');
+    servicesTop.className = 'instance-services';
+    const card = document.createElement('div');
+    card.setAttribute('class', 'card');
+    const servicesCard = document.createElement('div');
+    servicesCard.setAttribute('class', 'card-body');
+    const title = document.createElement('h5');
+    title.appendChild(document.createTextNode('Services'));
+    title.setAttribute('class', 'card-title')
+    servicesCard.appendChild(title);
+    const services = document.createElement('div');
+    servicesCard.appendChild(services);
     for (var serviceKey in instanceServices) {
-        var service = document.createElement('a');
-        var serviceName = instanceServices[serviceKey]['Service']['Service'];
+        const serviceGrp = document.createElement('span');
+        serviceGrp.setAttribute('class', 'btn btn-sm');
+        serviceGrp.classList.add('btn-outline-' + toCSSClass(nodeState(instanceServices[serviceKey]['Checks'])))
+        const service = document.createElement('a');
+        serviceGrp.appendChild(service);
+        const serviceName = instanceServices[serviceKey]['Service']['Service'];
+        service.setAttribute('class', 'serviceLink');
+        service.setAttribute('href', 'consul-services-ui.html?service=' + encodeURIComponent(serviceName) + '&node_filter=^' + encodeURIComponent(node['Node']['Name'])+'$');
+        service.appendChild(document.createTextNode(serviceName));
         var servicePort = instanceServices[serviceKey]['Service']['Port'];
-        service.setAttribute('class', 'btn btn-sm m-1 lookup');
-        service.setAttribute('target', '_blank');
-        nodeAddr = instanceServices[serviceKey]['Service']['Address'];
-        service.setAttribute('href', 'http://' + nodeAddr + ':' + servicePort);
-        service.classList.add('btn-outline-' + toCSSClass(nodeState(instanceServices[serviceKey]['Checks'])))
-        service.appendChild(document.createTextNode(serviceName + ':' + servicePort));
-        services.appendChild(service);
+        if (servicePort) {
+            // Add unbreakable space
+            serviceGrp.appendChild(document.createTextNode('\u00A0'));
+            const servicePortElem = document.createElement('a');
+            servicePortElem.setAttribute('class', 'serviceTargetPort');
+            const nodeAddr = instanceServices[serviceKey]['Service']['Address'];
+            servicePortElem.setAttribute('href', 'http://' + nodeAddr + ':' + servicePort);
+            servicePortElem.appendChild(document.createTextNode(':' + servicePort));
+            serviceGrp.appendChild(servicePortElem);
+        }
+        services.appendChild(serviceGrp);
     }
-    return services;
+    servicesTop.appendChild(servicesCard);
+    return servicesTop;
 }
 
 function checksStatusGenerator(instance, prefix) {

data/samples/prometheus_datacenter_coordinates.erb

@@ -0,0 +1,56 @@
+# HELP consul_wan_servers_rtt_seconds Min Round trip with other servers of DC
+# TYPE consul_wan_servers_rtt_seconds gauge
+<%
+# This computes the RTT over WAN for all DCs
+results = {'min' => {}, 'max' => {}, 'p50' => {}, 'p90' => {}}
+my_dcname = (agent_self['Config'] || {})['Datacenter']
+my_dc = coordinate.datacenters.select { |d| d['Datacenter'] == my_dcname }.first
+
+def percentile(values_sorted, percentile)
+  k = (percentile*(values_sorted.length-1)+1).floor - 1
+  f = (percentile*(values_sorted.length-1)+1).modulo(1)
+  return values_sorted[k] + (f * (values_sorted[k+1] - values_sorted[k]))
+end
+
+if my_dc
+  from = my_dc['Datacenter']
+  coordinate.datacenters.each do |dc_coords|  
+    min = Float::MAX
+    max = 0
+    rtts = []
+    dc_coords['Coordinates'].each do |s2|
+      my_dc['Coordinates'].each do |s1|
+        rtt = coordinate.rtt(s1['Coord'], s2['Coord'])
+        min = rtt if rtt < min
+        max = rtt if rtt > max
+        idx = rtts.bsearch_index { |x| x > rtt }
+        if idx.nil?
+          rtts << rtt
+        else
+          rtts = rtts.insert(idx, rtt)
+        end
+%>
+consul_wan_servers_rtt_seconds{from="<%= from %>",to="<%= dc_coords['Datacenter'] %>",from_node="<%= s1['Node'] %>",to_node="<%= s2['Node'] %>"} <%= rtt.round(3) %><%
+      end
+    end
+    results['min'][dc_coords['Datacenter']] = min
+    results['max'][dc_coords['Datacenter']] = max
+    results['p50'][dc_coords['Datacenter']] = percentile(rtts, 0.5)
+    results['p90'][dc_coords['Datacenter']] = percentile(rtts, 0.9)
+  end
+
+  # Now, we iterate over aggregated results, type is min, max...
+  results.each do |type, res_type|
+  %>
+
+# HELP consul_wan_dc_<%= type %>_seconds <%= type %> round trip with other DCs
+# TYPE consul_wan_dc_<%= type %>_seconds gauge
+<%
+    # Iterate over destinations
+    res_type.each do |dst, val|
+%>consul_wan_dc_<%= type %>_seconds{from="<%= my_dcname %>",to="<%= dst %>"} <%= val.round(3) %>
+<%
+    end
+  end
+end
+%>

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.28.2
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,58 +98,58 @@ dependencies:
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: rubocop-junit-formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 description: A ruby implementation of Consul Template with support of erb templating
   with hi-performance on large clusters and advanced process management features.
 email:
@@ -162,28 +162,10 @@ extra_rdoc_files:
 - CHANGELOG.md
 - TemplateAPI.md
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby_app"
-- ".travis.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- Dockerfile
-- Gemfile
-- INTERNALS.md
-- LICENSE.txt
 - README.md
-- Rakefile
 - TemplateAPI.md
 - bin/consul-templaterb
-- consul-templaterb.gemspec
-- docker-nginx-conf/nginx.conf
-- docs/article-06_Template-based_discovery_with_consul-templaterb.md
-- docs/images/consul-templaterb.png
-- docs/images/consul-templaterb.svg
-- docs/images/consul-ui_001.png
 - lib/consul/async/consul_endpoint.rb
 - lib/consul/async/consul_template.rb
 - lib/consul/async/consul_template_engine.rb
@@ -242,6 +224,7 @@ files:
 - samples/members.json.erb
 - samples/metrics.erb
 - samples/prometheus_consul_coordinates.erb
+- samples/prometheus_datacenter_coordinates.erb
 - samples/render_template_from_kv.erb
 - samples/sample_keys.html.erb
 - samples/service_checks_metrics.erb
@@ -251,7 +234,7 @@ files:
 - samples/vault-ldap.txt.erb
 homepage: https://rubygems.org/gems/consul-templaterb
 licenses:
-- Apache v2
+- Apache-2.0
 metadata:
   bug_tracker_uri: https://github.com/criteo/consul-templaterb/issues
   changelog_uri: https://github.com/criteo/consul-templaterb/blob/master/CHANGELOG.md
@@ -272,8 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language