consul-templaterb 1.34.1 → 1.35.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: abd96f30234a29f87d9eead907c56d0450072926a6b4c4d5b4904fb60c369fce
4
- data.tar.gz: 73c98dcae7acb91da0444f439cddde6d6530e4414d6e3e83577a8ca2a72ce671
3
+ metadata.gz: a3a0f2cd7a7e458f2af107abbca891f03431bcc42df8651e9658bfa928f5d7a1
4
+ data.tar.gz: a9494da14ca77669a1f044250e421f3546dfeb791ea59c329f6ee43e6af535e5
5
5
  SHA512:
6
- metadata.gz: 9edd80c1aba81b6ad0a563bcb8e55c01e0a3351ee0569e991eb045e2cf17651cabeb8a1d28851f2a6560276a4e4f1300390f6d432f6f257caae2a1f616478f9e
7
- data.tar.gz: d16c4af125b6410ff8bf33ee143e7576e66d78854a84b35eb13ff6feca90c825dda5886b694d04512c6d37f71e8af8c92270ce6bfb3643b6653d00f249cb951f
6
+ metadata.gz: 1f10abf7fb476c9f2ea652d7c0c68519edb11c9e5bf75e340dbd0e64f0816e84460e75b75380312c7b6911e5f23fe2cef8682b82f661411ef5f0e97ad7f8a7b4
7
+ data.tar.gz: 502a71a1f9f275fe646285e641d6075463d157f66bf737154b8ae9c8b4609e4d8983759629bf5ef998e1f66621e4963bad5fc837eb295a2a08b26a55e1bfeabc
@@ -1,5 +1,5 @@
1
1
  module Consul
2
2
  module Async
3
- VERSION = '1.34.1'.freeze
3
+ VERSION = '1.35.1'.freeze
4
4
  end
5
5
  end
data/samples/metrics.erb CHANGED
@@ -58,15 +58,31 @@ consul_members_count{serf="lan",status="<%= k %>"} <%= v %><%
58
58
  metas: metas,
59
59
  service_name: service_name,
60
60
  state: {
61
- 'passing' => 0,
62
- 'warning' => 0,
63
- 'critical' => 0,
61
+ 'passing' => {
62
+ instances: 0,
63
+ weight: 0
64
+ },
65
+ 'warning' => {
66
+ instances: 0,
67
+ weight: 0
68
+ },
69
+ 'critical' => {
70
+ instances: 0,
71
+ weight: 0
72
+ }
64
73
  }
65
74
  }
66
75
  backends[key] = back
67
76
  end
68
77
  state = snode.status
69
- back[:state][state] += 1
78
+ # Increment instance number.
79
+ back[:state][state][:instances] += 1
80
+ # Increment total weight regarding current node's state.
81
+ if state == 'passing'
82
+ back[:state][state][:weight] += snode['Service']['Weights']['Passing']
83
+ elsif state == 'warning'
84
+ back[:state][state][:weight] += snode['Service']['Weights']['Warning']
85
+ end
70
86
  end
71
87
  end
72
88
  end
@@ -118,7 +134,8 @@ end
118
134
  meta_string+=",#{k}=\"#{escape_meta(v)}\""
119
135
  end
120
136
  service_info[:state].each_pair do |state_name, state_count|
121
- %>consul_service_count{service="<%= service_name %>",state="<%= state_name %>"<%= meta_string %>} <%= state_count %>
137
+ %>consul_service_count{service="<%= service_name %>",state="<%= state_name %>"<%= meta_string %>} <%= state_count[:instances] %>
138
+ consul_service_weight{service="<%= service_name %>",state="<%= state_name %>"<%= meta_string %>} <%= state_count[:weight] %>
122
139
  <%
123
140
  end
124
141
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: consul-templaterb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.34.1
4
+ version: 1.35.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - SRE Core Services
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-02-17 00:00:00.000000000 Z
11
+ date: 2024-03-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: em-http-request