fix(cgroups.plugin): use Docker API for name resolution when Docker is a snap package (#13523)
Ilya Mashchenko committed
Aug 17, 2022 at 15:34 UTC
c3dba899af944853aaf2f4be0f7a3be24ae0e29d
1 file changed
+4
-1
collectors/cgroups.plugin/cgroup-name.sh
+4
-1
@@ -450,7 +450,10 @@ function k8s_get_name() {
450
451
function docker_get_name() {
452
local id="${1}"
453
- if hash docker 2> /dev/null; then
453
+ # See https://github.com/netdata/netdata/pull/13523 for details
454
+ if command -v snap >/dev/null 2>&1 && snap list docker >/dev/null 2>&1; then
455
+ docker_like_get_name_api DOCKER_HOST "${id}"
456
+ elif hash docker 2> /dev/null; then
457
docker_like_get_name_command docker "${id}"
458
else
459
docker_like_get_name_api DOCKER_HOST "${id}" || docker_like_get_name_command podman "${id}"