Revert "Bug 1999057: jsonnet: Sync with kube-prometheus"

openshift · Sep 24, 2021 · 4164124 · 4164124
1 parent bc2d0c5
commit 4164124
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/assets/control-plane/service-monitor-kubelet.yaml b/assets/control-plane/service-monitor-kubelet.yaml
@@ -63,12 +63,6 @@ spec:
       regex: container_(network_tcp_usage_total|network_udp_usage_total|tasks_state|cpu_load_average_10s)
       sourceLabels:
       - __name__
-    - action: drop
-      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_memory_failures_total
       sourceLabels:

diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -121,8 +121,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "ccb46bfb1b3d1d982a51a27b6c7dd723ffe8b427",
-      "sum": "ptC76ApucKJNurMsumtvLEeNAxXonHq9ia9jS+IU7jk="
+      "version": "ffced1bd3ee49e5eb329034bb56a09df095a2473",
+      "sum": "UDD4YtjntcyZL63Q7NA5IcfXII9qeowBBv4YV4BUwbg="
     },
     {
       "source": {