fixup! fixup! fixup! Use kube-scheduler's metrics instead of kube-state-metrics

rexagod · rexagod · commit c9ad841155bc · 2023-01-22T21:56:51.000+05:30
diff --git a/rules/apps.libsonnet b/rules/apps.libsonnet
@@ -61,10 +61,7 @@
           {
             record: 'cluster:namespace:pod_memory:active:kube_pod_resource_request',
             expr: |||
-              kube_pod_resource_request{resource="memory",%(kubeSchedulerSelector)s}  * on (namespace, pod, %(clusterLabel)s)
-              group_left() max by (namespace, pod, %(clusterLabel)s) (
-                (kube_pod_status_phase{phase!~"Unknown"} == 1)
-              )
+              kube_pod_resource_request{resource="memory",%(kubeSchedulerSelector)s}
             ||| % $._config,
           },
           {
@@ -74,8 +71,6 @@
                   sum by (namespace, pod, %(clusterLabel)s) (
                       max by (namespace, pod, container, %(clusterLabel)s) (
                         kube_pod_resource_request{resource="memory",%(kubeSchedulerSelector)s}
-                      ) * on(namespace, pod, %(clusterLabel)s) group_left() max by (namespace, pod, %(clusterLabel)s) (
-                        kube_pod_status_phase{phase!~"Unknown"} == 1
                       )
                   )
               )
@@ -84,10 +79,7 @@
           {
             record: 'cluster:namespace:pod_cpu:active:kube_pod_resource_request',
             expr: |||
-              kube_pod_resource_request{resource="cpu",%(kubeSchedulerSelector)s}  * on (namespace, pod, %(clusterLabel)s)
-              group_left() max by (namespace, pod, %(clusterLabel)s) (
-                (kube_pod_status_phase{phase!~"Unknown"} == 1)
-              )
+              kube_pod_resource_request{resource="cpu",%(kubeSchedulerSelector)s}
             ||| % $._config,
           },
           {
@@ -97,8 +89,6 @@
                   sum by (namespace, pod, %(clusterLabel)s) (
                       max by (namespace, pod, container, %(clusterLabel)s) (
                         kube_pod_resource_request{resource="cpu",%(kubeSchedulerSelector)s}
-                      ) * on(namespace, pod, %(clusterLabel)s) group_left() max by (namespace, pod, %(clusterLabel)s) (
-                        kube_pod_status_phase{phase!~"Unknown"} == 1
                       )
                   )
               )
@@ -107,10 +97,7 @@
           {
             record: 'cluster:namespace:pod_memory:active:kube_pod_resource_limit',
             expr: |||
-              kube_pod_resource_limit{resource="memory",%(kubeSchedulerSelector)s}  * on (namespace, pod, %(clusterLabel)s)
-              group_left() max by (namespace, pod, %(clusterLabel)s) (
-                (kube_pod_status_phase{phase!~"Unknown"} == 1)
-              )
+              kube_pod_resource_limit{resource="memory",%(kubeSchedulerSelector)s}
             ||| % $._config,
           },
           {
@@ -120,8 +107,6 @@
                   sum by (namespace, pod, %(clusterLabel)s) (
                       max by (namespace, pod, container, %(clusterLabel)s) (
                         kube_pod_resource_limit{resource="memory",%(kubeSchedulerSelector)s}
-                      ) * on(namespace, pod, %(clusterLabel)s) group_left() max by (namespace, pod, %(clusterLabel)s) (
-                        kube_pod_status_phase{phase!~"Unknown"} == 1
                       )
                   )
               )
@@ -130,10 +115,7 @@
           {
             record: 'cluster:namespace:pod_cpu:active:kube_pod_resource_limit',
             expr: |||
-              kube_pod_resource_limit{resource="cpu",%(kubeSchedulerSelector)s}  * on (namespace, pod, %(clusterLabel)s)
-              group_left() max by (namespace, pod, %(clusterLabel)s) (
-               (kube_pod_status_phase{phase!~"Unknown"} == 1)
-               )
+              kube_pod_resource_limit{resource="cpu",%(kubeSchedulerSelector)s}
             ||| % $._config,
           },
           {
@@ -143,8 +125,6 @@
                   sum by (namespace, pod, %(clusterLabel)s) (
                       max by (namespace, pod, container, %(clusterLabel)s) (
                         kube_pod_resource_limit{resource="cpu",%(kubeSchedulerSelector)s}
-                      ) * on(namespace, pod, %(clusterLabel)s) group_left() max by (namespace, pod, %(clusterLabel)s) (
-                        kube_pod_status_phase{phase!~"Unknown"} == 1
                       )
                   )
               )

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,7 @@`
`61`	`61`	`{`
`62`	`62`	`record: 'cluster:namespace:pod_memory:active:kube_pod_resource_request',`
`63`	`63`	`expr: \|\|\|`
`64`		`- kube_pod_resource_request{resource="memory",%(kubeSchedulerSelector)s} * on (namespace, pod, %(clusterLabel)s)`
`65`		`- group_left() max by (namespace, pod, %(clusterLabel)s) (`
`66`		`- (kube_pod_status_phase{phase!~"Unknown"} == 1)`
`67`		`- )`
	`64`	`+ kube_pod_resource_request{resource="memory",%(kubeSchedulerSelector)s}`
`68`	`65`	`\|\|\| % $._config,`
`69`	`66`	`},`
`70`	`67`	`{`
`@@ -74,8 +71,6 @@`
`74`	`71`	`sum by (namespace, pod, %(clusterLabel)s) (`
`75`	`72`	`max by (namespace, pod, container, %(clusterLabel)s) (`
`76`	`73`	`kube_pod_resource_request{resource="memory",%(kubeSchedulerSelector)s}`
`77`		`- ) * on(namespace, pod, %(clusterLabel)s) group_left() max by (namespace, pod, %(clusterLabel)s) (`
`78`		`- kube_pod_status_phase{phase!~"Unknown"} == 1`
`79`	`74`	`)`
`80`	`75`	`)`
`81`	`76`	`)`
`@@ -84,10 +79,7 @@`
`84`	`79`	`{`
`85`	`80`	`record: 'cluster:namespace:pod_cpu:active:kube_pod_resource_request',`
`86`	`81`	`expr: \|\|\|`
`87`		`- kube_pod_resource_request{resource="cpu",%(kubeSchedulerSelector)s} * on (namespace, pod, %(clusterLabel)s)`
`88`		`- group_left() max by (namespace, pod, %(clusterLabel)s) (`
`89`		`- (kube_pod_status_phase{phase!~"Unknown"} == 1)`
`90`		`- )`
	`82`	`+ kube_pod_resource_request{resource="cpu",%(kubeSchedulerSelector)s}`
`91`	`83`	`\|\|\| % $._config,`
`92`	`84`	`},`
`93`	`85`	`{`
`@@ -97,8 +89,6 @@`
`97`	`89`	`sum by (namespace, pod, %(clusterLabel)s) (`
`98`	`90`	`max by (namespace, pod, container, %(clusterLabel)s) (`
`99`	`91`	`kube_pod_resource_request{resource="cpu",%(kubeSchedulerSelector)s}`
`100`		`- ) * on(namespace, pod, %(clusterLabel)s) group_left() max by (namespace, pod, %(clusterLabel)s) (`
`101`		`- kube_pod_status_phase{phase!~"Unknown"} == 1`
`102`	`92`	`)`
`103`	`93`	`)`
`104`	`94`	`)`
`@@ -107,10 +97,7 @@`
`107`	`97`	`{`
`108`	`98`	`record: 'cluster:namespace:pod_memory:active:kube_pod_resource_limit',`
`109`	`99`	`expr: \|\|\|`
`110`		`- kube_pod_resource_limit{resource="memory",%(kubeSchedulerSelector)s} * on (namespace, pod, %(clusterLabel)s)`
`111`		`- group_left() max by (namespace, pod, %(clusterLabel)s) (`
`112`		`- (kube_pod_status_phase{phase!~"Unknown"} == 1)`
`113`		`- )`
	`100`	`+ kube_pod_resource_limit{resource="memory",%(kubeSchedulerSelector)s}`
`114`	`101`	`\|\|\| % $._config,`
`115`	`102`	`},`
`116`	`103`	`{`
`@@ -120,8 +107,6 @@`
`120`	`107`	`sum by (namespace, pod, %(clusterLabel)s) (`
`121`	`108`	`max by (namespace, pod, container, %(clusterLabel)s) (`
`122`	`109`	`kube_pod_resource_limit{resource="memory",%(kubeSchedulerSelector)s}`
`123`		`- ) * on(namespace, pod, %(clusterLabel)s) group_left() max by (namespace, pod, %(clusterLabel)s) (`
`124`		`- kube_pod_status_phase{phase!~"Unknown"} == 1`
`125`	`110`	`)`
`126`	`111`	`)`
`127`	`112`	`)`
`@@ -130,10 +115,7 @@`
`130`	`115`	`{`
`131`	`116`	`record: 'cluster:namespace:pod_cpu:active:kube_pod_resource_limit',`
`132`	`117`	`expr: \|\|\|`
`133`		`- kube_pod_resource_limit{resource="cpu",%(kubeSchedulerSelector)s} * on (namespace, pod, %(clusterLabel)s)`
`134`		`- group_left() max by (namespace, pod, %(clusterLabel)s) (`
`135`		`- (kube_pod_status_phase{phase!~"Unknown"} == 1)`
`136`		`- )`
	`118`	`+ kube_pod_resource_limit{resource="cpu",%(kubeSchedulerSelector)s}`
`137`	`119`	`\|\|\| % $._config,`
`138`	`120`	`},`
`139`	`121`	`{`
`@@ -143,8 +125,6 @@`
`143`	`125`	`sum by (namespace, pod, %(clusterLabel)s) (`
`144`	`126`	`max by (namespace, pod, container, %(clusterLabel)s) (`
`145`	`127`	`kube_pod_resource_limit{resource="cpu",%(kubeSchedulerSelector)s}`
`146`		`- ) * on(namespace, pod, %(clusterLabel)s) group_left() max by (namespace, pod, %(clusterLabel)s) (`
`147`		`- kube_pod_status_phase{phase!~"Unknown"} == 1`
`148`	`128`	`)`
`149`	`129`	`)`
`150`	`130`	`)`