diff options
| author | Eric Faden <efaden@gmail.com> | 2017-06-18 08:58:07 -0400 |
|---|---|---|
| committer | Eric Faden <efaden@gmail.com> | 2017-06-18 08:58:07 -0400 |
| commit | 7769e402a5fdd626ec2d58215652a31d956a3c26 (patch) | |
| tree | e8bdbad043ee5b0d8c1b016e713d81712a35a2bf /plugins.d | |
| parent | 78a3845f28ed21499510eab4bf95873c236619d2 (diff) | |
Fixed to work with config files directly. Requires netdata to be in group www-data.
Diffstat (limited to 'plugins.d')
| -rwxr-xr-x | plugins.d/cgroup-name.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/plugins.d/cgroup-name.sh b/plugins.d/cgroup-name.sh index 830830a849..3d1a2fbe5a 100755 --- a/plugins.d/cgroup-name.sh +++ b/plugins.d/cgroup-name.sh @@ -124,18 +124,22 @@ if [ -z "${NAME}" ] # libvirtd / qemu virtual machines NAME="$(echo ${CGROUP} | sed 's/machine.slice_machine.*-qemu//; s/\/x2d//; s/\/x2d/\-/g; s/\.scope//g')" - elif [[ "${CGROUP}" =~ qemu.slice_[0-9]+.scope && -d /etc/pve ]] + elif [[ "${CGROUP}" =~ qemu.slice_([0-9]+).scope && -d /etc/pve ]] then - # Proxmox VMs - - PVEID="$( echo "${CGROUP}" | sed "s|qemu.slice_\([0-9]\+\).scope|\1|" )" - NAME="$(qm config ${PVEID} | grep -oP 'name: (.*)' | sed 's/name: //' )" - elif [[ "${CGROUP}" =~ lxc_[0-9]+ && -d /etc/pve ]] + + # Proxmox VMs + if [[ -f /etc/pve/qemu-server/${BASH_REMATCH[1]}.conf ]] + then + NAME=$(grep -e '^name: ' /etc/pve/qemu-server/${BASH_REMATCH[1]}.conf | head -1 | sed -rn 's|\s*name\s*:\s*(.*)?$|\1|p') + fi + elif [[ "${CGROUP}" =~ lxc_([0-9]+) && -d /etc/pve ]] then # Proxmox Container (LXC) - PVEID="$( echo "${CGROUP}" | sed "s|lxc_\([0-9]\+\)|\1|" )" - NAME="$(pct config ${PVEID} | grep -oP 'hostname: (.*)' | sed 's/hostname: //' )" + if [[ -f /etc/pve/lxc/${BASH_REMATCH[1]}.conf ]] + then + NAME=$(grep -e '^hostname: ' /etc/pve/lxc/${BASH_REMATCH[1]}.conf | head -1 | sed -rn 's|\s*hostname\s*:\s*(.*)?$|\1|p') + fi fi [ -z "${NAME}" ] && NAME="${CGROUP}" |