consul-templaterb 1.33.3 → 1.35.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/consul/async/version.rb +1 -1
- data/samples/consul-ui/js/utils.js +2 -2
- data/samples/metrics.erb +22 -5
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a3a0f2cd7a7e458f2af107abbca891f03431bcc42df8651e9658bfa928f5d7a1
|
4
|
+
data.tar.gz: a9494da14ca77669a1f044250e421f3546dfeb791ea59c329f6ee43e6af535e5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1f10abf7fb476c9f2ea652d7c0c68519edb11c9e5bf75e340dbd0e64f0816e84460e75b75380312c7b6911e5f23fe2cef8682b82f661411ef5f0e97ad7f8a7b4
|
7
|
+
data.tar.gz: 502a71a1f9f275fe646285e641d6075463d157f66bf737154b8ae9c8b4609e4d8983759629bf5ef998e1f66621e4963bad5fc837eb295a2a08b26a55e1bfeabc
|
data/lib/consul/async/version.rb
CHANGED
@@ -34,7 +34,7 @@ function padDateUnit(x) {
|
|
34
34
|
}
|
35
35
|
|
36
36
|
function formatDate(date) {
|
37
|
-
return padDateUnit(date.
|
37
|
+
return padDateUnit(date.getUTCMonth() + 1) + "/" + padDateUnit(date.getUTCDate()) + " " + padDateUnit(date.getUTCHours()) + ':' + padDateUnit(date.getUTCMinutes()) + ':' + padDateUnit(date.getUTCSeconds()) + " UTC";
|
38
38
|
}
|
39
39
|
|
40
40
|
function indexOfTimelineEvent(e) {
|
@@ -493,4 +493,4 @@ function updateURL(arg, value) {
|
|
493
493
|
}
|
494
494
|
|
495
495
|
window.history.pushState({}, "", newUrl);
|
496
|
-
}
|
496
|
+
}
|
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'
|
62
|
-
|
63
|
-
|
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
|
-
|
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.
|
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:
|
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
|