Skip to content

Commit b4e0422

Browse files
authored
fix: fix pvc queries (#171)
Signed-off-by: David Calvert <david@0xdc.me>
1 parent da98062 commit b4e0422

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

dashboards/k8s-addons-prometheus.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,9 +2349,9 @@
23492349
},
23502350
"editorMode": "code",
23512351
"exemplar": true,
2352-
"expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)",
2352+
"expr": "max(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim, namespace) / max(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim, namespace)",
23532353
"interval": "",
2354-
"legendFormat": "{{ persistentvolumeclaim }}",
2354+
"legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }}",
23552355
"range": true,
23562356
"refId": "A"
23572357
}
@@ -2452,9 +2452,9 @@
24522452
},
24532453
"editorMode": "code",
24542454
"exemplar": true,
2455-
"expr": "sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)",
2455+
"expr": "max(kubelet_volume_stats_used_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim, namespace)",
24562456
"interval": "",
2457-
"legendFormat": "{{ persistentvolumeclaim }} - Used",
2457+
"legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }} - Used",
24582458
"range": true,
24592459
"refId": "A"
24602460
},
@@ -2465,9 +2465,9 @@
24652465
},
24662466
"editorMode": "code",
24672467
"exemplar": true,
2468-
"expr": "sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)",
2468+
"expr": "max(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~\".*prom.*\", cluster=~\"$cluster\"}) by (persistentvolumeclaim, namespace)",
24692469
"hide": false,
2470-
"legendFormat": "{{ persistentvolumeclaim }} - Capacity",
2470+
"legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }} - Capacity",
24712471
"range": true,
24722472
"refId": "B"
24732473
}
@@ -3182,6 +3182,6 @@
31823182
"timezone": "",
31833183
"title": "Prometheus",
31843184
"uid": "k8s_addons_prometheus",
3185-
"version": 7,
3185+
"version": 8,
31863186
"weekStart": ""
3187-
}
3187+
}

dashboards/k8s-views-namespaces.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,9 +2195,9 @@
21952195
"uid": "${datasource}"
21962196
},
21972197
"exemplar": true,
2198-
"expr": "sum(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
2198+
"expr": "max(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace) / max(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
21992199
"interval": "",
2200-
"legendFormat": "{{ persistentvolumeclaim }}",
2200+
"legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }}",
22012201
"refId": "A"
22022202
}
22032203
],
@@ -2293,9 +2293,9 @@
22932293
"uid": "${datasource}"
22942294
},
22952295
"exemplar": true,
2296-
"expr": "sum(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
2296+
"expr": "max(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
22972297
"interval": "",
2298-
"legendFormat": "{{ persistentvolumeclaim }} - Used",
2298+
"legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }} - Used",
22992299
"refId": "A"
23002300
},
23012301
{
@@ -2304,10 +2304,10 @@
23042304
"uid": "${datasource}"
23052305
},
23062306
"exemplar": true,
2307-
"expr": "sum(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
2307+
"expr": "max(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
23082308
"hide": false,
23092309
"interval": "",
2310-
"legendFormat": "{{ persistentvolumeclaim }} - Capacity",
2310+
"legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }} - Capacity",
23112311
"refId": "B"
23122312
}
23132313
],
@@ -3030,6 +3030,6 @@
30303030
"timezone": "",
30313031
"title": "Kubernetes / Views / Namespaces",
30323032
"uid": "k8s_views_ns",
3033-
"version": 43,
3033+
"version": 44,
30343034
"weekStart": ""
30353035
}

dashboards/k8s-views-nodes.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2774,9 +2774,9 @@
27742774
},
27752775
"editorMode": "code",
27762776
"exemplar": true,
2777-
"expr": "sum(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
2777+
"expr": "max(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace) / max(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
27782778
"interval": "$resolution",
2779-
"legendFormat": "{{ persistentvolumeclaim }}",
2779+
"legendFormat": "{{ namespace }} - {{ persistentvolumeclaim }}",
27802780
"range": true,
27812781
"refId": "A"
27822782
}
@@ -2873,7 +2873,7 @@
28732873
"uid": "${datasource}"
28742874
},
28752875
"exemplar": true,
2876-
"expr": "sum(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
2876+
"expr": "max(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
28772877
"format": "table",
28782878
"hide": false,
28792879
"interval": "",
@@ -2886,7 +2886,7 @@
28862886
"uid": "${datasource}"
28872887
},
28882888
"exemplar": true,
2889-
"expr": "sum(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim)",
2889+
"expr": "max(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=\"$cluster\"}) by (persistentvolumeclaim, namespace)",
28902890
"format": "table",
28912891
"hide": false,
28922892
"interval": "",
@@ -4014,6 +4014,6 @@
40144014
"timezone": "",
40154015
"title": "Kubernetes / Views / Nodes",
40164016
"uid": "k8s_views_nodes",
4017-
"version": 39,
4017+
"version": 40,
40184018
"weekStart": ""
40194019
}

0 commit comments

Comments
 (0)