consul-templaterb 1.15.3 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d7b1fe74f3740048aeef233a2f97097f90042fbdfa8a43776ec9b3ed1d3cab
-  data.tar.gz: 7bd5f3cea503187786e05b62d0748afaf0de8c1629333e70bec2689d88a2e79c
+  metadata.gz: a89758ade44e162e917282e2f01c0ff0631261dc04705ccf5a284e66c0a8ec4c
+  data.tar.gz: 158939ccb266b44496bb6240a5bf4da5c558ea6310abcc5e3fd2922eac9a102c
 SHA512:
-  metadata.gz: eabeef36879669e2dc937f06fcac7a7f92b1f107840a8717b11df2b9527df9da1b0bdc490c3db5c54b0e826502557e8a84f8ae72216e98736f95650893085d0a
-  data.tar.gz: f982bafbe7e6060f6db7ae0cf60b576ba4c3ff4c33b645636f6aa0b309108ba84f63fbc11941e3a0a692de1bb96343be18722611d21ca7f5ff09f330b67d030d
+  metadata.gz: 72d8b16ea9f95a9bf742a417c2e6cf0bc984eeb66dd577407af5e699e37bb1ac9015bcd169ecb1a2ed5ed56d3a2aa0c8cde5224ed5f1cae822ea378a3c4a1faa
+  data.tar.gz: 1306143770c8d18000db48572f66842bbdb74846ce92c08c3361d786c7ca16df215f961eba90493f55b67c5d05add9ff7fbc8448641e41d80573eb167d53220b

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## (UNRELEASED)
 
+## 1.16.0 (July 8, 2019)
+
+Added new helpers for `service()`
+
+ * `node_meta` return `['Node']['Meta'] or empty hash
+ * `service_meta` return `['Service']['Meta'] or empty hash for old consul versions
+ * `service_or_node_meta_value(key)` return a the value associated with key in meta from
+   service if in service, from node if in node, or nil if meta found nowhere.
+
 ## 1.15.3 (June 20, 2019)
 
 Improved consul-ui Javascript #37 thanks to [@warrenseine](https://github.com/warrenseine)

data/TemplateAPI.md

@@ -116,11 +116,26 @@ services that are passing or not. An optional argument passing might be used to
 
 ### Helpers
 
+#### node_meta
+
+This function returns a Hash of object `['Node']['Meta']` (will return empty hash if very old version of Consul not
+supporting it)
+
 #### service_address
 
 This object also contains a Helper to get easily the correct Address by using `service_address` which returns
 the optional `['Service']['Address']` if found or `['Node']['Address']` otherwise.
 
+#### service_meta
+
+This helper function will return a Hash or `['Service']['Meta']` and will return empty hash if not supported
+by old versions of Consul (< 1.1.0)
+
+#### service_or_node_meta_value(key)
+
+This function will return a string of `['Service']['Meta']` if key is found in service meta, or
+`['Node']['Meta']` or nil if key does not exists in both Service.Meta and Node.Meta.
+
 #### status
 
 Computing the status of an instance is non-trivial as it requires to parses all statuses of all checks and take

data/lib/consul/async/consul_template.rb

@@ -340,6 +340,11 @@ module Consul
         merge!(obj)
       end
 
+      # Return ['Node']['Meta']
+      def node_meta
+        self['Node']['Meta'] || {}
+      end
+
       # Return ['Service']['Address'] if defined, the address of node otherwise
       def service_address
         val = self['Service']['Address']
@@ -347,6 +352,17 @@ module Consul
         val
       end
 
+      # Return a defined hash of string valued Service.Meta
+      def service_meta
+        self['Service']['Meta'] || {}
+      end
+
+      # If given key exists in Service.Meta returns it, otherwise the same key from
+      # return Node.Meta, otherwise return nil
+      def service_or_node_meta_value(key)
+        service_meta[key] || node_meta[key]
+      end
+
       # Return the global state of a Service, will return passing|warning|critical
       def status
         ret = 'passing'

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.15.3'.freeze
+    VERSION = '1.16.0'.freeze
   end
 end

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

@@ -23,7 +23,7 @@
         node_node_data = {
           Name: snode['Node']['Node'],
           Address: snode['Node']['Address'],
-          Meta: snode['Node']['Meta'],
+          Meta: snode.node_meta,
         }
 
         node_services_data = node_info[:Service] || []

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

@@ -52,8 +52,8 @@
         check['notes'] = ncheck['Notes']
         checks.push(check)
       end
-      meta = snode['Service']['Meta']
-      node_meta = snode['Node']['Meta'] || {}
+      meta = snode.service_meta
+      node_meta = snode.node_meta
       node_name = snode['Node']['Node']
       all_nodes[node_name] = { meta: node_meta } if node_name
       server = { frontend_id: "backend_http__#{service_name}",

data/samples/metrics.erb

@@ -7,7 +7,7 @@
 #   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_metas_to_export = (ENV['PROMETHEUS_EXPORTED_SERVICE_META'] || 'version,os,criteo_flavor,node_group').split(',')
 
   service_tag_filter = ENV['SERVICES_TAG_FILTER'] || nil
   instance_must_tag = ENV['INSTANCE_MUST_TAG'] || service_tag_filter
@@ -30,9 +30,7 @@
         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']
+          meta = snode.service_or_node_meta_value(k)
           if meta
             key += "::#{k}=#{meta}"
             metas[k] = meta

metadata

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