cgroups: now all cgroups are evaluated by default, up to 500 cgroups are allowed...

[netdata.git] / plugins.d / cgroup-name.sh

diff --git a/plugins.d/cgroup-name.sh b/plugins.d/cgroup-name.sh
index 1be3aec1f83a525ad8ac676752cbe54d760ecaef..4bb963dd885d2cbd93c1ee31392fe32a1a54be6c 100755 (executable)
--- a/plugins.d/cgroup-name.sh
+++ b/plugins.d/cgroup-name.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 export PATH="${PATH}:/sbin:/usr/sbin:/usr/local/sbin"
+export LC_ALL=C
 
 NETDATA_CONFIG_DIR="${NETDATA_CONFIG_DIR-/etc/netdata}"
 CONFIG="${NETDATA_CONFIG_DIR}/cgroups-names.conf"
@@ -20,26 +21,33 @@ if [ -f "${CONFIG}" ]
                then
                echo >&2 "${0}: cannot find cgroup '${CGROUP}' in '${CONFIG}'."
        fi
-else
-       echo >&2 "${0}: configuration file '${CONFIG}' is not available."
-fi
-
-if [ -z "${NAME}" -a "${CGROUP:0:7}" = "docker/" ]
-       then
-       NAME="$(docker ps --filter=id="${CGROUP:7:64}" --format="{{.Names}}")"
-       [ -z "${NAME}" ] && NAME="${CGROUP:0:19}"
-       [ ${#NAME} -gt 20 ] && NAME="${NAME:0:20}"
+#else
+#      echo >&2 "${0}: configuration file '${CONFIG}' is not available."
 fi
 
 if [ -z "${NAME}" ]
        then
-       if [ ${#CGROUP} -gt 20 ]
+       if [[ "${CGROUP}" =~ ^.*docker[-/\.][a-fA-F0-9]+[-\.]?.*$ ]]
                then
-               NAME="${CGROUP:0:20}"
-       else
-               NAME="${CGROUP}"
+               DOCKERID="$( echo "${CGROUP}" | sed "s|^.*docker[-/]\([a-fA-F0-9]\+\)[-\.]\?.*$|\1|" )"
+
+               if [ ! -z "${DOCKERID}" -a \( ${#DOCKERID} -eq 64 -o ${#DOCKERID} -eq 12 \) ]
+                       then
+                       echo >&2 "Running command: docker ps --filter=id=\"${DOCKERID}\" --format=\"{{.Names}}\""
+                       NAME="$( docker ps --filter=id="${DOCKERID}" --format="{{.Names}}" )"
+                       if [ -z "${NAME}" ]
+                               then
+                               echo >&2 "Cannot find the name of docker container '${DOCKERID}'"
+                               NAME="${DOCKERID:0:12}"
+                       else
+                               echo >&2 "Docker container '${DOCKERID}' is named '${NAME}'"
+                       fi
+               fi
        fi
+
+       [ -z "${NAME}" ] && NAME="${CGROUP}"
+       [ ${#NAME} -gt 50 ] && NAME="${NAME:0:50}"
 fi
 
-echo >&2 "${0}: cgroup '${CGROUP}' is named as '${NAME}'"
+echo >&2 "${0}: cgroup '${CGROUP}' is called '${NAME}'"
 echo "${NAME}"