consul-templaterb 1.27.0 → 1.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea2191ec559b6c2ccc871a6cac0083fd894200bd268421eb25b12361a8fc4373
-  data.tar.gz: db35acece2ea661ef35cefad9c1a94dd452e533458cff6cfa97f3114d5cc502f
+  metadata.gz: 6c4d19fa22c559f4a7960529dd3960c1c741f631b1cf0b51f5d10155b2b8a131
+  data.tar.gz: 926930e64938a40c2a2653abf9a84f0c86057201646a2f8e02fed06ed51927b8
 SHA512:
-  metadata.gz: bf4a2b9e2ee7ba6d811b8d20202c2c0bc998afe5fcbd08c1325f573a38b422a5d94a21666efff14526d44071aa2faeb36e2157f72a097d36dad8309b30418aef
-  data.tar.gz: 28087756e716a4a6e2c8526b4920571118a3c6b2896ff2e302d52281fccfb277b5741b1a0c8b2be132ba7c405c6ea689767369b90c8db052562348739d3ba04d
+  metadata.gz: 5126d79bcbd0d469bcb7ec5d214c979990056c3c11e1547d4819849f3fcd7fddd1534354f565722a52dbb09ba26c63dd4553f40282fcafaccd7be6a2a1d9442f
+  data.tar.gz: 7d6345911c69a8c0622f0b88343968ff951d8243db78d41b8cfad74e26ad5c87a39ae02e3bb24d4cf1615fe329fc53642f81aaf76591d1f5be4098c576baea96

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## (UNRELEASED)
 
+## 1.27.1 (July 28 2020)
+
+BUGIX:
+
+ * Fix collision in JSON queries when using payload in requests #68
+
 ## 1.27.0 (June 5, 2020)
 
 NEW FEATURES:

data/lib/consul/async/consul_template.rb

@@ -31,7 +31,8 @@ module Consul
 
       def as_json(url, default_value, refresh_delay_secs: 10, **opts)
         conf = JSONConfiguration.new(url: url, min_duration: refresh_delay_secs, retry_on_non_diff: refresh_delay_secs, **opts)
-        @endp_manager.create_if_missing(url, {}) do
+        endpoint_id = url + opts.to_json
+        @endp_manager.create_if_missing(url, {}, endpoint_id: endpoint_id) do
           if default_value.is_a?(Array)
             ConsulTemplateJSONArray.new(JSONEndpoint.new(conf, url, default_value))
           else
@@ -394,16 +395,21 @@ module Consul
         VaultEndpoint.new(vault_conf, path, :POST, {}, {})
       end
 
-      def create_if_missing(path, query_params, fail_fast_errors: @fail_fast_errors, max_consecutive_errors_on_endpoint: @max_consecutive_errors_on_endpoint, agent: nil)
-        fqdn = path.dup
-        query_params.each_pair do |k, v|
-          fqdn = "#{agent}#{fqdn}&#{k}=#{v}"
-        end
-        tpl = @endpoints[fqdn]
+      def create_if_missing(path, query_params, fail_fast_errors: @fail_fast_errors,
+                            max_consecutive_errors_on_endpoint: @max_consecutive_errors_on_endpoint,
+                            agent: nil, endpoint_id: nil)
+        endpoint_id ||= begin
+                          fqdn = path.dup
+                          query_params.each_pair do |k, v|
+                            fqdn = "#{agent}#{fqdn}&#{k}=#{v}"
+                          end
+                          fqdn
+                        end
+        tpl = @endpoints[endpoint_id]
         unless tpl
           tpl = yield
           ::Consul::Async::Debug.print_debug "path #{path.ljust(64)} #{query_params.inspect}\r"
-          @endpoints[fqdn] = tpl
+          @endpoints[endpoint_id] = tpl
           tpl.endpoint.on_response do |result|
             @net_info[:success] += 1
             @net_info[:bytes_read] += result.data.bytesize

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.27.0'.freeze
+    VERSION = '1.27.1'.freeze
   end
 end

data/samples/prometheus_datacenter_coordinates.erb

@@ -0,0 +1,56 @@
+# HELP consul_wan_servers_rtt_seconds Min Round trip with other servers of DC
+# TYPE consul_wan_servers_rtt_seconds gauge
+<%
+# This computes the RTT over WAN for all DCs
+results = {'min' => {}, 'max' => {}, 'p50' => {}, 'p90' => {}}
+my_dcname = (agent_self['Config'] || {})['Datacenter']
+my_dc = coordinate.datacenters.select { |d| d['Datacenter'] == my_dcname }.first
+
+def percentile(values_sorted, percentile)
+  k = (percentile*(values_sorted.length-1)+1).floor - 1
+  f = (percentile*(values_sorted.length-1)+1).modulo(1)
+  return values_sorted[k] + (f * (values_sorted[k+1] - values_sorted[k]))
+end
+
+if my_dc
+  from = my_dc['Datacenter']
+  coordinate.datacenters.each do |dc_coords|  
+    min = Float::MAX
+    max = 0
+    rtts = []
+    dc_coords['Coordinates'].each do |s2|
+      my_dc['Coordinates'].each do |s1|
+        rtt = coordinate.rtt(s1['Coord'], s2['Coord'])
+        min = rtt if rtt < min
+        max = rtt if rtt > max
+        idx = rtts.bsearch_index { |x| x > rtt }
+        if idx.nil?
+          rtts << rtt
+        else
+          rtts = rtts.insert(idx, rtt)
+        end
+%>
+consul_wan_servers_rtt_seconds{from="<%= from %>",to="<%= dc_coords['Datacenter'] %>",from_node="<%= s1['Node'] %>",to_node="<%= s2['Node'] %>"} <%= rtt.round(3) %><%
+      end
+    end
+    results['min'][dc_coords['Datacenter']] = min
+    results['max'][dc_coords['Datacenter']] = max
+    results['p50'][dc_coords['Datacenter']] = percentile(rtts, 0.5)
+    results['p90'][dc_coords['Datacenter']] = percentile(rtts, 0.9)
+  end
+
+  # Now, we iterate over aggregated results, type is min, max...
+  results.each do |type, res_type|
+  %>
+
+# HELP consul_wan_dc_<%= type %>_seconds <%= type %> round trip with other DCs
+# TYPE consul_wan_dc_<%= type %>_seconds gauge
+<%
+    # Iterate over destinations
+    res_type.each do |dst, val|
+%>consul_wan_dc_<%= type %>_seconds{from="<%= my_dcname %>",to="<%= dst %>"} <%= val.round(3) %>
+<%
+    end
+  end
+end
+%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.27.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -242,6 +242,7 @@ files:
 - samples/members.json.erb
 - samples/metrics.erb
 - samples/prometheus_consul_coordinates.erb
+- samples/prometheus_datacenter_coordinates.erb
 - samples/render_template_from_kv.erb
 - samples/sample_keys.html.erb
 - samples/service_checks_metrics.erb
@@ -272,8 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language