X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=plugins.d%2Fcgroup-name.sh;h=a1e3abe081ad2825fb2edb5321f1c9eb4a2a38db;hb=32e8eda4c4d6370e96233a69cab861b2ebb5cc9a;hp=90611905ceda43828ef218cf8134181811f054a8;hpb=1dfe07df975a513a7761efe179425bfcd4804c71;p=netdata.git

diff --git a/plugins.d/cgroup-name.sh b/plugins.d/cgroup-name.sh
index 90611905..a1e3abe0 100755
--- a/plugins.d/cgroup-name.sh
+++ b/plugins.d/cgroup-name.sh
@@ -1,53 +1,107 @@
 #!/usr/bin/env bash
 
+# netdata
+# real-time performance and health monitoring, done right!
+# (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
+# GPL v3+
+#
+# Script to find a better name for cgroups
+#
+
 export PATH="${PATH}:/sbin:/usr/sbin:/usr/local/sbin"
 export LC_ALL=C
 
+# -----------------------------------------------------------------------------
+
+PROGRAM_NAME="$(basename "${0}")"
+
+logdate() {
+    date "+%Y-%m-%d %H:%M:%S"
+}
+
+log() {
+    local status="${1}"
+    shift
+
+    echo >&2 "$(logdate): ${PROGRAM_NAME}: ${status}: ${*}"
+
+}
+
+warning() {
+    log WARNING "${@}"
+}
+
+error() {
+    log ERROR "${@}"
+}
+
+info() {
+    log INFO "${@}"
+}
+
+fatal() {
+    log FATAL "${@}"
+    exit 1
+}
+
+debug=0
+debug() {
+    [ $debug -eq 1 ] && log DEBUG "${@}"
+}
+
+# -----------------------------------------------------------------------------
+
 NETDATA_CONFIG_DIR="${NETDATA_CONFIG_DIR-/etc/netdata}"
 CONFIG="${NETDATA_CONFIG_DIR}/cgroups-names.conf"
 CGROUP="${1}"
 NAME=
 
+# -----------------------------------------------------------------------------
+
 if [ -z "${CGROUP}" ]
     then
-    echo >&2 "${0}: called without a cgroup name. Nothing to do."
-    exit 1
+    fatal "called without a cgroup name. Nothing to do."
 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}'."
+        info "cannot find cgroup '${CGROUP}' in '${CONFIG}'."
     fi
 #else
-#   echo >&2 "${0}: configuration file '${CONFIG}' is not available."
+#   info "configuration file '${CONFIG}' is not available."
 fi
 
 function get_name_classic {
-    DOCKERID=$1
-    echo >&2 "Running command: docker ps --filter=id=\"${DOCKERID}\" --format=\"{{.Names}}\""
+    local DOCKERID="$1"
+    info "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
+        warning "Can't find /var/run/docker.sock"
+        return 1
     fi
-    echo >&2 "Running API command: /containers/${DOCKERID}/json"
+    info "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|" )"
+        # docker containers
+
+        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,21 +109,26 @@ 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
-                echo >&2 "Cannot find the name of docker container '${DOCKERID}'"
+                warning "cannot find the name of docker container '${DOCKERID}'"
                 NAME="${DOCKERID:0:12}"
             else
-                echo >&2 "Docker container '${DOCKERID}' is named '${NAME}'"
+                info "docker container '${DOCKERID}' is named '${NAME}'"
             fi
         fi
+    elif [[ "${CGROUP}" =~ machine.slice_machine.*-qemu ]]
+        then
+        # libvirtd / qemu virtual machines
+
+        NAME="$(echo ${CGROUP} | sed 's/machine.slice_machine.*-qemu//; s/\/x2d//; s/\/x2d/\-/g; s/\.scope//g')"
     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}'"
+info "cgroup '${CGROUP}' is called '${NAME}'"
 echo "${NAME}"