From 9adf60f2b35186a1b0ca739f7a60891582338665 Mon Sep 17 00:00:00 2001
From: Philip Gough <pgough@redhat.com>
Date: Wed, 10 Nov 2021 10:39:11 +0000
Subject: [PATCH] Revert "Adjust dropped metrics from cAdvisor"

---
 .../kube-prometheus-insecure-kubelet.libsonnet         | 10 ++--------
 .../kube-prometheus/prometheus/prometheus.libsonnet    | 10 ++--------
 manifests/prometheus-serviceMonitorKubelet.yaml        |  7 +------
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/jsonnet/kube-prometheus/kube-prometheus-insecure-kubelet.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-insecure-kubelet.libsonnet
index 9fd74a96..4ac6773f 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-insecure-kubelet.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-insecure-kubelet.libsonnet
@@ -37,7 +37,9 @@
                   action: 'drop',
                   regex: '(' + std.join('|',
                                         [
+                                          'container_fs_.*',  // add filesystem read/write data (nodes*disks*services*4)
                                           'container_spec_.*',  // everything related to cgroup specification and thus static data (nodes*services*5)
+                                          'container_blkio_device_usage_total',  // useful for containers, but not for system services (nodes*disks*services*operations*2)
                                           'container_file_descriptors',  // file descriptors limits and global numbers are exposed via (nodes*services)
                                           'container_sockets',  // used sockets in cgroup. Usually not important for system services (nodes*services)
                                           'container_threads_max',  // max number of threads in cgroup. Usually for system services it is not limited (nodes*services)
@@ -46,14 +48,6 @@
                                           'container_last_seen',  // not needed as system services are always running (nodes*services)
                                         ]) + ');;',
                 },
-                {
-                  sourceLabels: ['__name__', 'container'],
-                  action: 'drop',
-                  regex: '(' + std.join('|',
-                                        [
-                                          'container_blkio_device_usage_total',
-                                        ]) + ');.+',
-                },
               ],
             },
           ],
diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
index 5f077aa3..27b2e1f9 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
@@ -328,7 +328,9 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
                 action: 'drop',
                 regex: '(' + std.join('|',
                                       [
+                                        'container_fs_.*',  // add filesystem read/write data (nodes*disks*services*4)
                                         'container_spec_.*',  // everything related to cgroup specification and thus static data (nodes*services*5)
+                                        'container_blkio_device_usage_total',  // useful for containers, but not for system services (nodes*disks*services*operations*2)
                                         'container_file_descriptors',  // file descriptors limits and global numbers are exposed via (nodes*services)
                                         'container_sockets',  // used sockets in cgroup. Usually not important for system services (nodes*services)
                                         'container_threads_max',  // max number of threads in cgroup. Usually for system services it is not limited (nodes*services)
@@ -337,14 +339,6 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
                                         'container_last_seen',  // not needed as system services are always running (nodes*services)
                                       ]) + ');;',
               },
-              {
-                sourceLabels: ['__name__', 'container'],
-                action: 'drop',
-                regex: '(' + std.join('|',
-                                      [
-                                        'container_blkio_device_usage_total',
-                                      ]) + ');.+',
-              },
             ],
           },
           {
diff --git a/manifests/prometheus-serviceMonitorKubelet.yaml b/manifests/prometheus-serviceMonitorKubelet.yaml
index ab96d5b1..b5272532 100644
--- a/manifests/prometheus-serviceMonitorKubelet.yaml
+++ b/manifests/prometheus-serviceMonitorKubelet.yaml
@@ -61,16 +61,11 @@ spec:
       sourceLabels:
       - __name__
     - action: drop
-      regex: (container_spec_.*|container_file_descriptors|container_sockets|container_threads_max|container_threads|container_start_time_seconds|container_last_seen);;
+      regex: (container_fs_.*|container_spec_.*|container_blkio_device_usage_total|container_file_descriptors|container_sockets|container_threads_max|container_threads|container_start_time_seconds|container_last_seen);;
       sourceLabels:
       - __name__
       - pod
       - namespace
-    - action: drop
-      regex: (container_blkio_device_usage_total);.+
-      sourceLabels:
-      - __name__
-      - container
     path: /metrics/cadvisor
     port: https-metrics
     relabelings: