Skip to content

Commit 6ab98a6

Browse files
wesevenweseven
authored
Reviewed labels used in turtles dashboards. (#573)
* Reviewed labels used in turtles dashboards. * Updated turtles mixins dashboards
1 parent 59ffdab commit 6ab98a6

File tree

13 files changed

+199
-198
lines changed

13 files changed

+199
-198
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818
- Replace Cluster ID with cluster in dashboard labels.
1919
- remotewrite: improve legends
2020
- remotewrite: add count of agent replicas
21+
- Reviewed labels used in turtles dashboards
2122
- servicemonitors-overview: add info about agent pods
2223

2324
### Fixed

‎helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/kubernetes-api-uptime.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
],
9494
"targets": [
9595
{
96-
"expr": "sum(sum_over_time(up{cluster_type=~\"workload_cluster\",app=\"kubernetes\"}[1w])) by (cluster_id) / sum(count_over_time(up{cluster_type=~\"workload_cluster\",app=\"kubernetes\"}[1w])) by (cluster_id)",
96+
"expr": "sum(sum_over_time(up{cluster_type=~\"workload_cluster\",job=\"apiserver\"}[1w])) by (cluster_id) / sum(count_over_time(up{cluster_type=~\"workload_cluster\",job=\"apiserver\"}[1w])) by (cluster_id)",
9797
"format": "table",
9898
"instant": true,
9999
"intervalFactor": 2,
@@ -148,7 +148,7 @@
148148
"steppedLine": false,
149149
"targets": [
150150
{
151-
"expr": "1 - up{cluster_type=\"workload_cluster\",app=\"kubernetes\"}",
151+
"expr": "1 - up{cluster_type=\"workload_cluster\",job=\"apiserver\"}",
152152
"format": "time_series",
153153
"intervalFactor": 2,
154154
"refId": "A"

‎helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/persistentvolume.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,15 +1535,15 @@
15351535
"type": "prometheus",
15361536
"uid": "$datasource"
15371537
},
1538-
"definition": "label_values(kubelet_volume_stats_capacity_bytes{app=\"kubelet\"},cluster_id)",
1538+
"definition": "label_values(kubelet_volume_stats_capacity_bytes{job=\"kubelet\"},cluster_id)",
15391539
"hide": 0,
15401540
"includeAll": false,
15411541
"label": "Cluster",
15421542
"multi": false,
15431543
"name": "cluster_id",
15441544
"options": [],
15451545
"query": {
1546-
"query": "label_values(kubelet_volume_stats_capacity_bytes{app=\"kubelet\"},cluster_id)",
1546+
"query": "label_values(kubelet_volume_stats_capacity_bytes{job=\"kubelet\"},cluster_id)",
15471547
"refId": "PrometheusVariableQueryEditor-VariableQuery"
15481548
},
15491549
"refresh": 1,
@@ -1567,15 +1567,15 @@
15671567
"type": "prometheus",
15681568
"uid": "$datasource"
15691569
},
1570-
"definition": "label_values(kubelet_volume_stats_capacity_bytes{app=\"kubelet\"},namespace)",
1570+
"definition": "label_values(kubelet_volume_stats_capacity_bytes{job=\"kubelet\"},namespace)",
15711571
"hide": 0,
15721572
"includeAll": true,
15731573
"label": "Namespace",
15741574
"multi": true,
15751575
"name": "namespace",
15761576
"options": [],
15771577
"query": {
1578-
"query": "label_values(kubelet_volume_stats_capacity_bytes{app=\"kubelet\"},namespace)",
1578+
"query": "label_values(kubelet_volume_stats_capacity_bytes{job=\"kubelet\"},namespace)",
15791579
"refId": "PrometheusVariableQueryEditor-VariableQuery"
15801580
},
15811581
"refresh": 2,

‎helm/dashboards/dashboards/mixin/controller-manager.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"tableColumn": "",
7878
"targets": [
7979
{
80-
"expr": "sum(up{cluster_id=\"$cluster\", app=\"kube-controller-manager\"})",
80+
"expr": "sum(up{cluster_id=\"$cluster\", job=\"kube-controller-manager\"})",
8181
"format": "time_series",
8282
"intervalFactor": 2,
8383
"legendFormat": "",
@@ -139,7 +139,7 @@
139139
"steppedLine": false,
140140
"targets": [
141141
{
142-
"expr": "sum(rate(workqueue_adds_total{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name)",
142+
"expr": "sum(rate(workqueue_adds_total{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name)",
143143
"format": "time_series",
144144
"intervalFactor": 2,
145145
"legendFormat": "{{cluster_id}} {{instance}} {{name}}",
@@ -234,7 +234,7 @@
234234
"steppedLine": false,
235235
"targets": [
236236
{
237-
"expr": "sum(rate(workqueue_depth{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name)",
237+
"expr": "sum(rate(workqueue_depth{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name)",
238238
"format": "time_series",
239239
"intervalFactor": 2,
240240
"legendFormat": "{{cluster_id}} {{instance}} {{name}}",
@@ -329,7 +329,7 @@
329329
"steppedLine": false,
330330
"targets": [
331331
{
332-
"expr": "histogram_quantile(0.99, sum(rate(workqueue_queue_duration_seconds_bucket{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name, le))",
332+
"expr": "histogram_quantile(0.99, sum(rate(workqueue_queue_duration_seconds_bucket{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\"}[$__rate_interval])) by (cluster_id, instance, name, le))",
333333
"format": "time_series",
334334
"intervalFactor": 2,
335335
"legendFormat": "{{cluster_id}} {{instance}} {{name}}",
@@ -424,28 +424,28 @@
424424
"steppedLine": false,
425425
"targets": [
426426
{
427-
"expr": "sum(rate(rest_client_requests_total{app=\"kube-controller-manager\", instance=~\"$instance\",code=~\"2..\"}[$__rate_interval]))",
427+
"expr": "sum(rate(rest_client_requests_total{job=\"kube-controller-manager\", instance=~\"$instance\",code=~\"2..\"}[$__rate_interval]))",
428428
"format": "time_series",
429429
"intervalFactor": 2,
430430
"legendFormat": "2xx",
431431
"refId": "A"
432432
},
433433
{
434-
"expr": "sum(rate(rest_client_requests_total{app=\"kube-controller-manager\", instance=~\"$instance\",code=~\"3..\"}[$__rate_interval]))",
434+
"expr": "sum(rate(rest_client_requests_total{job=\"kube-controller-manager\", instance=~\"$instance\",code=~\"3..\"}[$__rate_interval]))",
435435
"format": "time_series",
436436
"intervalFactor": 2,
437437
"legendFormat": "3xx",
438438
"refId": "B"
439439
},
440440
{
441-
"expr": "sum(rate(rest_client_requests_total{app=\"kube-controller-manager\", instance=~\"$instance\",code=~\"4..\"}[$__rate_interval]))",
441+
"expr": "sum(rate(rest_client_requests_total{job=\"kube-controller-manager\", instance=~\"$instance\",code=~\"4..\"}[$__rate_interval]))",
442442
"format": "time_series",
443443
"intervalFactor": 2,
444444
"legendFormat": "4xx",
445445
"refId": "C"
446446
},
447447
{
448-
"expr": "sum(rate(rest_client_requests_total{app=\"kube-controller-manager\", instance=~\"$instance\",code=~\"5..\"}[$__rate_interval]))",
448+
"expr": "sum(rate(rest_client_requests_total{job=\"kube-controller-manager\", instance=~\"$instance\",code=~\"5..\"}[$__rate_interval]))",
449449
"format": "time_series",
450450
"intervalFactor": 2,
451451
"legendFormat": "5xx",
@@ -527,7 +527,7 @@
527527
"steppedLine": false,
528528
"targets": [
529529
{
530-
"expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\", verb=\"POST\"}[$__rate_interval])) by (verb, url, le))",
530+
"expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\", verb=\"POST\"}[$__rate_interval])) by (verb, url, le))",
531531
"format": "time_series",
532532
"intervalFactor": 2,
533533
"legendFormat": "{{verb}} {{url}}",
@@ -622,7 +622,7 @@
622622
"steppedLine": false,
623623
"targets": [
624624
{
625-
"expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster_id=\"$cluster\", app=\"kube-controller-manager\", instance=~\"$instance\", verb=\"GET\"}[$__rate_interval])) by (verb, url, le))",
625+
"expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{cluster_id=\"$cluster\", job=\"kube-controller-manager\", instance=~\"$instance\", verb=\"GET\"}[$__rate_interval])) by (verb, url, le))",
626626
"format": "time_series",
627627
"intervalFactor": 2,
628628
"legendFormat": "{{verb}} {{url}}",
@@ -717,7 +717,7 @@
717717
"steppedLine": false,
718718
"targets": [
719719
{
720-
"expr": "process_resident_memory_bytes{cluster_id=\"$cluster\", app=\"kube-controller-manager\",instance=~\"$instance\"}",
720+
"expr": "process_resident_memory_bytes{cluster_id=\"$cluster\", job=\"kube-controller-manager\",instance=~\"$instance\"}",
721721
"format": "time_series",
722722
"intervalFactor": 2,
723723
"legendFormat": "{{instance}}",
@@ -799,7 +799,7 @@
799799
"steppedLine": false,
800800
"targets": [
801801
{
802-
"expr": "rate(process_cpu_seconds_total{cluster_id=\"$cluster\", app=\"kube-controller-manager\",instance=~\"$instance\"}[$__rate_interval])",
802+
"expr": "rate(process_cpu_seconds_total{cluster_id=\"$cluster\", job=\"kube-controller-manager\",instance=~\"$instance\"}[$__rate_interval])",
803803
"format": "time_series",
804804
"intervalFactor": 2,
805805
"legendFormat": "{{instance}}",
@@ -881,7 +881,7 @@
881881
"steppedLine": false,
882882
"targets": [
883883
{
884-
"expr": "go_goroutines{cluster_id=\"$cluster\", app=\"kube-controller-manager\",instance=~\"$instance\"}",
884+
"expr": "go_goroutines{cluster_id=\"$cluster\", job=\"kube-controller-manager\",instance=~\"$instance\"}",
885885
"format": "time_series",
886886
"intervalFactor": 2,
887887
"legendFormat": "{{instance}}",
@@ -966,7 +966,7 @@
966966
"multi": false,
967967
"name": "cluster",
968968
"options": [],
969-
"query": "label_values(up{app=\"kube-controller-manager\"}, cluster_id)",
969+
"query": "label_values(up{job=\"kube-controller-manager\"}, cluster_id)",
970970
"refresh": 2,
971971
"regex": "",
972972
"sort": 1,
@@ -986,7 +986,7 @@
986986
"multi": false,
987987
"name": "instance",
988988
"options": [],
989-
"query": "label_values(up{cluster_id=\"$cluster\", app=\"kube-controller-manager\"}, instance)",
989+
"query": "label_values(up{cluster_id=\"$cluster\", job=\"kube-controller-manager\"}, instance)",
990990
"refresh": 2,
991991
"regex": "",
992992
"sort": 1,

0 commit comments

Comments
 (0)