Merge pull request #1395 from PhilipGough/reinstate-dropped-metrics

Bug 2007677: Reinstate dropped metrics

Author: openshift-merge-robot

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

@@ -66,11 +66,16 @@ spec:
       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);;
+      regex: (container_spec_.*|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_fs_.*|container_blkio_device_usage_total);.+
+      sourceLabels:
+      - __name__
+      - container
     - action: drop
       regex: container_memory_failures_total
       sourceLabels:

jsonnet/jsonnetfile.lock.json

@@ -121,8 +121,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "6f744e24a5c75a3f8f631dc966b40177208a21bf",
-      "sum": "cbOPi0ArIyjnDsW289gDieoSvH+ccow1p/uNFiV6zOk="
+      "version": "211e758dfeae14ac1eb018599d0b141b3b2c3d9c",
+      "sum": "7Y2gI0uyUCeEpjdhPIOxLs9vHu6cnOUu311HNSN1BiE="
     },
     {
       "source": {