properly rename .libvirt-qemu cgroups
Costa Tsaousis (ktsaou) committed
Nov 14, 2017 at 02:39 UTC
a3d19272f515b521b8b193e5b1b69e40baacec36
2 files changed
+3
-1
plugins.d/cgroup-name.sh
+1
-1
@@ -126,7 +126,7 @@ if [ -z "${NAME}" ]
126
# NAME="$(echo ${CGROUP} | sed 's/machine.slice_machine.*-qemu//; s/\/x2d//; s/\/x2d/\-/g; s/\.scope//g')"
127
NAME="qemu_$(echo ${CGROUP} | sed 's/machine.slice_machine.*-qemu//; s/\/x2d[[:digit:]]*//; s/\/x2d//g; s/\.scope//g')"
128
129
- elif [[ "${CGROUP}" =~ machine_*\.libvirt-qemu ]]
129
+ elif [[ "${CGROUP}" =~ machine_.*\.libvirt-qemu ]]
130
then
131
# libvirtd / qemu virtual machines
132
NAME="qemu_$(echo ${CGROUP} | sed 's/^machine_//; s/\.libvirt-qemu$//; s/-/_/;')"
src/sys_fs_cgroup.c
+2
@@ -204,6 +204,8 @@ void read_cgroup_plugin_configuration() {
204
" *lxc* "
205
" *qemu* "
206
" *.libvirt-qemu " // #3010
207
+ " !*/vcpu* " // libvirtd adds these sub-cgroups
208
+ " !*/emulator* " // libvirtd adds these sub-cgroups
209
" !/ "
210
" !*.mount "
211
" !*.partition "