fix for not parsing properly the docker id; fixes #812
Costa Tsaousis committed
Aug 21, 2016 at 20:31 UTC
7b7793a37d3812e4ab6c216c3d48cba27870cac3
1 file changed
+5
-5
plugins.d/cgroup-name.sh
+5
-5
@@ -16,7 +16,7 @@ fi
16
17
if [ -f "${CONFIG}" ]
18
then
19
- NAME="$(cat "${CONFIG}" | grep "^${CGROUP} " | sed "s/[[:space:]]\+/ /g" | cut -d ' ' -f 2)"
19
+ NAME="$(grep "^${CGROUP} " "${CONFIG}" | sed "s/[[:space:]]\+/ /g" | cut -d ' ' -f 2)"
20
if [ -z "${NAME}" ]
21
then
22
echo >&2 "${0}: cannot find cgroup '${CGROUP}' in '${CONFIG}'."
@@ -26,13 +26,13 @@ if [ -f "${CONFIG}" ]
26
fi
27
28
function get_name_classic {
29
- DOCKERID=$1
29
+ local DOCKERID="$1"
30
echo >&2 "Running command: docker ps --filter=id=\"${DOCKERID}\" --format=\"{{.Names}}\""
31
NAME="$( docker ps --filter=id="${DOCKERID}" --format="{{.Names}}" )"
32
}
33
34
function get_name_api {
35
- DOCKERID=$1
35
+ local DOCKERID="$1"
36
if [ ! -S "/var/run/docker.sock" ]
37
then
38
echo >&2 "Can't find /var/run/docker.sock"
@@ -45,9 +45,9 @@ function get_name_api {
45
46
if [ -z "${NAME}" ]
47
then
48
- if [[ "${CGROUP}" =~ ^.*docker[-/\.][a-fA-F0-9]+[-\.]?.*$ ]]
48
+ if [[ "${CGROUP}" =~ ^.*docker[_-/\.][a-fA-F0-9]+[_-\.]?.*$ ]]
49
then
50
- DOCKERID="$( echo "${CGROUP}" | sed "s|^.*docker[-/]\([a-fA-F0-9]\+\)[-\.]\?.*$|\1|" )"
50
+ DOCKERID="$( echo "${CGROUP}" | sed "s|^.*docker[_-/]\([a-fA-F0-9]\+\)[_-\.]\?.*$|\1|" )"
51
52
if [ ! -z "${DOCKERID}" -a \( ${#DOCKERID} -eq 64 -o ${#DOCKERID} -eq 12 \) ]
53
then