fix(cgroups.plugin): fix qemu VMs and LXC containers name resolution (#13220)
Ilya Mashchenko committed
Jun 27, 2022 at 18:14 UTC
157dafc232de64b3447dbe5f9e3a23c0e2a18e5a
1 file changed
+5
-8
collectors/cgroups.plugin/cgroup-name.sh
+5
-8
@@ -522,16 +522,13 @@ if [ -z "${NAME}" ]; then
522
523
elif [[ ${CGROUP} =~ machine.slice_machine.*-lxc ]]; then
524
# libvirtd / lxc containers
525
- # examples:
526
- # before: machine.slice machine-lxc/x2d969/x2dhubud0xians01.scope
527
- # after: lxc/hubud0xians01
528
- # before: machine.slice_machine-lxc/x2d969/x2dhubud0xians01.scope/libvirt_init.scope
529
- # after: lxc/hubud0xians01/libvirt_init
530
- NAME="lxc/$(echo "${CGROUP}" | sed 's/machine.slice_machine.*-lxc//; s/\/x2d[[:digit:]]*//; s/\/x2d//g; s/\.scope//g')"
525
+ # machine.slice machine-lxc/x2d969/x2dhubud0xians01.scope => lxc/hubud0xians01
526
+ # machine.slice_machine-lxc/x2d969/x2dhubud0xians01.scope/libvirt_init.scope => lxc/hubud0xians01/libvirt_init
527
+ NAME="lxc/$(echo "${CGROUP}" | sed 's/machine.slice_machine.*-lxc//; s/[\/_]x2d[[:digit:]]*//; s/[\/_]x2d//g; s/\.scope//g')"
528
elif [[ ${CGROUP} =~ machine.slice_machine.*-qemu ]]; then
529
# libvirtd / qemu virtual machines
533
- # NAME="$(echo ${CGROUP} | sed 's/machine.slice_machine.*-qemu//; s/\/x2d//; s/\/x2d/\-/g; s/\.scope//g')"
534
- NAME="qemu_$(echo "${CGROUP}" | sed 's/machine.slice_machine.*-qemu//; s/\/x2d[[:digit:]]*//; s/\/x2d//g; s/\.scope//g')"
530
+ # machine.slice_machine-qemu_x2d1_x2dopnsense.scope => qemu_opnsense
531
+ NAME="qemu_$(echo "${CGROUP}" | sed 's/machine.slice_machine.*-qemu//; s/[\/_]x2d[[:digit:]]*//; s/[\/_]x2d//g; s/\.scope//g')"
532
533
elif [[ ${CGROUP} =~ machine_.*\.libvirt-qemu ]]; then
534
# libvirtd / qemu virtual machines