Merge pull request #180 from metalmatze/cpu-request-running

brancz · web-flow · commit 3d4a542be6ab · 2019-04-01T17:34:45.000+02:00
Count overcommit CPU only for pods in Pending or Running status
diff --git a/rules/rules.libsonnet b/rules/rules.libsonnet
@@ -61,7 +61,7 @@
             record: 'namespace_name:kube_pod_container_resource_requests_cpu_cores:sum',
             expr: |||
               sum by (namespace, label_name) (
-                sum(kube_pod_container_resource_requests_cpu_cores{%(kubeStateMetricsSelector)s} and on(pod) kube_pod_status_scheduled{condition="true"}) by (namespace, pod)
+                sum(kube_pod_container_resource_requests_cpu_cores{%(kubeStateMetricsSelector)s} * on (endpoint, instance, job, namespace, pod, service) group_left(phase) (kube_pod_status_phase{phase=~"^(Pending|Running)$"} == 1)) by (namespace, pod)
               * on (namespace, pod) group_left(label_name)
                 label_replace(kube_pod_labels{%(kubeStateMetricsSelector)s}, "pod_name", "$1", "pod", "(.*)")
               )

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`record: 'namespace_name:kube_pod_container_resource_requests_cpu_cores:sum',`
`62`	`62`	`expr: \|\|\|`
`63`	`63`	`sum by (namespace, label_name) (`
`64`		`- sum(kube_pod_container_resource_requests_cpu_cores{%(kubeStateMetricsSelector)s} and on(pod) kube_pod_status_scheduled{condition="true"}) by (namespace, pod)`
	`64`	`+ sum(kube_pod_container_resource_requests_cpu_cores{%(kubeStateMetricsSelector)s} * on (endpoint, instance, job, namespace, pod, service) group_left(phase) (kube_pod_status_phase{phase=~"^(Pending\|Running)$"} == 1)) by (namespace, pod)`
`65`	`65`	`* on (namespace, pod) group_left(label_name)`
`66`	`66`	`label_replace(kube_pod_labels{%(kubeStateMetricsSelector)s}, "pod_name", "$1", "pod", "(.*)")`
`67`	`67`	`)`