consul-templaterb 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19a273b406bb2bc529957446c5555ffd0ec2792dffc05d6aeb89b26999f474a6
-  data.tar.gz: d720a5cd38cc5ce993bd952690ac893ed011c661bbdffe7830d1ab15993710a5
+  metadata.gz: 33bd9f88f8464de03e31b13fd6695197482902be5903dc51c99276085953ded1
+  data.tar.gz: 64beb3ccd7976f8b9284086ba90f5a4b0e4e168afa45d1c40b4c05639e8b8304
 SHA512:
-  metadata.gz: 056bcf7ee589aa4021ff6eaa83db44fa91fa9ef82f392165e42a06172e4a1502a23a9904cd3f46672b26ed20f707ae549fb86c51d226e90e51d8a052355509ed
-  data.tar.gz: 2a62c016f97c615e8f77b400b8bfc5f60ad0a76b64b7c147f8e03fc6dd130de672b954b8c8378ccf9fb5a829b63735c13cee97df9cef84f7397b6bdbc058396c
+  metadata.gz: 6cc8a0221ab011099c12ed257947a4fb32ba6cdae6dc216d56f199e51d4f8c62bb3b9a0b497aee8c0f2684c3f0b37fe577ffb9ac8a1bb133cf575bcc521df009
+  data.tar.gz: 0a335c9014e3563775412d1bea5487c6b7d5cff33d230a23cc6f4726762a8bbbd5a9370ed1a14e79a7a2143022662d91f0b301aa6d65488db55c9313524446ee

data/CHANGELOG.md

@@ -2,12 +2,13 @@
 
 ## (UNRELEASED)
 
-## 1.8.6 (December 19, 2018)
+## 1.8.6 / 1.8.7 (December 19, 2018)
 
 OPTIMIZATIONS:
 
  * Full rewrite of filtering of consul-timeline to allow handling
    history of 100k+ records 
+ * Various UI improvements
 
 ## 1.8.5 (December 18, 2018)
 

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.8.6'.freeze
+    VERSION = '1.8.7'.freeze
   end
 end

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

@@ -351,9 +351,15 @@ class ServiceTimeline {
                 this.buildCell(row, 'td', 'lookup checks', checksCell);
             }
             {
-                var td = this.buildCell(row, 'td', 'service-status', this.createBadge(e['old_state']));
-                td.appendChild(document.createTextNode('→'));
-                td.appendChild(this.createBadge(e['new_state']));
+                if (e.new_state == e.old_state) {
+                    var td = this.buildCell(row, 'td', 'service-status', this.createBadge(e['new_state']));
+                } else {
+                    var old = e.old_state == null ? this.createBadge('new', 'primary') : this.createBadge(e.old_state);
+                    var td = this.buildCell(row, 'td', 'service-status', old);
+                    td.appendChild(document.createTextNode('→'));
+                    var newState = (e.new_state == null) ? this.createBadge('removed', 'dark') : this.createBadge(e.new_state);
+                    td.appendChild(newState);
+                }
             }
             {
                 var nSuccess = e['stats']['passing'];

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

@@ -75,11 +75,12 @@ class RingBuffer < Array
   alias push <<
 end
 
-def diff(old, new)
+def diff(old, new_e)
   diff = OpenStruct.new
-  diff.appeared = new - old
-  diff.disappeared = old - new
-  diff.stayed = new & old
+  diff.appeared = new_e - old
+  diff.disappeared = old - new_e
+  diff.stayed = new_e & old
+  diff.all = new_e + old
   diff
 end
 
@@ -106,9 +107,9 @@ end
 def compute_checks(old_state, cur_state, service_name, instance_name)
   old_checks = old_state.dig(service_name, instance_name, 'checks') || {}
   new_checks = cur_state.dig(service_name, instance_name, 'checks') || {}
-  check_diff = diff(old_checks.keys, new_checks.keys)
+  all_checks = Set.new(old_checks.keys + new_checks.keys)
   checks = []
-  check_diff.stayed.each do |check_id|
+  all_checks.each do |check_id|
     old_status = old_state.dig(service_name, instance_name, 'checks', check_id, 'status')
     cur_status = cur_state.dig(service_name, instance_name, 'checks', check_id, 'status')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request