@cryptotaxi247 / netdata-1 / commits / 1941a51b2

use docker binary if exists, fallback on docker api if exists

Tit Petric committed May 6, 2016 at 13:45 UTC 1941a51b28dd34918e57b3d5f20c42c9c3b718d7
1 file changed +24 -2
plugins.d/cgroup-name.sh
+24 -2
@@ -25,6 +25,24 @@ if [ -f "${CONFIG}" ]
25 # echo >&2 "${0}: configuration file '${CONFIG}' is not available."
26 fi
27
28 +function get_name_classic {
29 + 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
36 + if [ ! -S "/var/run/docker.sock" ]
37 + then
38 + echo >&2 "Can't find /var/run/docker.sock"
39 + return
40 + fi
41 + echo >&2 "Running API command: /containers/${DOCKERID}/json"
42 + JSON=$(echo -e "GET /containers/${DOCKERID}/json HTTP/1.0\r\n" | nc -U /var/run/docker.sock | egrep '^{.*')
43 + NAME=$(echo $JSON | jq -r .Name,.Config.Hostname | grep -v null | head -n1 | sed 's|^/||')
44 +}
45 +
46 if [ -z "${NAME}" ]
47 then
48 if [[ "${CGROUP}" =~ ^.*docker[-/\.][a-fA-F0-9]+[-\.]?.*$ ]]
@@ -33,8 +51,12 @@ if [ -z "${NAME}" ]
51
52 if [ ! -z "${DOCKERID}" -a \( ${#DOCKERID} -eq 64 -o ${#DOCKERID} -eq 12 \) ]
53 then
36 - echo >&2 "Running command: docker ps --filter=id=\"${DOCKERID}\" --format=\"{{.Names}}\""
37 - NAME="$( docker ps --filter=id="${DOCKERID}" --format="{{.Names}}" )"
54 + if hash docker 2>/dev/null
55 + then
56 + get_name_classic $DOCKERID
57 + else
58 + get_name_api $DOCKERID
59 + fi
60 if [ -z "${NAME}" ]
61 then
62 echo >&2 "Cannot find the name of docker container '${DOCKERID}'"