]> arthur.barton.de Git - netdata.git/commitdiff
cgroup-name.sh now extracts proper docker names #115
authorCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Wed, 27 Apr 2016 08:34:26 +0000 (11:34 +0300)
committerCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Wed, 27 Apr 2016 08:34:26 +0000 (11:34 +0300)
plugins.d/cgroup-name.sh

index f0a89594ce32e7f50a0f9dd03aa9c9bf3bfc85c8..1be3aec1f83a525ad8ac676752cbe54d760ecaef 100755 (executable)
@@ -26,8 +26,9 @@ fi
 
 if [ -z "${NAME}" -a "${CGROUP:0:7}" = "docker/" ]
        then
-       NAME="$(docker ps | grep "^${CGROUP:7:12}" | sed "s/[[:space:]]\+/ /g" | cut -d ' ' -f 2)"
+       NAME="$(docker ps --filter=id="${CGROUP:7:64}" --format="{{.Names}}")"
        [ -z "${NAME}" ] && NAME="${CGROUP:0:19}"
+       [ ${#NAME} -gt 20 ] && NAME="${NAME:0:20}"
 fi
 
 if [ -z "${NAME}" ]