diff options
| author | xginn8 <xginn8@users.noreply.github.com> | 2018-09-24 13:38:23 +0200 |
|---|---|---|
| committer | Costa Tsaousis <costa@tsaousis.gr> | 2018-09-24 14:38:23 +0300 |
| commit | 53e8c5ab747965ebc1a5fab342168a1adabeb580 (patch) | |
| tree | 8a6d6091bc1587bdea2aeb72df279dc5e96f3cfb | |
| parent | ece7ab755275017038165195c9b11cb93462afe3 (diff) | |
Allow DOCKER_HOST env variable to override default docker socket path (#4277)
| -rwxr-xr-x | plugins.d/cgroup-name.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins.d/cgroup-name.sh b/plugins.d/cgroup-name.sh index c450cf960a..8769c2a5dc 100755 --- a/plugins.d/cgroup-name.sh +++ b/plugins.d/cgroup-name.sh @@ -52,6 +52,7 @@ debug() { # ----------------------------------------------------------------------------- [ -z "${NETDATA_CONFIG_DIR}" ] && NETDATA_CONFIG_DIR="$(dirname "${0}")/../../../../etc/netdata" +DOCKER_HOST="${DOCKER_HOST:=/var/run/docker.sock}" CONFIG="${NETDATA_CONFIG_DIR}/cgroups-names.conf" CGROUP="${1}" NAME= @@ -83,13 +84,13 @@ function docker_get_name_classic { function docker_get_name_api { local id="${1}" - if [ ! -S "/var/run/docker.sock" ] + if [ ! -S "${DOCKER_HOST}" ] then - warning "Can't find /var/run/docker.sock" + warning "Can't find ${DOCKER_HOST}" return 1 fi info "Running API command: /containers/${id}/json" - JSON=$(echo -e "GET /containers/${id}/json HTTP/1.0\r\n" | nc -U /var/run/docker.sock | grep '^{.*') + JSON=$(echo -e "GET /containers/${id}/json HTTP/1.0\r\n" | nc -U ${DOCKER_HOST} | grep '^{.*') NAME=$(echo $JSON | jq -r .Name,.Config.Hostname | grep -v null | head -n1 | sed 's|^/||') return 0 } |