jsonnet: Revert dropping container label on container_fs* metrices

container_fs_.* metrics doesn't have "container" label after openshift/pull/1402 which caused regression for dashboards using "container" label since it gives empty datapoints for all queries using "container" label in queries containing container_fs_.* metrices. Signed-off-by: Jayapriya Pai <janantha@redhat.com>
slashpai · Jun 3, 2022 · 63f33a2 · 63f33a2
1 parent fe80afa
commit 63f33a2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/assets/control-plane/service-monitor-kubelet.yaml b/assets/control-plane/service-monitor-kubelet.yaml
@@ -86,12 +86,6 @@ spec:
       sourceLabels:
       - __name__
       targetLabel: __tmp_keep_metric
-    - action: drop
-      regex: ;(container_fs_.*);.+
-      sourceLabels:
-      - __tmp_keep_metric
-      - __name__
-      - container
     - action: labeldrop
       regex: __tmp_keep_metric
     path: /metrics/cadvisor

diff --git a/jsonnet/components/control-plane.libsonnet b/jsonnet/components/control-plane.libsonnet
@@ -95,12 +95,6 @@ function(params)
                       targetLabel: '__tmp_keep_metric',
                       replacement: 'true',
                     },
-                    {
-                      // these metrics are available at the slice level
-                      sourceLabels: ['__tmp_keep_metric', '__name__', 'container'],
-                      action: 'drop',
-                      regex: ';(container_fs_.*);.+',
-                    },
                     // drop the temporarily stashed metrics
                     {
                       action: 'labeldrop',