consul-templaterb 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a08b64a111c5cf2ceeca1568dbd94d7c5e60bcc31b4cd72aa6277324d79a6bc5
-  data.tar.gz: da25a0959dce3230625c495c219f9617044481d362bd9b05e0949f908f6e73a8
+  metadata.gz: 0660de439be86195cbc03b72cddeb6f0f0c29d8118687c1c6dab05fc63d48a40
+  data.tar.gz: 00a7db6827d322cbdb11148e5bf96a532306a7dbfdebc3df44c097dc8c6b38e2
 SHA512:
-  metadata.gz: 95771fbfe7302884d595d819e95aa408f09a1f63e3fe8d3ecb457d09541b07605d6eb32dcb00f4502f3340b8a4703fcbfbcc30a79ce7a71da4ac5f25c47bfab5
-  data.tar.gz: 1ccf48e196c9c50d59f7e432a8b29b06b097422b1771b7adfab29e2e722c97da8ef0a1119ea780ce72ebb3ade169d327096616bff5c85b452affd98c1cc67ac9
+  metadata.gz: d2d8d2f30722f75bcf69b4b5d8076358dae1ea420c5bd38a541c6d70afaad90b413cda8234b798791a595108a7f0a2b62b5ba6becfd9523832cb3de326174d71
+  data.tar.gz: 73b881286ce0b45b27dd9bcf485b86d5af0091d37cdc995845ef77d0edefbab657a0197651dd63592e9f529f026f7e468b3d03f724bcdb046430ac1340e301dc

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## (UNRELEASED)
 
+## 1.6.1 (December 4, 2018)
+
+BUG FIXES:
+
+ * In consul-ui, display the port only when port is set
+
 ## 1.6.0 (November 23, 2018)
 
 BUG FIXES:
@@ -15,6 +21,7 @@ NEW FEATURES:
      * `status` to compute aggregated status of a service taking into account all checks
      * `weights` to deal with weights added in Consul 1.2.3
      * `current_weight` to deal with weight computed using the current status
+ * Added new option `-g` for disabling GZIP compression
 
 ## 1.5.9 (November 17, 2018)
 

data/README.md

@@ -232,6 +232,7 @@ examples:
 8. [Generate HaProxy Configuration](samples/ha_proxy.cfg.erb)
 9. [Export Consul Statistics to Prometheus](samples/metrics.erb) : count all services, their state,
    datacenters and nodes and export it to prometheus easily to trigger alerts.
+10. [List all services/Nodes with their statuses for all datacenters](samples/all_services.txt.erb)
 
 If you want to test it quickly, you might try with (assuming your consul agent is listening on
 `http://localhost:8500`):

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.6.0'.freeze
+    VERSION = '1.6.1'.freeze
   end
 end

data/samples/all_services.txt.erb

@@ -0,0 +1,52 @@
+ __________________________________________________________________
+|  DC   | Services |______________Instances________________| Nodes |
+|       |          | Passing | Warning | Critic  |  Total  |       |
+|-------+----------+---------+---------+---------+---------+-------|
+<%
+  # This template list all instances on all DCs
+  # And aggregates a list of Services, Services Instances/status
+  # And nodes.
+  require 'set'
+  num_services={}
+  num_instances={}
+  all_states = ['passing', 'warning', 'critical', 'total']
+  distinct_services=Set.new
+  datacenters().each do |dc|
+    num_services[dc] = 0
+    num_instances[dc] = {
+      'passing'  => 0,
+      'warning'  => 0,
+      'critical' => 0,
+      'total'    => 0
+    }
+    services(dc:dc).each do |service_name, tags|
+      distinct_services.add(service_name)
+      num_services[dc]+=1
+      service(service_name, dc:dc).each do |snode|
+        num_instances[dc][snode.status]+=1
+        num_instances[dc]['total']+=1
+      end 
+    end
+  end
+  num_instances_total={
+    'passing'  => 0,
+    'warning'  => 0,
+    'critical' => 0,
+    'total'    => 0
+  }
+  num_nodes_total=0
+  num_services.each do |dc, num_services_for_dc|
+    all_states.each do |s|
+      num_instances_total[s] += num_instances[dc][s]
+    end
+    num_nodes=nodes(dc:dc).count
+    num_nodes_total+=num_nodes
+%>| <%= dc.rjust(5) %> | <%= num_services_for_dc.to_s.rjust(8) %> |<% all_states.each do |status|
+%> <%= num_instances[dc][status].to_s.rjust(7) %> |<% end %> <%= num_nodes.to_s.rjust(5) %> |
+<%
+  end
+%>|-------+----------+---------+---------+---------+---------+-------|
+| TOTAL | <%= distinct_services.count.to_s.rjust(8) %> |<% all_states.each do |status|
+%> <%= num_instances_total[status].to_s.rjust(7) %> |<%
+end %> <%= num_nodes_total.to_s.rjust(5) %> |
+'_______|__________|_________|_________|_________|_________|_______'

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

@@ -83,8 +83,7 @@ class ConsulService {
       var service = this.data.services[serviceName];
       var serviceStatus = buildServiceStatus(service);
 
-      var listItem = document.createElement('button');
-      listItem.setAttribute('type','button');
+      var listItem = document.createElement('li');
       listItem.setAttribute('onfocus','consulService.onClickServiceName(this)');
       listItem.setAttribute('onclick','consulService.onClickServiceName(this)');
       listItem.setAttribute('value',serviceName);
@@ -229,7 +228,7 @@ class ConsulService {
       $(this.selectedService).removeClass('active');
     }
     var serviceName = $(source).find(".service-name").html()
-    this.selectedService = source.closest( "button" );
+    this.selectedService = source.closest('li');
     $(this.selectedService).addClass('active');
 
     this.displayService(this.data.services[serviceName]);

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

@@ -40,11 +40,16 @@ function serviceTitleGenerator(instance) {
 
   var instanceLink = document.createElement('a');
   instanceLink.setAttribute('class',  'instance-name');
+  var appendPort = "";
+  if (instance.port > 0) {
+    appendPort = ':' + instance.port;
+  }
   if (protocol != null) {
-    instanceLink.setAttribute('href',  protocol + instance.addr + ':' + instance.port);
+    instanceLink.setAttribute('href',  protocol + instance.addr + appendPort);
     instanceLink.setAttribute('target',  '_blank');
   }
-  instanceLink.appendChild(document.createTextNode(instance.name + ':' + instance.port));
+
+  instanceLink.appendChild(document.createTextNode(instance.name + appendPort));
   htmlTitle.appendChild(instanceLink);
 
   return htmlTitle;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -170,6 +170,7 @@ files:
 - lib/consul/async/utilities.rb
 - lib/consul/async/vault_endpoint.rb
 - lib/consul/async/version.rb
+- samples/all_services.txt.erb
 - samples/checks.html.erb
 - samples/common/footer.html.erb
 - samples/common/header.html.erb