From 62ce25168560104393651c3754b102cd99945977 Mon Sep 17 00:00:00 2001
From: Chris Akritidis <43294513+cakrit@users.noreply.github.com>
Date: Tue, 30 Jun 2020 07:21:31 -0700
Subject: Show cgroups/containers ran by kubelet without access to kubernetes
 cluster information (#9321)

---
 collectors/cgroups.plugin/cgroup-name.sh.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'collectors/cgroups.plugin')

diff --git a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plugin/cgroup-name.sh.in
index ab16e673d9..ad0ab0b663 100755
--- a/collectors/cgroups.plugin/cgroup-name.sh.in
+++ b/collectors/cgroups.plugin/cgroup-name.sh.in
@@ -181,7 +181,11 @@ done
 if [ -z "${NAME}" ]; then
 	if [[ ${CGROUP} =~ ^.*kubepods.* ]]; then
 		k8s_get_name "${CGROUP}"
-	elif [[ ${CGROUP} =~ ^.*docker[-_/\.][a-fA-F0-9]+[-_\.]?.*$ ]]; then
+	fi
+fi
+
+if [ -z "${NAME}" ]; then
+	if [[ ${CGROUP} =~ ^.*docker[-_/\.][a-fA-F0-9]+[-_\.]?.*$ ]]; then
 		# docker containers
 		#shellcheck disable=SC1117
 		DOCKERID="$(echo "${CGROUP}" | sed "s|^.*docker[-_/]\([a-fA-F0-9]\+\)[-_\.]\?.*$|\1|")"
-- 
cgit v1.2.3