Bug 2007677: Adjust dropped cAdvisor metrics

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 4.10
 
 - [#1299](https://github.com/openshift/cluster-monitoring-operator/pull/1299) Expose expose /api/v1/labels endpoint for Thanos query.
+- [#1402](https://github.com/openshift/cluster-monitoring-operator/pull/1402) Drop pod-centric cAdvisor metrics that are available at slice level.
 
 ## 4.9
 

assets/control-plane/service-monitor-kubelet.yaml

@@ -72,14 +72,19 @@ spec:
       - pod
       - namespace
     - action: drop
-      regex: (container_fs_.*|container_blkio_device_usage_total);.+
+      regex: (container_blkio_device_usage_total);.+
       sourceLabels:
       - __name__
       - container
     - action: drop
       regex: container_memory_failures_total
       sourceLabels:
       - __name__
+    - action: drop
+      regex: (container_fs_.*);.+
+      sourceLabels:
+      - __name__
+      - container
     path: /metrics/cadvisor
     port: https-metrics
     relabelings:

jsonnet/components/control-plane.libsonnet

@@ -88,6 +88,12 @@ function(params)
                       action: 'drop',
                       regex: 'container_memory_failures_total',
                     },
+                    {
+                      // these metrics are available at the slice level
+                      sourceLabels: ['__name__', 'container'],
+                      action: 'drop',
+                      regex: '(container_fs_.*);.+',
+                    },
                   ],
                 }
               else

jsonnet/jsonnetfile.lock.json

@@ -121,8 +121,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "211e758dfeae14ac1eb018599d0b141b3b2c3d9c",
-      "sum": "7Y2gI0uyUCeEpjdhPIOxLs9vHu6cnOUu311HNSN1BiE="
+      "version": "a2eee1803a074fb40cad109d690732c22f0130cf",
+      "sum": "kqVnoNBux2YF1s03m+O3w/5jreAnjXx2/NjvNP1Hoy4="
     },
     {
       "source": {