Allow DOCKER_HOST env variable to override default docker socket path (#4277)
xginn8 committed
Sep 24, 2018 at 13:38 UTC
53e8c5ab747965ebc1a5fab342168a1adabeb580
1 file changed
+4
-3
plugins.d/cgroup-name.sh
+4
-3
@@ -52,6 +52,7 @@ debug() {
52
# -----------------------------------------------------------------------------
53
54
[ -z "${NETDATA_CONFIG_DIR}" ] && NETDATA_CONFIG_DIR="$(dirname "${0}")/../../../../etc/netdata"
55
+DOCKER_HOST="${DOCKER_HOST:=/var/run/docker.sock}"
56
CONFIG="${NETDATA_CONFIG_DIR}/cgroups-names.conf"
57
CGROUP="${1}"
58
NAME=
@@ -83,13 +84,13 @@ function docker_get_name_classic {
84
85
function docker_get_name_api {
86
local id="${1}"
86
- if [ ! -S "/var/run/docker.sock" ]
87
+ if [ ! -S "${DOCKER_HOST}" ]
88
then
88
- warning "Can't find /var/run/docker.sock"
89
+ warning "Can't find ${DOCKER_HOST}"
90
return 1
91
fi
92
info "Running API command: /containers/${id}/json"
92
- JSON=$(echo -e "GET /containers/${id}/json HTTP/1.0\r\n" | nc -U /var/run/docker.sock | grep '^{.*')
93
+ JSON=$(echo -e "GET /containers/${id}/json HTTP/1.0\r\n" | nc -U ${DOCKER_HOST} | grep '^{.*')
94
NAME=$(echo $JSON | jq -r .Name,.Config.Hostname | grep -v null | head -n1 | sed 's|^/||')
95
return 0
96
}