cgroup-name.sh gives persistent libvirt/qemu names, without the domain id
Costa Tsaousis (ktsaou) committed
Jul 2, 2017 at 20:31 UTC
d327798d1fe397b6c711de9207617d911ca56928
1 file changed
+27
-25
plugins.d/cgroup-name.sh
+27
-25
@@ -74,22 +74,22 @@ if [ -f "${CONFIG}" ]
74
# info "configuration file '${CONFIG}' is not available."
75
fi
76
77
-function get_name_classic {
78
- local DOCKERID="$1"
79
- info "Running command: docker ps --filter=id=\"${DOCKERID}\" --format=\"{{.Names}}\""
80
- NAME="$( docker ps --filter=id="${DOCKERID}" --format="{{.Names}}" )"
77
+function docker_get_name_classic {
78
+ local id="${1}"
79
+ info "Running command: docker ps --filter=id=\"${id}\" --format=\"{{.Names}}\""
80
+ NAME="$( docker ps --filter=id="${id}" --format="{{.Names}}" )"
81
return 0
82
}
83
84
-function get_name_api {
85
- local DOCKERID="$1"
84
+function docker_get_name_api {
85
+ local id="${1}"
86
if [ ! -S "/var/run/docker.sock" ]
87
then
88
warning "Can't find /var/run/docker.sock"
89
return 1
90
fi
91
- info "Running API command: /containers/${DOCKERID}/json"
92
- JSON=$(echo -e "GET /containers/${DOCKERID}/json HTTP/1.0\r\n" | nc -U /var/run/docker.sock | grep '^{.*')
91
+ info "Running API command: /containers/${id}/json"
92
+ JSON=$(echo -e "GET /containers/${id}/json HTTP/1.0\r\n" | nc -U /var/run/docker.sock | grep '^{.*')
93
NAME=$(echo $JSON | jq -r .Name,.Config.Hostname | grep -v null | head -n1 | sed 's|^/||')
94
return 0
95
}
@@ -107,9 +107,9 @@ if [ -z "${NAME}" ]
107
then
108
if hash docker 2>/dev/null
109
then
110
- get_name_classic $DOCKERID
110
+ docker_get_name_classic ${DOCKERID}
111
else
112
- get_name_api $DOCKERID || get_name_classic $DOCKERID
112
+ docker_get_name_api ${DOCKERID} || docker_get_name_classic ${DOCKERID}
113
fi
114
if [ -z "${NAME}" ]
115
then
@@ -123,28 +123,30 @@ if [ -z "${NAME}" ]
123
then
124
# libvirtd / qemu virtual machines
125
126
- NAME="$(echo ${CGROUP} | sed 's/machine.slice_machine.*-qemu//; s/\/x2d//; s/\/x2d/\-/g; s/\.scope//g')"
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}" =~ qemu.slice_([0-9]+).scope && -d /etc/pve ]]
130
then
129
-
130
- # Proxmox VMs
131
- FILENAME="/etc/pve/qemu-server/${BASH_REMATCH[1]}.conf"
132
- if [[ -f $FILENAME && -r $FILENAME ]]
133
- then
131
+ # Proxmox VMs
132
+
133
+ FILENAME="/etc/pve/qemu-server/${BASH_REMATCH[1]}.conf"
134
+ if [[ -f $FILENAME && -r $FILENAME ]]
135
+ then
136
NAME=$(grep -e '^name: ' /etc/pve/qemu-server/${BASH_REMATCH[1]}.conf | head -1 | sed -rn 's|\s*name\s*:\s*(.*)?$|\1|p')
135
- else
136
- error "proxmox config file missing $FILENAME or netdata does not have read access. Please ensure netdata is a member of www-data group."
137
- fi
137
+ else
138
+ error "proxmox config file missing ${FILENAME} or netdata does not have read access. Please ensure netdata is a member of www-data group."
139
+ fi
140
elif [[ "${CGROUP}" =~ lxc_([0-9]+) && -d /etc/pve ]]
141
then
142
+ # Proxmox Containers (LXC)
143
141
- # Proxmox Container (LXC)
142
- FILENAME="/etc/pve/lxc/${BASH_REMATCH[1]}.conf"
143
- if [[ -f $FILENAME && -r $FILENAME ]]
144
+ FILENAME="/etc/pve/lxc/${BASH_REMATCH[1]}.conf"
145
+ if [[ -f ${FILENAME} && -r ${FILENAME} ]]
146
then
145
- NAME=$(grep -e '^hostname: ' /etc/pve/lxc/${BASH_REMATCH[1]}.conf | head -1 | sed -rn 's|\s*hostname\s*:\s*(.*)?$|\1|p')
146
- else
147
- error "proxmox config file missing $FILENAME or netdata does not have read access. Please ensure netdata is a member of www-data group."
147
+ NAME=$(grep -e '^hostname: ' /etc/pve/lxc/${BASH_REMATCH[1]}.conf | head -1 | sed -rn 's|\s*hostname\s*:\s*(.*)?$|\1|p')
148
+ else
149
+ error "proxmox config file missing ${FILENAME} or netdata does not have read access. Please ensure netdata is a member of www-data group."
150
fi
151
fi
152