consul-templaterb 1.18.3 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b12634693cd840c5981486ee1f2daef7b2d6a35ef3df18d726653a23d1d68a1
-  data.tar.gz: efad7e3762bf953e5029c3ddc2aa9fa8de5d06728d482f0af0679af69ad49c12
+  metadata.gz: 0dc3089b2ac9f444e1b9b0d01e1f0615db553d441fec27cfb957f9971ecd4e5e
+  data.tar.gz: 14695f0f6de3dd032aaf15316b5136e695f3ec61e1879592379515419431771e
 SHA512:
-  metadata.gz: 17b0e0a59eb862d07946543bbfc170ac827ffdcdfb1c28e691e03352678abc30b7f195241fa311b66a05c263d42606bcb76d86a49445136d0ec3f7643e4cfafd
-  data.tar.gz: dd427f30e6f07cbd908cf1bab8bfd262c4fabd468dabc41fb5502264df8980813f8d40f9257fc02f4b39f14ca835368778bd375539c110734fb04d9a969f2094
+  metadata.gz: 8b9f4fdbd637ad60ddb4de4068db591d851e342e91717587ec773e4351de6b58ed11cdee8f5452345f41061d397bc613621d4994e737a6701459dd9c4ea7887a
+  data.tar.gz: 2c455c1fd909169d491387bb05be7d19fffe90ba3660788dc6135d2e905fc8a8a10bd1b1e8c640b875918db24efdd41f3d588cbff81025c3ea2b10e8666ea40f

data/.gitignore

@@ -12,6 +12,8 @@
 /samples/**/*.html
 /samples/**/*.txt
 /samples/**/*.cfg
+/samples/hosts
+/samples/hosts_per_services
 /samples/prometheus_consul_coordinates
 /samples/ready
 /samples/render_template_from_kv

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## (UNRELEASED)
 
+## 1.18.4
+
+IMPROVEMENTS:
+
+* `samples/metrics.erb` now export prometheus tag containing service.kind, can
+  be used to group/ignore services with connect enabled
+* Better support for filtering Connect proxies in service list in consul-ui
+* Added new samples `samples/hosts*` samples to generate /etc/hosts files
+
 ## 1.18.3 (September 2, 2019)
 
 BUGFIX:

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.18.3'.freeze
+    VERSION = '1.18.4'.freeze
   end
 end

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

@@ -172,7 +172,7 @@ class ConsulService {
       filter = new RegExp(safeReg);
     }
     consulService.serviceFilterCount = 0;
-    var showProxiesInList = this.showProxiesInList;
+    var showProxiesInList = consulService.showProxiesInList;
     consulService.serviceList.children('.serviceListItem').each(function (){
       var ui = $(this);
       if(serviceMatcher(this, filter, showProxiesInList)) {

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

@@ -282,7 +282,7 @@ class ServiceTimeline {
           console.log("Failed to compile regexp for '" + serviceVal + "', using strict lookup due to: " + e);
           filter = new RegExp(safeReg);
         }
-        var showProxiesInList = this.showProxiesInList;
+        var showProxiesInList = serviceTimeline.showProxiesInList;
         serviceTimeline.serviceList.children('.serviceListItem').each(function (){
           var ui = $(this);
           if(this.getElementsByClassName('service-name')[0].innerHTML == 'All' || this.getElementsByClassName('service-name')[0].innerHTML.match(filter)) {

data/samples/hosts.erb

@@ -0,0 +1,28 @@
+# If you export HOSTS_FOR_ALL_DCS, then your /etc/hosts will contain
+# all consul registered nodes for all DCs, otherwise, only local
+# nodes will be dumped
+# This file is auto-generated and generates a suitable /etc/hosts
+127.0.0.1       localhost localhost.localdomain
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+<%
+dcs = if ENV['HOSTS_FOR_ALL_DCS']
+        datacenters
+      else
+        # Only for local DC
+        [nil]
+      end
+dcs.each do |current_dc|
+  nodes(dc: current_dc).each do |snode|
+%><%= snode['Address'] %>	<%= snode['Node'] %>
+<%
+  end
+end
+%>

data/samples/hosts_per_services.erb

@@ -0,0 +1,49 @@
+<%
+# This template generate a file suitable to use as an /etc/hosts file
+# by populating it with all the service address of nodes
+#
+# This template can be configure the following way with environment variables
+# Environment variables to filter services/instances
+#   SERVICES_MATCH_FILTER: regexp to filter services (default: .*)
+#   SERVICES_TAG_FILTER: basic tag filter for service (default: all services)
+#   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 regexps to exclude (default: lbl7.*,netsvc-probe.*,consul-probed.*)
+
+  services_match_filter = Regexp.new(ENV['SERVICES_MATCH_FILTER'] || '.*')
+  service_tag_filter = ENV['SERVICES_TAG_FILTER'] || nil
+  instance_must_tag = ENV['INSTANCE_MUST_TAG'] || service_tag_filter
+  instance_exclude_tag = ENV['INSTANCE_EXCLUDE_TAG']
+
+  # Services to hide
+  services_blacklist_raw = (ENV['EXCLUDE_SERVICES'] || 'lbl7.*,netsvc-probe.*,consul-probed.*').split(',')
+  services_blacklist = services_blacklist_raw.map { |v| Regexp.new(v) }
+%>
+# This file is auto-generated and generates a suitable /etc/hosts
+127.0.0.1       localhost localhost.localdomain
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+<%
+  all_nodes = {}
+  services(tag: service_tag_filter).each do |service_name, tags|
+    if services_match_filter.match(service_name) && !services_blacklist.any? {|r| r.match(service_name)} && (instance_must_tag.nil? || tags.include?(instance_must_tag))
+      service(service_name).each do |snode|
+        tags_of_instance = snode['Service']['Tags']
+        if (instance_must_tag.nil? || tags_of_instance.include?(instance_must_tag)) && !tags_of_instance.include?(instance_exclude_tag)
+          # This is gonna exclude sync tools such as consul-k8s setting external-source
+          all_nodes[snode['Node']['Node']] = snode['Node']['Address'] unless snode.service_or_node_meta_value('external-source')
+        end
+      end
+    end
+  end
+%><%
+  all_nodes.keys.sort.each do |node_name|
+%><%= node_name %>  <%= all_nodes[node_name] %>
+<% end %>

data/samples/metrics.erb

@@ -29,6 +29,8 @@
       srv.each do |snode|
         key = "#{snode['Service']['Service']}"
         metas = {}
+        service_kind = snode['Service']['Kind']
+        metas['__service_kind'] = service_kind if service_kind
         service_metas_to_export.each do |k|
           meta = snode.service_or_node_meta_value(k)
           if meta

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.18.4
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -225,6 +225,8 @@ files:
 - samples/debug/compare_connect_services.txt.erb
 - samples/ha_proxy.cfg.erb
 - samples/haproxy_dns.cfg.erb
+- samples/hosts.erb
+- samples/hosts_per_services.erb
 - samples/keys.html.erb
 - samples/kv_yaml_to_json.json.erb
 - samples/list_ruby_versions_from_rubygems.txt.erb
@@ -261,7 +263,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language