consul-templaterb 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83bfcb16049d06171fd6afff4cb98b4e77975c4cbe26051f40841c39ee8cf2d0
-  data.tar.gz: 5c333846e58764c0a79384a89211eefe1d3e78b8b1335037cab11d221c496fb1
+  metadata.gz: 3f41bf7bc42201458abf40795cba80f42f871464d1c40a9e5617e109f37ee54d
+  data.tar.gz: 6efd87a693e69e426c3c58fca95778a0d10ed07380c9d98cb62d9c69fcc11800
 SHA512:
-  metadata.gz: 990c9be97cfc552a6c90588b12ab5fadf13b52ef738edab07aeb3833afa58641fc74bf96e4d34281b2a6932df7fba5d45bb496c447c4000363aa4ad2ceb9fbc7
-  data.tar.gz: b09e6aadc2872d17cdc32b622d6154786b060180488007c782f92902e224f5bf83a3074925e99cf2d6762cda4e30ef07997b32c2dca3f8e0614056ac00ccb14a
+  metadata.gz: bf254e910bb560f414d1740a09445f796c83ca3cf89a597940d8068c0ef717bd646cb5ef226c4e871661863e881c78d7dda63f473ef5c71310fb80151f225be1
+  data.tar.gz: 416ee5c54b94a719fabd516355b0adc495ab3b80f351c75b8283a18a3ab73f8794e5081e6b9eab4d3f8a480cfae22732961fd3a938a9c1c10c2f2eaa7dc4d8fb

data/CHANGELOG.md

@@ -4,7 +4,13 @@
 
 IMPROVEMENTS:
 
-## 1.1.0
+## 1.1.1 (May 15, 2018)
+
+IMPROVEMENTS:
+ * Use 60 seconds of cleanup to avoid over-cleaning up endpoints
+ * Use same environment variables to filter services in nodes.html.erb
+
+## 1.1.0 (May 12, 2018)
 
 BUG FIXES:
 

data/lib/consul/async/consul_template.rb

@@ -171,7 +171,7 @@ module Consul
           else
             not_ready << endpt.endpoint.path
           end
-          to_cleanup << endpoint_key if (@iteration - endpt.seen_at) > 10
+          to_cleanup << endpoint_key if (@iteration - endpt.seen_at) > 60
         end
         if not_ready.count.positive?
           STDERR.print "[INFO] Waiting for data from #{not_ready.count}/#{not_ready.count + ready} endpoints: #{not_ready[0..2]}..."

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

data/samples/nodes.html.erb

@@ -1,10 +1,16 @@
 <%= render_file('common/header.html.erb', title: 'Nodes') %><%
+service_tag_filter = ENV['SERVICES_TAG_FILTER'] || nil
+# Services to hide
+services_blacklist = (ENV['EXCLUDE_SERVICES'] || 'consul-agent-http,mesos-slave,mesos-agent-watcher,mesos-exporter-slave').split(',')
+
 service_per_node = {}
 services.each do |service_name, tags|
-  service(service_name, tag:'http').sort {|a,b| a['Node']['Node'] <=> b['Node']['Node'] }.each do |snode|
-  node_services = service_per_node[snode['Node']['Node']] || []
-  node_services.push(snode)
-  service_per_node[snode['Node']['Node']] = node_services
+  if !services_blacklist.include? service_name
+    service(service_name, tag: service_tag_filter).sort {|a,b| a['Node']['Node'] <=> b['Node']['Node'] }.each do |snode|
+      node_services = service_per_node[snode['Node']['Node']] || []
+      node_services.push(snode)
+      service_per_node[snode['Node']['Node']] = node_services
+    end
   end
 end %>
 

metadata

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