consul-templaterb 1.33.3 → 1.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47eaa92845652a63849a621657d850033637d379ca3c052b4829ef395ca00c8a
-  data.tar.gz: 93b6efa0a2644b0595f428b30c54e078ae6e8675f8e3333789a78270f895e878
+  metadata.gz: a3a0f2cd7a7e458f2af107abbca891f03431bcc42df8651e9658bfa928f5d7a1
+  data.tar.gz: a9494da14ca77669a1f044250e421f3546dfeb791ea59c329f6ee43e6af535e5
 SHA512:
-  metadata.gz: 55648527a4f03b75ee82dc8d6a59fcc1269c67e567950772651c69e53d976e2158d885ba128b5ff6a119a1932002430c2020c2ed6ec27b4aa5bcd59785e73c49
-  data.tar.gz: b087e056e7c511c174c0be95b18a38cfdfaa26f74f530c7eaab88b45c8f5c487b475a9743c79aa02b51dd1948db6c47652021271c74c8058060e547d60a64f03
+  metadata.gz: 1f10abf7fb476c9f2ea652d7c0c68519edb11c9e5bf75e340dbd0e64f0816e84460e75b75380312c7b6911e5f23fe2cef8682b82f661411ef5f0e97ad7f8a7b4
+  data.tar.gz: 502a71a1f9f275fe646285e641d6075463d157f66bf737154b8ae9c8b4609e4d8983759629bf5ef998e1f66621e4963bad5fc837eb295a2a08b26a55e1bfeabc

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.33.3'.freeze
+    VERSION = '1.35.1'.freeze
   end
 end

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

@@ -34,7 +34,7 @@ function padDateUnit(x) {
 }
 
 function formatDate(date) {
-    return padDateUnit(date.getMonth() + 1) + "/" + padDateUnit(date.getDate()) + " " + padDateUnit(date.getHours()) + ':' + padDateUnit(date.getMinutes()) + ':' + padDateUnit(date.getSeconds());
+    return padDateUnit(date.getUTCMonth() + 1) + "/" + padDateUnit(date.getUTCDate()) + " " + padDateUnit(date.getUTCHours()) + ':' + padDateUnit(date.getUTCMinutes()) + ':' + padDateUnit(date.getUTCSeconds()) + " UTC";
 }
 
 function indexOfTimelineEvent(e) {
@@ -493,4 +493,4 @@ function updateURL(arg, value) {
     }
 
     window.history.pushState({}, "", newUrl);
-}
+}

data/samples/metrics.erb

@@ -58,15 +58,31 @@ consul_members_count{serf="lan",status="<%= k %>"} <%= v %><%
             metas: metas,
             service_name: service_name,
             state: {
-              'passing'  => 0,
-              'warning'  => 0,
-              'critical' => 0,
+              'passing' =>  {
+                instances: 0,
+                weight: 0
+              },
+              'warning' =>  {
+                instances: 0,
+                weight: 0
+              },
+              'critical' =>  {
+                instances: 0,
+                weight: 0
+              }
             }
           }
           backends[key] = back
         end
         state = snode.status
-        back[:state][state] += 1
+        # Increment instance number.
+        back[:state][state][:instances] += 1
+        # Increment total weight regarding current node's state.
+        if state == 'passing'
+          back[:state][state][:weight] += snode['Service']['Weights']['Passing']
+        elsif state == 'warning'
+          back[:state][state][:weight] += snode['Service']['Weights']['Warning']
+        end
       end
     end
   end
@@ -118,7 +134,8 @@ end
       meta_string+=",#{k}=\"#{escape_meta(v)}\""
     end
     service_info[:state].each_pair do |state_name, state_count|
-%>consul_service_count{service="<%= service_name %>",state="<%= state_name %>"<%= meta_string %>} <%= state_count %>
+%>consul_service_count{service="<%= service_name %>",state="<%= state_name %>"<%= meta_string %>} <%= state_count[:instances] %>
+consul_service_weight{service="<%= service_name %>",state="<%= state_name %>"<%= meta_string %>} <%= state_count[:weight] %>
 <%
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.33.3
+  version: 1.35.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request