Merge pull request #1402 from PhilipGough/cadvisor-metrics-2

Keep 'container_fs_.*' metrics from cAdvisor
2021-09-28 11:13:24 +02:00
parent 53a2f066d3 58e2c131c2
commit 18287f2bbd
2 changed files with 2 additions and 3 deletions
--- a/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
+++ b/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
@@ -140,8 +140,7 @@ function(params) {
              sourceLabels: ['__name__', 'container'],
              action: 'drop',
              regex: '(' + std.join('|',
-                                    [  // metrics are available at slice level
-                                      'container_fs_.*',
+                                    [
                                      'container_blkio_device_usage_total',
                                    ]) + ');.+',
            },
--- a/manifests/kubernetes-serviceMonitorKubelet.yaml
+++ b/manifests/kubernetes-serviceMonitorKubelet.yaml
@@ -67,7 +67,7 @@ spec:
      - pod
      - namespace
    - action: drop
-      regex: (container_fs_.*|container_blkio_device_usage_total);.+
+      regex: (container_blkio_device_usage_total);.+
      sourceLabels:
      - __name__
      - container