Merge pull request #1 from rossf7/fix/k8s-cgroups-v2

Fix/k8s cgroups v2
josefhandl · Jul 16, 2024 · e39f1ed · e39f1ed
2 parents e09dfcc + 47ed17b
commit e39f1ed
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/sensors/utils.rs b/src/sensors/utils.rs
@@ -246,7 +246,7 @@ impl ProcessTracker {
         #[cfg(feature = "containers")]
         let regex_cgroup_docker = Regex::new(r"^.*/docker.*$").unwrap();
         #[cfg(feature = "containers")]
-        let regex_cgroup_kubernetes = Regex::new(r"^/kubepods.*$").unwrap();
+        let regex_cgroup_kubernetes = Regex::new(r"/kubepods.*$").unwrap();
         #[cfg(feature = "containers")]
         let regex_cgroup_containerd = Regex::new("/system.slice/containerd.service/.*$").unwrap();
 
@@ -429,6 +429,12 @@ impl ProcessTracker {
         if container_id.contains("cri-containerd") {
             container_id = container_id.split(':').last().unwrap().to_string();
         }
+        if container_id.starts_with("cri-containerd-") {
+            container_id = container_id
+                .strip_prefix("cri-containerd-")
+                .unwrap()
+                .to_string();
+        }
         Ok(container_id)
     }