Skip to content

Commit 8db7403

Browse files
cluxclux
committed
make dashboards multi-replica tolerant and make each dashboard opt-in
Signed-off-by: clux <sszynrae@gmail.com>
1 parent fac3f29 commit 8db7403

File tree

8 files changed

+36
-49
lines changed

8 files changed

+36
-49
lines changed

‎charts/cx-dashboards/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: cx-dashboards
33
description: cx dashboard configmaps
44
type: application
5-
version: 0.1.4
5+
version: 0.1.5
66
dependencies: []

‎charts/cx-dashboards/templates/cxalertmanager.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ data:
178178
},
179179
"editorMode": "code",
180180
"exemplar": false,
181-
"expr": "label_replace(alertmanager_build_info, \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
181+
"expr": "label_replace(avg(alertmanager_build_info) by (repository, container, version), \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
182182
"format": "table",
183183
"hide": false,
184184
"instant": true,
@@ -193,7 +193,7 @@ data:
193193
},
194194
"editorMode": "code",
195195
"exemplar": false,
196-
"expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
196+
"expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
197197
"format": "table",
198198
"hide": false,
199199
"instant": true,
@@ -208,7 +208,7 @@ data:
208208
},
209209
"editorMode": "code",
210210
"exemplar": false,
211-
"expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
211+
"expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
212212
"format": "table",
213213
"hide": false,
214214
"instant": true,

‎charts/cx-dashboards/templates/cxprometheus.yaml

+7-11
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ data:
198198
},
199199
"editorMode": "code",
200200
"exemplar": false,
201-
"expr": "label_replace(prometheus_build_info, \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
201+
"expr": "label_replace(avg(prometheus_build_info) by (repository, container, version), \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
202202
"format": "table",
203203
"hide": false,
204204
"instant": true,
@@ -213,7 +213,7 @@ data:
213213
},
214214
"editorMode": "code",
215215
"exemplar": false,
216-
"expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
216+
"expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
217217
"format": "table",
218218
"hide": false,
219219
"instant": true,
@@ -228,7 +228,7 @@ data:
228228
},
229229
"editorMode": "code",
230230
"exemplar": false,
231-
"expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
231+
"expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
232232
"format": "table",
233233
"hide": false,
234234
"instant": true,
@@ -2101,8 +2101,7 @@ data:
21012101
"mode": "absolute",
21022102
"steps": [
21032103
{
2104-
"color": "green",
2105-
"value": null
2104+
"color": "green"
21062105
}
21072106
]
21082107
},
@@ -2225,8 +2224,7 @@ data:
22252224
"mode": "absolute",
22262225
"steps": [
22272226
{
2228-
"color": "green",
2229-
"value": null
2227+
"color": "green"
22302228
}
22312229
]
22322230
},
@@ -2450,8 +2448,7 @@ data:
24502448
"mode": "absolute",
24512449
"steps": [
24522450
{
2453-
"color": "green",
2454-
"value": null
2451+
"color": "green"
24552452
},
24562453
{
24572454
"color": "#EAB839",
@@ -2555,8 +2552,7 @@ data:
25552552
"mode": "absolute",
25562553
"steps": [
25572554
{
2558-
"color": "green",
2559-
"value": null
2555+
"color": "green"
25602556
},
25612557
{
25622558
"color": "red",

‎charts/cx-dashboards/values.yaml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
21
urls:
32
prometheus: http://prometheus.clux.dev
43
alertmanager: http://alertmanager.clux.dev
54

65
dashboards:
76
home:
8-
enabled: true
7+
enabled: false
98
machine:
10-
enabled: true
9+
enabled: false
1110
prometheus:
12-
enabled: true
11+
enabled: false
1312
alertmanager:
14-
enabled: true
13+
enabled: false
1514
flux:
16-
enabled: true
15+
enabled: false

‎dashboards/alertmanager.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
},
167167
"editorMode": "code",
168168
"exemplar": false,
169-
"expr": "label_replace(alertmanager_build_info, \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
169+
"expr": "label_replace(avg(alertmanager_build_info) by (repository, container, version), \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
170170
"format": "table",
171171
"hide": false,
172172
"instant": true,
@@ -181,7 +181,7 @@
181181
},
182182
"editorMode": "code",
183183
"exemplar": false,
184-
"expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
184+
"expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
185185
"format": "table",
186186
"hide": false,
187187
"instant": true,
@@ -196,7 +196,7 @@
196196
},
197197
"editorMode": "code",
198198
"exemplar": false,
199-
"expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
199+
"expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
200200
"format": "table",
201201
"hide": false,
202202
"instant": true,

‎dashboards/prometheus.json

+7-11
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
},
187187
"editorMode": "code",
188188
"exemplar": false,
189-
"expr": "label_replace(prometheus_build_info, \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
189+
"expr": "label_replace(avg(prometheus_build_info) by (repository, container, version), \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
190190
"format": "table",
191191
"hide": false,
192192
"instant": true,
@@ -201,7 +201,7 @@
201201
},
202202
"editorMode": "code",
203203
"exemplar": false,
204-
"expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
204+
"expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
205205
"format": "table",
206206
"hide": false,
207207
"instant": true,
@@ -216,7 +216,7 @@
216216
},
217217
"editorMode": "code",
218218
"exemplar": false,
219-
"expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
219+
"expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
220220
"format": "table",
221221
"hide": false,
222222
"instant": true,
@@ -2089,8 +2089,7 @@
20892089
"mode": "absolute",
20902090
"steps": [
20912091
{
2092-
"color": "green",
2093-
"value": null
2092+
"color": "green"
20942093
}
20952094
]
20962095
},
@@ -2213,8 +2212,7 @@
22132212
"mode": "absolute",
22142213
"steps": [
22152214
{
2216-
"color": "green",
2217-
"value": null
2215+
"color": "green"
22182216
}
22192217
]
22202218
},
@@ -2438,8 +2436,7 @@
24382436
"mode": "absolute",
24392437
"steps": [
24402438
{
2441-
"color": "green",
2442-
"value": null
2439+
"color": "green"
24432440
},
24442441
{
24452442
"color": "#EAB839",
@@ -2543,8 +2540,7 @@
25432540
"mode": "absolute",
25442541
"steps": [
25452542
{
2546-
"color": "green",
2547-
"value": null
2543+
"color": "green"
25482544
},
25492545
{
25502546
"color": "red",

‎deploy/dashboards/cxalertmanager.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ data:
176176
},
177177
"editorMode": "code",
178178
"exemplar": false,
179-
"expr": "label_replace(alertmanager_build_info, \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
179+
"expr": "label_replace(avg(alertmanager_build_info) by (repository, container, version), \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
180180
"format": "table",
181181
"hide": false,
182182
"instant": true,
@@ -191,7 +191,7 @@ data:
191191
},
192192
"editorMode": "code",
193193
"exemplar": false,
194-
"expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
194+
"expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
195195
"format": "table",
196196
"hide": false,
197197
"instant": true,
@@ -206,7 +206,7 @@ data:
206206
},
207207
"editorMode": "code",
208208
"exemplar": false,
209-
"expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
209+
"expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
210210
"format": "table",
211211
"hide": false,
212212
"instant": true,

‎deploy/dashboards/cxprometheus.yaml

+7-11
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ data:
196196
},
197197
"editorMode": "code",
198198
"exemplar": false,
199-
"expr": "label_replace(prometheus_build_info, \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
199+
"expr": "label_replace(avg(prometheus_build_info) by (repository, container, version), \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
200200
"format": "table",
201201
"hide": false,
202202
"instant": true,
@@ -211,7 +211,7 @@ data:
211211
},
212212
"editorMode": "code",
213213
"exemplar": false,
214-
"expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
214+
"expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
215215
"format": "table",
216216
"hide": false,
217217
"instant": true,
@@ -226,7 +226,7 @@ data:
226226
},
227227
"editorMode": "code",
228228
"exemplar": false,
229-
"expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
229+
"expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
230230
"format": "table",
231231
"hide": false,
232232
"instant": true,
@@ -2099,8 +2099,7 @@ data:
20992099
"mode": "absolute",
21002100
"steps": [
21012101
{
2102-
"color": "green",
2103-
"value": null
2102+
"color": "green"
21042103
}
21052104
]
21062105
},
@@ -2223,8 +2222,7 @@ data:
22232222
"mode": "absolute",
22242223
"steps": [
22252224
{
2226-
"color": "green",
2227-
"value": null
2225+
"color": "green"
22282226
}
22292227
]
22302228
},
@@ -2448,8 +2446,7 @@ data:
24482446
"mode": "absolute",
24492447
"steps": [
24502448
{
2451-
"color": "green",
2452-
"value": null
2449+
"color": "green"
24532450
},
24542451
{
24552452
"color": "#EAB839",
@@ -2553,8 +2550,7 @@ data:
25532550
"mode": "absolute",
25542551
"steps": [
25552552
{
2556-
"color": "green",
2557-
"value": null
2553+
"color": "green"
25582554
},
25592555
{
25602556
"color": "red",

0 commit comments

Comments
 (0)