consul-templaterb 1.31.0 → 1.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0929b48d32c3a556bff69053efcb0f239ee7cc18b39907c71ae1309bebeabbb
-  data.tar.gz: f6a8130e754621e9603a11cbbbc0963c67ef043b5578c35944ed6a26f9e59d3e
+  metadata.gz: f5d188151cdf2f004d4993cc5620ad86ce8632e2de820ca6498d37ce8acbd4c9
+  data.tar.gz: 6469c2b6d1a9032bb16fdfbe53b062a2271e3a787dcc0f52bb0e749c081081e4
 SHA512:
-  metadata.gz: 643d665507cd9a633dffdc741f4d643a55a0c4acaefc7feb08396f95383f491dd8d1917f3264b49a04cc67d258efa8dee58a7bc50d7fe74b440fbad74877c36b
-  data.tar.gz: dfe3a05334f0d65216b5973ea9f5716c983ce6d428751243991d8708781d9b95ff19404fba886f83df711563b2c46a3850a06f391b7a26c2ec82a7987df046fa
+  metadata.gz: 498a5282930d98afe30840f8f167559783aafa7d17b9a902ff8950dac5727d8496c666d0dea01d10ac59cfe4e845ca5664ded482b16641d4723f3edd5fa9053a
+  data.tar.gz: a2526b83b9083275b6d1057948d80457f8ea4aede46201b15408fe331a329430d6785f8372339b8c2e139da2f1fe96c13a699d4b6c936f98d411c26b797413c2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.31.1 (Jan 25, 2021)
+
+IMPROVEMENTS:
+
+* Use Node.Meta.fqdn to display node names in timeline if set
+
 ## 1.31.0 (Jan 18, 2021)
 
 IMPROVEMENTS:

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.31.0'.freeze
+    VERSION = '1.31.1'.freeze
   end
 end

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

@@ -434,7 +434,7 @@ class ServiceTimeline {
             }
             var text = e.instance;
             if (e.instance_info && e.instance_info.node) {
-                text = e.instance_info.node;
+                text = e.instance_info.fqdn;
                 if (e.instance_info.port > 0) {
                     text += ":" + e.instance_info.port
                 }

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

@@ -41,10 +41,12 @@ cur_state = services.map do |service_name, _tags|
       mindex = chk['ModifyIndex'] || 0
       mod_index = mindex if mod_index < mindex
     end
-    ["#{instance['Node']['Node']}:#{instance['Service']['ID']}",
+    node_name = instance['Node']['Node']
+    ["#{node_name}:#{instance['Service']['ID']}",
      {
        'address' => instance.service_address,
-       'node' => instance['Node']['Node'],
+       'node' => node_name,
+       'fqdn' => instance.node_meta['fqdn'] || node_name,
        'port' => instance['Service']['Port'],
        'idx'  => mod_index || cur_index,
        'status' => instance.status,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.31.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request