fixed a bug that prevented dispatching alarms to multiple email recipients

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

diff --git a/plugins.d/cgroup-name.sh b/plugins.d/cgroup-name.sh
index 90611905ceda43828ef218cf8134181811f054a8..1c6f564b4c820dab31282939b63bb9ddcbd671c5 100755 (executable)
--- a/plugins.d/cgroup-name.sh
+++ b/plugins.d/cgroup-name.sh
@@ -16,7 +16,7 @@ fi
 
 if [ -f "${CONFIG}" ]
     then
-    NAME="$(cat "${CONFIG}" | grep "^${CGROUP} " | sed "s/[[:space:]]\+/ /g" | cut -d ' ' -f 2)"
+    NAME="$(grep "^${CGROUP} " "${CONFIG}" | sed "s/[[:space:]]\+/ /g" | cut -d ' ' -f 2)"
     if [ -z "${NAME}" ]
         then
         echo >&2 "${0}: cannot find cgroup '${CGROUP}' in '${CONFIG}'."
@@ -26,28 +26,31 @@ if [ -f "${CONFIG}" ]
 fi
 
 function get_name_classic {
-    DOCKERID=$1
+    local DOCKERID="$1"
     echo >&2 "Running command: docker ps --filter=id=\"${DOCKERID}\" --format=\"{{.Names}}\""
     NAME="$( docker ps --filter=id="${DOCKERID}" --format="{{.Names}}" )"
+    return 0
 }
 
 function get_name_api {
-    DOCKERID=$1
+    local DOCKERID="$1"
     if [ ! -S "/var/run/docker.sock" ]
         then
         echo >&2 "Can't find /var/run/docker.sock"
-        return
+        return 1
     fi
     echo >&2 "Running API command: /containers/${DOCKERID}/json"
     JSON=$(echo -e "GET /containers/${DOCKERID}/json HTTP/1.0\r\n" | nc -U /var/run/docker.sock | egrep '^{.*')
     NAME=$(echo $JSON | jq -r .Name,.Config.Hostname | grep -v null | head -n1 | sed 's|^/||')
+    return 0
 }
 
 if [ -z "${NAME}" ]
     then
-    if [[ "${CGROUP}" =~ ^.*docker[-/\.][a-fA-F0-9]+[-\.]?.*$ ]]
+    if [[ "${CGROUP}" =~ ^.*docker[-_/\.][a-fA-F0-9]+[-_\.]?.*$ ]]
         then
-        DOCKERID="$( echo "${CGROUP}" | sed "s|^.*docker[-/]\([a-fA-F0-9]\+\)[-\.]\?.*$|\1|" )"
+        DOCKERID="$( echo "${CGROUP}" | sed "s|^.*docker[-_/]\([a-fA-F0-9]\+\)[-_\.]\?.*$|\1|" )"
+        # echo "DOCKERID=${DOCKERID}"
 
         if [ ! -z "${DOCKERID}" -a \( ${#DOCKERID} -eq 64 -o ${#DOCKERID} -eq 12 \) ]
             then
@@ -55,7 +58,7 @@ if [ -z "${NAME}" ]
                 then
                 get_name_classic $DOCKERID
             else
-                get_name_api $DOCKERID
+                get_name_api $DOCKERID || get_name_classic $DOCKERID
             fi
             if [ -z "${NAME}" ]
                 then
@@ -68,7 +71,7 @@ if [ -z "${NAME}" ]
     fi
 
     [ -z "${NAME}" ] && NAME="${CGROUP}"
-    [ ${#NAME} -gt 50 ] && NAME="${NAME:0:50}"
+    [ ${#NAME} -gt 100 ] && NAME="${NAME:0:100}"
 fi
 
 echo >&2 "${0}: cgroup '${CGROUP}' is called '${NAME}'"