From 2995b290815126ffdb60c48be7a560cd1c7fa4f9 Mon Sep 17 00:00:00 2001 From: Nate Date: Mon, 17 Dec 2018 15:06:16 -0800 Subject: Update cgroup-name.sh.in (#4991) get the container name on ECS --- collectors/cgroups.plugin/cgroup-name.sh.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'collectors/cgroups.plugin') diff --git a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plugin/cgroup-name.sh.in index 53696a4bf9..745c1c42f7 100755 --- a/collectors/cgroups.plugin/cgroup-name.sh.in +++ b/collectors/cgroups.plugin/cgroup-name.sh.in @@ -133,6 +133,19 @@ if [ -z "${NAME}" ] else error "a docker id cannot be extracted from docker cgroup '${CGROUP}'." fi + elif [[ "${CGROUP}" =~ ^.*ecs[-_/\.][a-fA-F0-9]+[-_\.]?.*$ ]] + then + # ECS + + DOCKERID="$( echo "${CGROUP}" | sed "s|^.*ecs[-_/].*[-_/]\([a-fA-F0-9]\+\)[-_\.]\?.*$|\1|" )" + # echo "DOCKERID=${DOCKERID}" + + if [ ! -z "${DOCKERID}" -a \( ${#DOCKERID} -eq 64 -o ${#DOCKERID} -eq 12 \) ] + then + docker_get_name "${DOCKERID}" + else + error "a docker id cannot be extracted from docker cgroup '${CGROUP}'." + fi elif [[ "${CGROUP}" =~ ^.*kubepods[_/].*[_/]pod[a-fA-F0-9-]+[_/][a-fA-F0-9]+$ ]] then # kubernetes -- cgit v1.2.3