consul-templaterb 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b78e19b82cfe21d36bd7985cfb3676bf6eb4adf
-  data.tar.gz: 03fc0513a55921094d962be1f6ec9ae730058244
+  metadata.gz: 265b3062a39b78eaa45775583d748de5c349ac21
+  data.tar.gz: ad53bb875e0dabdf005c1081cd28b42c5e482bc5
 SHA512:
-  metadata.gz: 9991598e1ca634be45e4239b5a279e37dce68413d293a64d68d7b028e103ff0a68895721e92c96adb742bdf623c2184b83fbd2852f44bffb0934fd198be562c2
-  data.tar.gz: c4f9c73248c2c3fcfe170f5dd2a183585400a2ac2bf6f8ee4bdf57a9b5dfcd42d5059eba20af88fbf682706aced1d3fd284da1441f1f6b6d422669665ae63549
+  metadata.gz: a87af9eb230325e5d9f1f032e97e078c9ef2365e5ade766818eafd97dfdce9d537c1a2961a26aa50d8a0086ccc55ec20bbb7224dc5dd773486844dc4ceafcb11
+  data.tar.gz: d09545ef6d131b6324c198a9eca24fea15a10a58fbce25da44a97e68b31726a5372929cd606cba35d2c2674927c986c88ef2e54d9407ea7df44038d7f761f7d3

data/CHANGELOG.md

@@ -2,7 +2,20 @@
 
 ## (UNRELEASED)
 
-## 1.15.1 (May 14, 2019)
+## 1.15.2 (June 12, 2019)
+
+IMPROVEMENTS
+
+`samples/metrics.erb` can now output metrics with labels for services with any kind of
+service/node meta. You can tune output of prometheus labels with the environment
+variable `PROMETHEUS_EXPORTED_SERVICE_META` which contains the keys separated by
+commas to extract from Service.Meta or Node.Meta.
+
+Using `PROMETHEUS_EXPORTED_SERVICE_META='version,os'` would add prometheus labels
+version="xx",os="linux" on instances having those metadata on service or nodes when
+meta is available.
+
+## 1.15.1 (May 23, 2019)
 
 IMPROVEMENTS
 

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.15.1'.freeze
+    VERSION = '1.15.2'.freeze
   end
 end

data/samples/all_services.txt.erb

@@ -7,6 +7,11 @@
   # And aggregates a list of Services, Services Instances/status
   # And nodes.
   require 'set'
+
+  # Services to hide
+  services_blacklist_raw = (ENV['EXCLUDE_SERVICES'] || '.*netsvc-probe.*,.*consul-probed.*').split(',')
+  services_blacklist = services_blacklist_raw.map { |v| Regexp.new(v) }
+
   num_services={}
   num_instances={}
   all_states = ['passing', 'warning', 'critical', 'total']
@@ -20,6 +25,7 @@
       'total'    => 0
     }
     services(dc:dc).each do |service_name, tags|
+      next if services_blacklist.any? {|r| r.match(service_name)}
       distinct_services.add(service_name)
       num_services[dc]+=1
       service(service_name, dc:dc).each do |snode|

data/samples/metrics.erb

@@ -5,7 +5,9 @@
 #   INSTANCE_MUST_TAG: Second level of filtering (optional, default to SERVICES_TAG_FILTER)
 #   INSTANCE_EXCLUDE_TAG: Exclude instances having the given tag
 #   EXCLUDE_SERVICES: comma-separated services regexps to exclude (example: lbl7.*,netsvc-probe.*,consul-probed.*)
+#   PROMETHEUS_EXPORTED_SERVICE_META: comma-separated list of meta to export into metrics of service
 <%
+  service_metas_to_export = (ENV['PROMETHEUS_EXPORTED_SERVICE_META'] || 'version,os,criteo_flavor').split(',')
 
   service_tag_filter = ENV['SERVICES_TAG_FILTER'] || nil
   instance_must_tag = ENV['INSTANCE_MUST_TAG'] || service_tag_filter
@@ -16,24 +18,42 @@
   services_blacklist = services_blacklist_raw.map { |v| Regexp.new(v) }
 
   backends = {}
+  all_stats = {}
   service_count = 0
+
   services(tag: service_tag_filter).each do |service_name, tags|
     if !services_blacklist.any? {|r| r.match(service_name)} && (instance_must_tag.nil? || tags.include?(instance_must_tag))
       service_count += 1
-      res = {
-        'passing'  => 0,
-        'warning'  => 0,
-        'critical' => 0,
-      }
       srv = service(service_name)
+      all_stats[service_name] = srv.endpoint.stats
       srv.each do |snode|
+        key = "#{snode['Service']['Service']}"
+        metas = {}
+        service_metas_to_export.each do |k|
+          meta = nil
+          meta = snode['Service']['Meta'][k] if snode['Service']['Meta']
+          meta = snode['Node']['Meta'][k] if !meta && snode['Node']['Meta']
+          if meta
+            key += "::#{k}=#{meta}"
+            metas[k] = meta
+          end
+        end
+        back = backends[key]
+        if back.nil?
+          back = {
+            metas: metas,
+            service_name: service_name,
+            state: {
+              'passing'  => 0,
+              'warning'  => 0,
+              'critical' => 0,
+            }
+          }
+          backends[key] = back
+        end
         state = snode.status
-        res[state] += 1
+        back[:state][state] += 1
       end
-      backends[service_name] = {
-        state: res,
-        stats: srv.endpoint.stats,
-      }
     end
   end
 %>
@@ -73,21 +93,29 @@ end
 <%
   json_backends = {}
   now = Time.now.utc
-  backends.each_pair do |service_name, service_info|
+  backends.each_pair do |k, service_info|
+    service_name = service_info[:service_name]
+    meta_string = ""
+    service_info[:metas].each_pair do |k,v|
+      meta_string+=",#{k}=\"#{v}\""
+    end
     service_info[:state].each_pair do |state_name, state_count|
-%>consul_service_count{service="<%= service_name %>",state="<%= state_name %>"} <%= state_count %>
+%>consul_service_count{service="<%= service_name %>",state="<%= state_name %>"<%= meta_string %>} <%= state_count %>
 <%
     end
-    current_stats = service_info[:stats]
+  end
+
+  # Global statistics
+  all_stats.each_pair do |service_name, current_stats|
 %>consul_service_stats_requests_total{service="<%= service_name %>",type="success"} <%= current_stats.successes %>
 <%
     if current_stats.errors > 0
 %>consul_service_stats_requests_total{service="<%= service_name %>",type="errors"} <%= current_stats.errors %>
 <%
     end
-%>consul_service_stats_requests_bytes{service="<%= service_name %>"} <%= service_info[:stats].body_bytes %>
-consul_service_stats_requests_bytes_per_sec{service="<%= service_name %>"} <%= service_info[:stats].bytes_per_sec(now) %>
-consul_service_changes_total{service="<%= service_name %>"} <%= service_info[:stats].changes %>
+%>consul_service_stats_requests_bytes{service="<%= service_name %>"} <%= current_stats.body_bytes %>
+consul_service_stats_requests_bytes_per_sec{service="<%= service_name %>"} <%= current_stats.bytes_per_sec(now) %>
+consul_service_changes_total{service="<%= service_name %>"} <%= current_stats.changes %>
 
 <%
   end

metadata

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