Fix cgroup name detection for docker containers in containerd cgroup (#13470)
Keith Mitchell committed
Aug 1, 2022 at 03:23 UTC
8db672d4e685d49853c61ae988d7b983ef1fa5d9
1 file changed
+5
collectors/cgroups.plugin/cgroup-name.sh
+5
@@ -518,6 +518,11 @@ if [ -z "${NAME}" ]; then
518
#shellcheck disable=SC1117
519
DOCKERID="$(echo "${CGROUP}" | sed "s|^.*ecs[-_/].*[-_/]\([a-fA-F0-9]\+\)[-_\.]\?.*$|\1|")"
520
docker_validate_id "${DOCKERID}"
521
+ elif [[ ${CGROUP} =~ system.slice_containerd.service_cpuset_[a-fA-F0-9]+[-_\.]?.*$ ]]; then
522
+ # docker containers under containerd
523
+ #shellcheck disable=SC1117
524
+ DOCKERID="$(echo "${CGROUP}" | sed "s|^.*ystem.slice_containerd.service_cpuset_\([a-fA-F0-9]\+\)[-_\.]\?.*$|\1|")"
525
+ docker_validate_id "${DOCKERID}"
526
elif [[ ${CGROUP} =~ ^.*libpod-[a-fA-F0-9]+.*$ ]]; then
527
# Podman
528
PODMANID="$(echo "${CGROUP}" | sed "s|^.*libpod-\([a-fA-F0-9]\+\).*$|\1|")"