Skip to content

Commit 42a9975

Browse files
dotdcdotdc
committed
fix: filter resource panels to running pods via status phase
Signed-off-by: David Calvert <david@0xdc.me>
1 parent 48ff3f4 commit 42a9975

File tree

3 files changed

+123
-214
lines changed

3 files changed

+123
-214
lines changed

‎dashboards/k8s-views-global.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
"uid": "${datasource}"
201201
},
202202
"editorMode": "code",
203-
"expr": "sum(kube_pod_container_resource_requests{resource=\"cpu\", cluster=\"$cluster\"}) / sum(machine_cpu_cores{cluster=\"$cluster\"})",
203+
"expr": "sum(kube_pod_container_resource_requests{resource=\"cpu\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", cluster=\"$cluster\"} == 1)) / sum(machine_cpu_cores{cluster=\"$cluster\"})",
204204
"hide": false,
205205
"legendFormat": "Requests",
206206
"range": true,
@@ -212,7 +212,7 @@
212212
"uid": "${datasource}"
213213
},
214214
"editorMode": "code",
215-
"expr": "sum(kube_pod_container_resource_limits{resource=\"cpu\", cluster=\"$cluster\"}) / sum(machine_cpu_cores{cluster=\"$cluster\"})",
215+
"expr": "sum(kube_pod_container_resource_limits{resource=\"cpu\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", cluster=\"$cluster\"} == 1)) / sum(machine_cpu_cores{cluster=\"$cluster\"})",
216216
"hide": false,
217217
"legendFormat": "Limits",
218218
"range": true,
@@ -301,7 +301,7 @@
301301
"uid": "${datasource}"
302302
},
303303
"editorMode": "code",
304-
"expr": "sum(kube_pod_container_resource_requests{resource=\"memory\", cluster=\"$cluster\"}) / sum(machine_memory_bytes{cluster=\"$cluster\"})",
304+
"expr": "sum(kube_pod_container_resource_requests{resource=\"memory\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", cluster=\"$cluster\"} == 1)) / sum(machine_memory_bytes{cluster=\"$cluster\"})",
305305
"hide": false,
306306
"legendFormat": "Requests",
307307
"range": true,
@@ -313,7 +313,7 @@
313313
"uid": "${datasource}"
314314
},
315315
"editorMode": "code",
316-
"expr": "sum(kube_pod_container_resource_limits{resource=\"memory\", cluster=\"$cluster\"}) / sum(machine_memory_bytes{cluster=\"$cluster\"})",
316+
"expr": "sum(kube_pod_container_resource_limits{resource=\"memory\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", cluster=\"$cluster\"} == 1)) / sum(machine_memory_bytes{cluster=\"$cluster\"})",
317317
"hide": false,
318318
"legendFormat": "Limits",
319319
"range": true,
@@ -763,7 +763,7 @@
763763
"uid": "${datasource}"
764764
},
765765
"editorMode": "code",
766-
"expr": "sum(kube_pod_container_resource_requests{resource=\"cpu\", cluster=\"$cluster\"})",
766+
"expr": "sum(kube_pod_container_resource_requests{resource=\"cpu\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", cluster=\"$cluster\"} == 1))",
767767
"hide": false,
768768
"legendFormat": "Requests",
769769
"range": true,
@@ -775,7 +775,7 @@
775775
"uid": "${datasource}"
776776
},
777777
"editorMode": "code",
778-
"expr": "sum(kube_pod_container_resource_limits{resource=\"cpu\", cluster=\"$cluster\"})",
778+
"expr": "sum(kube_pod_container_resource_limits{resource=\"cpu\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", cluster=\"$cluster\"} == 1))",
779779
"hide": false,
780780
"legendFormat": "Limits",
781781
"range": true,
@@ -865,7 +865,7 @@
865865
"uid": "${datasource}"
866866
},
867867
"editorMode": "code",
868-
"expr": "sum(kube_pod_container_resource_requests{resource=\"memory\", cluster=\"$cluster\"})",
868+
"expr": "sum(kube_pod_container_resource_requests{resource=\"memory\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", cluster=\"$cluster\"} == 1))",
869869
"hide": false,
870870
"legendFormat": "Requests",
871871
"range": true,
@@ -877,7 +877,7 @@
877877
"uid": "${datasource}"
878878
},
879879
"editorMode": "code",
880-
"expr": "sum(kube_pod_container_resource_limits{resource=\"memory\", cluster=\"$cluster\"})",
880+
"expr": "sum(kube_pod_container_resource_limits{resource=\"memory\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", cluster=\"$cluster\"} == 1))",
881881
"hide": false,
882882
"legendFormat": "Limits",
883883
"range": true,
@@ -3142,6 +3142,6 @@
31423142
"timezone": "",
31433143
"title": "Kubernetes / Views / Global",
31443144
"uid": "k8s_views_global",
3145-
"version": 44,
3145+
"version": 45,
31463146
"weekStart": ""
31473147
}

‎dashboards/k8s-views-namespaces.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@
541541
"uid": "${datasource}"
542542
},
543543
"editorMode": "code",
544-
"expr": "sum(kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"cpu\", cluster=\"$cluster\"})",
544+
"expr": "sum(kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"cpu\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", namespace=~\"$namespace\", cluster=\"$cluster\"} == 1))",
545545
"hide": false,
546546
"legendFormat": "Requests",
547547
"range": true,
@@ -553,7 +553,7 @@
553553
"uid": "${datasource}"
554554
},
555555
"editorMode": "code",
556-
"expr": "sum(kube_pod_container_resource_limits{namespace=~\"$namespace\", resource=\"cpu\", cluster=\"$cluster\"})",
556+
"expr": "sum(kube_pod_container_resource_limits{namespace=~\"$namespace\", resource=\"cpu\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", namespace=~\"$namespace\", cluster=\"$cluster\"} == 1))",
557557
"hide": false,
558558
"legendFormat": "Limits",
559559
"range": true,
@@ -643,7 +643,7 @@
643643
"uid": "${datasource}"
644644
},
645645
"editorMode": "code",
646-
"expr": "sum(kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"memory\", cluster=\"$cluster\"})",
646+
"expr": "sum(kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"memory\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", namespace=~\"$namespace\", cluster=\"$cluster\"} == 1))",
647647
"hide": false,
648648
"legendFormat": "Requests",
649649
"range": true,
@@ -655,7 +655,7 @@
655655
"uid": "${datasource}"
656656
},
657657
"editorMode": "code",
658-
"expr": "sum(kube_pod_container_resource_limits{namespace=~\"$namespace\", resource=\"memory\", cluster=\"$cluster\"})",
658+
"expr": "sum(kube_pod_container_resource_limits{namespace=~\"$namespace\", resource=\"memory\", cluster=\"$cluster\"} and on(namespace, pod) max by (namespace, pod) (kube_pod_status_phase{phase=\"Running\", namespace=~\"$namespace\", cluster=\"$cluster\"} == 1))",
659659
"hide": false,
660660
"legendFormat": "Limits",
661661
"range": true,
@@ -3030,6 +3030,6 @@
30303030
"timezone": "",
30313031
"title": "Kubernetes / Views / Namespaces",
30323032
"uid": "k8s_views_ns",
3033-
"version": 44,
3033+
"version": 45,
30343034
"weekStart": ""
30353035
}

0 commit comments

Comments
 (0)