fix(cgroups.plugin): adjust kubepods patterns to filter pods when using Kind cluster (#13324)
Ilya Mashchenko committed
Jul 7, 2022 at 15:05 UTC
473f449f23470356b5ed8f8d5259164699494e6a
1 file changed
+13
-6
collectors/cgroups.plugin/sys_fs_cgroup.c
+13
-6
@@ -452,12 +452,17 @@ void read_cgroup_plugin_configuration() {
452
// ----------------------------------------------------------------
453
454
" /machine.slice/*.service " // #3367 systemd-nspawn
455
- " /kubepods/pod*/* " // k8s containers
456
- " /kubepods/*/pod*/* " // k8s containers
455
456
// ----------------------------------------------------------------
457
460
- " !/kubepods* " // all other k8s cgroups
458
+ " */kubepods/pod*/* " // k8s containers
459
+ " */kubepods/*/pod*/* " // k8s containers
460
+ " */*-kubepods-pod*/* " // k8s containers
461
+ " */*-kubepods-*-pod*/* " // k8s containers
462
+ " !*kubepods* !*kubelet* " // all other k8s cgroups
463
+
464
+ // ----------------------------------------------------------------
465
+
466
" !*/vcpu* " // libvirtd adds these sub-cgroups
467
" !*/emulator " // libvirtd adds these sub-cgroups
468
" !*.mount "
@@ -529,9 +534,11 @@ void read_cgroup_plugin_configuration() {
534
" *docker* "
535
" *lxc* "
536
" *qemu* "
532
- " /kubepods/pod*/* " // k8s containers
533
- " /kubepods/*/pod*/* " // k8s containers
534
- " !/kubepods* " // all other k8s cgroups
537
+ " */kubepods/pod*/* " // k8s containers
538
+ " */kubepods/*/pod*/* " // k8s containers
539
+ " */*-kubepods-pod*/* " // k8s containers
540
+ " */*-kubepods-*-pod*/* " // k8s containers
541
+ " !*kubepods* !*kubelet* " // all other k8s cgroups
542
" *.libvirt-qemu " // #3010
543
" * "
544
), NULL, SIMPLE_PATTERN_EXACT);