consul-templaterb 1.9.6 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d97e523ed7d46b52d6f8076263af42d649f01f74085d5ae58a613cf38ab14e31
-  data.tar.gz: 99255a8e34cae9c05d685f88df56452b77b939d99c6c0b0d48fa3b2156e40457
+  metadata.gz: 8362a90f73e7dfef755f1daeba28b350b62951f3ddaf795eb3449f6b7f489be6
+  data.tar.gz: 57d7df6ab6061ef40349698d3a7ac8eab02d7f7fbf84a5c22fa9e89e88a72771
 SHA512:
-  metadata.gz: b6c10ccb302c52e4c97d5b7620b6123cbbca69abe720b8ef2764fbc30fd449ea5fc89412ad9bf7ade0de3c8f12b67dcb5d6058159cf3db212bf452c6efaa9067
-  data.tar.gz: 168bf127d58cff2c48de8cddda29b6eeac7d113563c61b15dea881fbfb2339e46b69734ad681ba6d3298d50a548b87707faea3d506ce9188f7580de321126b8f
+  metadata.gz: d0ebfdef413617a55914847a798123a5541fcec5968e88967fb8919fb9ab0005d7ed2c29972bf5de71cd36764bec6c013fc4943e095f83fde22f4edcfc06a85b
+  data.tar.gz: 5de05990e69ec4c009990728233288b09ea22c32181fe441fbfd11e52c93d831c08ce5be87fd55a0666070e2992a250e55c9f2ac878fb77f800283b61334cbec

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## (UNRELEASED)
 
+## 1.9.7 (January 15, 2019)
+
+IMPROVEMENTS:
+
+ * `timeline.json.erb` now uses `CONSUL_TIMELINE_BLACKLIST` environment variable
+   to blacklist services to be hidden from timeline.
+
 ## 1.9.6 (January 15, 2019)
 
 BUGFIX:

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.9.6'.freeze
+    VERSION = '1.9.7'.freeze
   end
 end

data/samples/consul-ui/README.md

@@ -62,8 +62,9 @@ Will generate index.html and consul_template.json in your directory, so you migh
 
 This app supports the following environment variables:
 
-* SERVICES_TAG_FILTER: basic tag filter for service (default HTTP)
-* INSTANCE_MUST_TAG: Second level of filtering (optional, default to SERVICES_TAG_FILTER)
-* INSTANCE_EXCLUDE_TAG: Exclude instances having the given tag (default: canary)
-* EXCLUDE_SERVICES: comma-separated services to exclude (default: consul-agent-http,mesos-slave,mesos-agent-watcher)
-* CONSUL_TIMELINE_BUFFER: number of entries to keep in the timeline. 1000 by default.
+* `SERVICES_TAG_FILTER`: basic tag filter for service (default HTTP)
+* `INSTANCE_MUST_TAG`: Second level of filtering (optional, default to SERVICES_TAG_FILTER)
+* `INSTANCE_EXCLUDE_TAG`: Exclude instances having the given tag (default: canary)
+* `EXCLUDE_SERVICES`: comma-separated services to exclude (default: consul-agent-http,mesos-slave,mesos-agent-watcher)
+* `CONSUL_TIMELINE_BUFFER`: number of entries to keep in the timeline. 1000 by default.
+* `CONSUL_TIMELINE_BLACKLIST`: regexp of services to hide from timeline

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

@@ -2,12 +2,15 @@
 require 'json'
 require 'set'
 services_blacklist = (ENV['EXCLUDE_SERVICES'] || 'consul-agent-http,mesos-slave,mesos-agent-watcher,mesos-exporter-slave').split(',')
+timeline_blacklist = ENV['CONSUL_TIMELINE_BLACKLIST'] || '(lbl7-.*|netsvc-.*)'
+timeline_blacklist = Regexp.new(timeline_blacklist)
 
 @current_time = Time.now.utc.iso8601
 @last_service_info = {}
 @newest_index = 0 unless @newest_index
 cur_state = services.map do |service_name, _tags|
   next if services_blacklist.include?(service_name)
+  next if timeline_blacklist.match(service_name)
 
   snodes = service(service_name)
   cur_stats = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7
 platform: ruby
 authors:
 - SRE Core Services