Fixed to work with config files directly. Requires netdata to be in group www-data.
Eric Faden committed
Jun 18, 2017 at 08:58 UTC
7769e402a5fdd626ec2d58215652a31d956a3c26
1 file changed
+12
-8
plugins.d/cgroup-name.sh
+12
-8
@@ -124,18 +124,22 @@ if [ -z "${NAME}" ]
124
# libvirtd / qemu virtual machines
125
126
NAME="$(echo ${CGROUP} | sed 's/machine.slice_machine.*-qemu//; s/\/x2d//; s/\/x2d/\-/g; s/\.scope//g')"
127
- elif [[ "${CGROUP}" =~ qemu.slice_[0-9]+.scope && -d /etc/pve ]]
127
+ elif [[ "${CGROUP}" =~ qemu.slice_([0-9]+).scope && -d /etc/pve ]]
128
then
129
- # Proxmox VMs
130
-
131
- PVEID="$( echo "${CGROUP}" | sed "s|qemu.slice_\([0-9]\+\).scope|\1|" )"
132
- NAME="$(qm config ${PVEID} | grep -oP 'name: (.*)' | sed 's/name: //' )"
133
- elif [[ "${CGROUP}" =~ lxc_[0-9]+ && -d /etc/pve ]]
129
+
130
+ # Proxmox VMs
131
+ if [[ -f /etc/pve/qemu-server/${BASH_REMATCH[1]}.conf ]]
132
+ then
133
+ NAME=$(grep -e '^name: ' /etc/pve/qemu-server/${BASH_REMATCH[1]}.conf | head -1 | sed -rn 's|\s*name\s*:\s*(.*)?$|\1|p')
134
+ fi
135
+ elif [[ "${CGROUP}" =~ lxc_([0-9]+) && -d /etc/pve ]]
136
then
137
138
# Proxmox Container (LXC)
137
- PVEID="$( echo "${CGROUP}" | sed "s|lxc_\([0-9]\+\)|\1|" )"
138
- NAME="$(pct config ${PVEID} | grep -oP 'hostname: (.*)' | sed 's/hostname: //' )"
139
+ if [[ -f /etc/pve/lxc/${BASH_REMATCH[1]}.conf ]]
140
+ then
141
+ NAME=$(grep -e '^hostname: ' /etc/pve/lxc/${BASH_REMATCH[1]}.conf | head -1 | sed -rn 's|\s*hostname\s*:\s*(.*)?$|\1|p')
142
+ fi
143
fi
144
145
[ -z "${NAME}" ] && NAME="${CGROUP}"