Skip to content

Commit 6aa6b78

Browse files
paulfantompaulfantom
committed
manifests: regenerate
1 parent 7a68642 commit 6aa6b78

File tree

2 files changed

+25
-20
lines changed

2 files changed

+25
-20
lines changed

‎manifests/grafana-dashboardDefinitions.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,7 +2252,7 @@ items:
22522252
"options": [
22532253

22542254
],
2255-
"query": "label_values(apiserver_request_total, cluster)",
2255+
"query": "label_values(up{job=\"apiserver\"}, cluster)",
22562256
"refresh": 2,
22572257
"regex": "",
22582258
"sort": 1,
@@ -2278,7 +2278,7 @@ items:
22782278
"options": [
22792279

22802280
],
2281-
"query": "label_values(apiserver_request_total{job=\"apiserver\", cluster=\"$cluster\"}, instance)",
2281+
"query": "label_values(up{job=\"apiserver\", cluster=\"$cluster\"}, instance)",
22822282
"refresh": 2,
22832283
"regex": "",
22842284
"sort": 1,
@@ -11034,7 +11034,7 @@ items:
1103411034
"options": [
1103511035

1103611036
],
11037-
"query": "label_values(kube_pod_info, cluster)",
11037+
"query": "label_values(up{job=\"kube-state-metrics\"}, cluster)",
1103811038
"refresh": 2,
1103911039
"regex": "",
1104011040
"sort": 1,
@@ -11061,7 +11061,7 @@ items:
1106111061
"options": [
1106211062

1106311063
],
11064-
"query": "label_values(kube_pod_info{cluster=\"$cluster\"}, namespace)",
11064+
"query": "label_values(kube_namespace_created{cluster=\"$cluster\"}, namespace)",
1106511065
"refresh": 2,
1106611066
"regex": "",
1106711067
"sort": 1,
@@ -12001,7 +12001,7 @@ items:
1200112001
"options": [
1200212002

1200312003
],
12004-
"query": "label_values(kube_pod_info, cluster)",
12004+
"query": "label_values(up{job=\"kube-state-metrics\"}, cluster)",
1200512005
"refresh": 2,
1200612006
"regex": "",
1200712007
"sort": 1,
@@ -12028,7 +12028,7 @@ items:
1202812028
"options": [
1202912029

1203012030
],
12031-
"query": "label_values(kube_pod_info{cluster=\"$cluster\"}, node)",
12031+
"query": "label_values(up{job=\"kube-state-metrics\", cluster=\"$cluster\"}, node)",
1203212032
"refresh": 2,
1203312033
"regex": "",
1203412034
"sort": 1,
@@ -14390,7 +14390,7 @@ items:
1439014390
"options": [
1439114391

1439214392
],
14393-
"query": "label_values(kube_pod_info, cluster)",
14393+
"query": "label_values(up{job=\"kube-state-metrics\"}, cluster)",
1439414394
"refresh": 2,
1439514395
"regex": "",
1439614396
"sort": 1,
@@ -14417,7 +14417,7 @@ items:
1441714417
"options": [
1441814418

1441914419
],
14420-
"query": "label_values(kube_pod_info{cluster=\"$cluster\"}, namespace)",
14420+
"query": "label_values(kube_namespace_created{cluster=\"$cluster\"}, namespace)",
1442114421
"refresh": 2,
1442214422
"regex": "",
1442314423
"sort": 1,
@@ -16338,7 +16338,7 @@ items:
1633816338
"options": [
1633916339

1634016340
],
16341-
"query": "label_values(kube_pod_info, cluster)",
16341+
"query": "label_values(up{job=\"kube-state-metrics\"}, cluster)",
1634216342
"refresh": 2,
1634316343
"regex": "",
1634416344
"sort": 1,
@@ -16365,7 +16365,7 @@ items:
1636516365
"options": [
1636616366

1636716367
],
16368-
"query": "label_values(kube_pod_info{cluster=\"$cluster\"}, namespace)",
16368+
"query": "label_values(kube_namespace_created{cluster=\"$cluster\"}, namespace)",
1636916369
"refresh": 2,
1637016370
"regex": "",
1637116371
"sort": 1,
@@ -18500,7 +18500,7 @@ items:
1850018500
"options": [
1850118501

1850218502
],
18503-
"query": "label_values(kube_pod_info, cluster)",
18503+
"query": "label_values(up{job=\"kube-state-metrics\"}, cluster)",
1850418504
"refresh": 2,
1850518505
"regex": "",
1850618506
"sort": 1,
@@ -20796,13 +20796,13 @@ items:
2079620796
"datasource": "$datasource",
2079720797
"hide": 0,
2079820798
"includeAll": true,
20799-
"label": null,
20799+
"label": "Data Source",
2080020800
"multi": false,
2080120801
"name": "instance",
2080220802
"options": [
2080320803

2080420804
],
20805-
"query": "label_values(kubelet_runtime_operations_total{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\"}, instance)",
20805+
"query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics\",cluster=\"$cluster\"}, instance)",
2080620806
"refresh": 2,
2080720807
"regex": "",
2080820808
"sort": 1,
@@ -25008,7 +25008,7 @@ items:
2500825008
"value": "Prometheus"
2500925009
},
2501025010
"hide": 0,
25011-
"label": null,
25011+
"label": "Data Source",
2501225012
"name": "datasource",
2501325013
"options": [
2501425014

@@ -26060,7 +26060,7 @@ items:
2606026060
"value": "Prometheus"
2606126061
},
2606226062
"hide": 0,
26063-
"label": null,
26063+
"label": "Data Source",
2606426064
"name": "datasource",
2606526065
"options": [
2606626066

@@ -27067,7 +27067,7 @@ items:
2706727067
"value": "Prometheus"
2706827068
},
2706927069
"hide": 0,
27070-
"label": null,
27070+
"label": "Data Source",
2707127071
"name": "datasource",
2707227072
"options": [
2707327073

@@ -27580,7 +27580,7 @@ items:
2758027580
"value": "default"
2758127581
},
2758227582
"hide": 0,
27583-
"label": null,
27583+
"label": "Data Source",
2758427584
"name": "datasource",
2758527585
"options": [
2758627586

@@ -32976,7 +32976,7 @@ items:
3297632976
"options": [
3297732977

3297832978
],
32979-
"query": "label_values(kube_pod_info, cluster)",
32979+
"query": "label_values(up{job=\"kube-proxy\"}, cluster)",
3298032980
"refresh": 2,
3298132981
"regex": "",
3298232982
"sort": 1,
@@ -33002,7 +33002,7 @@ items:
3300233002
"options": [
3300333003

3300433004
],
33005-
"query": "label_values(kubeproxy_network_programming_duration_seconds_bucket{cluster=\"$cluster\", job=\"kube-proxy\"}, instance)",
33005+
"query": "label_values(up{job=\"kube-proxy\", cluster=\"$cluster\", job=\"kube-proxy\"}, instance)",
3300633006
"refresh": 2,
3300733007
"regex": "",
3300833008
"sort": 1,
@@ -34091,7 +34091,7 @@ items:
3409134091
"options": [
3409234092

3409334093
],
34094-
"query": "label_values(process_cpu_seconds_total{cluster=\"$cluster\", job=\"kube-scheduler\"}, instance)",
34094+
"query": "label_values(up{job=\"kube-scheduler\", cluster=\"$cluster\"}, instance)",
3409534095
"refresh": 2,
3409634096
"regex": "",
3409734097
"sort": 1,

‎manifests/grafana-serviceAccount.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
apiVersion: v1
22
kind: ServiceAccount
33
metadata:
4+
labels:
5+
app.kubernetes.io/component: grafana
6+
app.kubernetes.io/name: grafana
7+
app.kubernetes.io/part-of: kube-prometheus
8+
app.kubernetes.io/version: 8.2.1
49
name: grafana
510
namespace: monitoring

0 commit comments

Comments
 (0)