consul-templaterb 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 875f33bec50159a51a9fb9e59b07fbe37a78a0587cb3a496cc42a1806b5c8c9d
-  data.tar.gz: 08f091608892658b875d716c6935c9fe24f19b72b0c37dcde07eee4bcbdea838
+  metadata.gz: 481677a9cb87417e3667a7a282186ad05e0580521a96b68f8c22370371e20abc
+  data.tar.gz: b70a75f66188749d2b0a0a38a51dcc8629b8fbc6554165b4241802a47864db40
 SHA512:
-  metadata.gz: 481afae4f8b4df204897584ebc0ad4559c54ea5cbdd4a693977c33a573acc67e3e726df8b55a6ed3d2506b01c82f3092d98d27208e0de51c1c2367df01447cb3
-  data.tar.gz: 361f0786469ff9c305f047824b42a8c801109ffe6c7283e0a4325c2f89c3d8dcfa989b3a52bbef982e8cc78bbad17505b2c5c2b57223b67ba0343c0c9722143a
+  metadata.gz: 3aeffc5f5fd88c284f8deeaa9b178151761a9b7e49bb79d1f352e2cd2d221b9cdb4011611009c0a24930afe190f285d25d9fc227384c33151cee8c29904fa578
+  data.tar.gz: d1831577b1359473dc0fb07702f438729c6e312c0bd29cf7f4fdcac369f896f9462ac9a7147324cf648a526615d491c219334f2bc0c1a8f52f9b3529e4e9bab1

data/CHANGELOG.md

@@ -2,15 +2,19 @@
 
 ## (UNRELEASED)
 
+## 1.3.1 (June 19, 2018)
+
+ * samples/consul-ui/ now displays Service Meta information (new in Consul 1.1)
+
 ## 1.3.0 (June 7, 2018)
 
 IMPROVEMENTS:
 
- * samples/consul-ui/ now supports keys as well as nodes thans to [@geobeau](https://github.com/geobeau)
+ * samples/consul-ui/ now supports keys as well as nodes thanks to [@geobeau](https://github.com/geobeau)
 
 NEW FEATURES
 
- * EXPERIMENTAL Vault support thanks to [@uepock](https://github.com/uepoch)
+ * EXPERIMENTAL Vault support thanks to [@uepoch](https://github.com/uepoch)
 
 BUG FIXES:
 

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.3.1'.freeze
   end
 end

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

@@ -69,14 +69,17 @@ class ConsulService {
 
       if (!!serviceStatus['passing']) {
         statuses.appendChild(createBadge('badge-success passing', serviceStatus['passing']));
+        listItem.setAttribute('status', 'passing');
       }
 
       if (!!serviceStatus['warning']) {
         statuses.appendChild(createBadge('badge-warning warning', serviceStatus['warning']));
+        listItem.setAttribute('status', 'warning');
       }
 
       if (!!serviceStatus['critical']) {
         statuses.appendChild(createBadge('badge-danger critical', serviceStatus['critical']));
+        listItem.setAttribute('status', 'critical');
       }
 
       statuses.appendChild(createBadge('badge-dark', (serviceStatus['total'] || 0)));
@@ -186,6 +189,7 @@ class ConsulService {
 
       serviceHtml.appendChild(serviceTitleGenerator(instance));
       serviceHtml.appendChild(tagsGenerator(instance.tags));
+      serviceHtml.appendChild(serviceMetaGenerator(instance.sMeta));
       serviceHtml.appendChild(checksStatusGenerator(instance.checks));
       var state = nodeState(instance.checks);
       serviceHtml.setAttribute('status', state);

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

@@ -104,6 +104,27 @@ function tagsGenerator(instanceTags) {
   return tags;
 }
 
+function serviceMetaGenerator(instanceMeta) {
+  var top = document.createElement('div');
+  top.className = 'instance-meta';
+  if (instanceMeta) {
+    var container = document.createElement('dl');
+    top.appendChild(container);
+    container.className = 'row';
+    for (var meta in instanceMeta) {
+      var metaH = document.createElement('dt');
+      metaH.className = 'col-sm-4';
+      metaH.appendChild(document.createTextNode(meta));
+      container.appendChild(metaH);
+      var metaVH = document.createElement('dd');
+      metaVH.className = 'col-sm-8';
+      metaVH.appendChild(document.createTextNode(instanceMeta[meta]));
+      container.appendChild(metaVH);
+    }
+  }
+  return top;
+}
+
 function servicesGenerator(instanceServices) {
   var services = document.createElement('div');
   services.className = 'instance-services';
@@ -238,6 +259,12 @@ function serviceMatcher(service, regex) {
       return true;
     }
   }
+
+  var sstatus = service.getAttribute('status')
+  if(sstatus && sstatus.match(regex)) {
+    return true;
+  }
+  
   return false;
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -171,7 +171,6 @@ files:
 - lib/consul/async/utilities.rb
 - lib/consul/async/vault_endpoint.rb
 - lib/consul/async/version.rb
-- null/ruby-type-inference/ruby-type-inference.mv.db
 - samples/checks.html.erb
 - samples/common/footer.html.erb
 - samples/common/header.html.erb