/collectors/charts.d.plugin: fix `os_id` detection in `run` (#8002)
Ilya Mashchenko committed
Feb 10, 2020 at 12:09 UTC
85ff1493466223799e91864249d5b2033a7a0869
1 file changed
+15
-1
collectors/charts.d.plugin/charts.d.plugin.in
+15
-1
@@ -275,13 +275,27 @@ fixid() {
275
tr "[A-Z]" "[a-z]"
276
}
277
278
+isvarset() {
279
+ [ -n "$1" ] && [ "$1" != "unknown" ] && [ "$1" != "none" ]
280
+ return $?
281
+}
282
+
283
+getosid() {
284
+ if isvarset "${NETDATA_CONTAINER_OS_ID}"; then
285
+ echo "${NETDATA_CONTAINER_OS_ID}"
286
+ else
287
+ echo "${NETDATA_SYSTEM_OS_ID}"
288
+ fi
289
+}
290
+
291
run() {
292
local ret pid="${BASHPID}" t
293
294
if [ "z${1}" = "z-t" -a "${2}" != "0" ]; then
295
t="${2}"
296
shift 2
284
- case "${NETDATA_SYSTEM_OS_ID}" in
297
+
298
+ case "$(getosid)" in
299
"alpine")
300
timeout -t ${t} "${@}" 2>"${TMP_DIR}/run.${pid}"
301
;;