remove kube_pod_container_resource_requests:sum

Signed-off-by: Thibault Mange <[email protected]>
stolostron · Dec 19, 2024 · deb20f0 · deb20f0
1 parent cf9b436
commit deb20f0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/...robservability/manifests/base/grafana/nexus/acm/dash-acm-nexus-optimization-overview.yaml b/...robservability/manifests/base/grafana/nexus/acm/dash-acm-nexus-optimization-overview.yaml
@@ -597,7 +597,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum{cluster=\"$cluster\"}) by (namespace) / sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)",
+              "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum{cluster=\"$cluster\"}) by (namespace) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)",
               "format": "table",
               "instant": true,
               "interval": "",
@@ -617,7 +617,7 @@ data:
             },
             {
               "exemplar": true,
-              "expr": "sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)",
+              "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)",
               "format": "table",
               "instant": true,
               "interval": "",
@@ -1240,7 +1240,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(container_memory_rss{cluster=\"$cluster\",container!=\"\",container!=\"POD\"}) by (namespace) / sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)",
+              "expr": "sum(container_memory_rss{cluster=\"$cluster\",container!=\"\",container!=\"POD\"}) by (namespace) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)",
               "format": "table",
               "instant": true,
               "interval": "",
@@ -1262,7 +1262,7 @@ data:
             },
             {
               "exemplar": true,
-              "expr": "sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)",
+              "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)",
               "format": "table",
               "instant": true,
               "interval": "",

diff --git a/...terobservability/manifests/base/grafana/nexus/acm/dash-k8s-compute-resources-cluster.yaml b/...terobservability/manifests/base/grafana/nexus/acm/dash-k8s-compute-resources-cluster.yaml
@@ -199,7 +199,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"cpu\"}) / sum(kube_node_status_allocatable{cluster=\"$cluster\", resource=\"cpu\"})",
+              "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"cpu\"}) / sum(kube_node_status_allocatable{cluster=\"$cluster\", resource=\"cpu\"})",
               "format": "time_series",
               "instant": true,
               "interval": "",
@@ -456,7 +456,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"memory\"}) / sum(kube_node_status_allocatable{cluster=\"$cluster\", resource=\"memory\"})",
+              "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"memory\"}) / sum(kube_node_status_allocatable{cluster=\"$cluster\", resource=\"memory\"})",
               "format": "time_series",
               "instant": true,
               "interval": "",
@@ -987,7 +987,7 @@ data:
             },
             {
               "exemplar": true,
-              "expr": "sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)",
+              "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)",
               "format": "table",
               "instant": true,
               "interval": "",
@@ -998,7 +998,7 @@ data:
             },
             {
               "exemplar": true,
-              "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum{cluster=\"$cluster\"}) by (namespace) / sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)",
+              "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum{cluster=\"$cluster\"}) by (namespace) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)",
               "format": "table",
               "instant": true,
               "interval": "",
@@ -1499,7 +1499,7 @@ data:
             },
             {
               "exemplar": true,
-              "expr": "sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)",
+              "expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)",
               "format": "table",
               "instant": true,
               "interval": "",
@@ -1510,7 +1510,7 @@ data:
             },
             {
               "exemplar": true,
-              "expr": "sum(container_memory_rss{cluster=\"$cluster\",container!=\"\",container!=\"POD\"}) by (namespace) / sum(kube_pod_container_resource_requests:sum{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)",
+              "expr": "sum(container_memory_rss{cluster=\"$cluster\",container!=\"\",container!=\"POD\"}) by (namespace) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)",
               "format": "table",
               "instant": true,
               "interval": "",

diff --git a/operators/multiclusterobservability/manifests/base/grafana/nexus/acm/prometheus-rule.yaml b/operators/multiclusterobservability/manifests/base/grafana/nexus/acm/prometheus-rule.yaml
@@ -185,8 +185,6 @@ spec:
       record: sum:apiserver_request_total:5m
     - record: kube_pod_container_resource_limits:sum
       expr: sum(kube_pod_container_resource_limits) by (resource, namespace)
-    - record: kube_pod_container_resource_requests:sum
-      expr: sum(kube_pod_container_resource_requests{container!=""}) by (resource, namespace)
     - expr: |-
         sum by (cluster, namespace, pod, container) (
           rate(container_cpu_usage_seconds_total{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}[5m])

diff --git a/operators/multiclusterobservability/manifests/base/grafana/nexus/acm/scrape-config.yaml b/operators/multiclusterobservability/manifests/base/grafana/nexus/acm/scrape-config.yaml
@@ -64,7 +64,6 @@ spec:
     - '{__name__="kube_pod_container_resource_limits"}'
     - '{__name__="kube_pod_container_resource_limits:sum"}'
     - '{__name__="kube_pod_container_resource_requests"}'
-    - '{__name__="kube_pod_container_resource_requests:sum"}'
     - '{__name__="kube_pod_info"}'
     - '{__name__="kube_resourcequota"}'
     - '{__name__="namespace_workload_pod:kube_pod_owner:relabel"}'