From 738a20795e89d8fa81825bc47ae60eb9a4eae7fe Mon Sep 17 00:00:00 2001 From: Danil Date: Thu, 20 May 2021 16:05:20 +0700 Subject: [PATCH 1/7] docker init dir --- docker/readme.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docker/readme.md diff --git a/docker/readme.md b/docker/readme.md new file mode 100644 index 0000000..dba7e65 --- /dev/null +++ b/docker/readme.md @@ -0,0 +1,5 @@ +Docker monitoring for zabbix + +docker.sh + + From 8a4df06a1aa3ef360229b6ab411e6751f4be5ca0 Mon Sep 17 00:00:00 2001 From: Danil Date: Thu, 20 May 2021 16:09:07 +0700 Subject: [PATCH 2/7] docker readme fix --- docker/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/readme.md b/docker/readme.md index dba7e65..ba635ee 100644 --- a/docker/readme.md +++ b/docker/readme.md @@ -1,5 +1,5 @@ Docker monitoring for zabbix -docker.sh +docker.sh - script From 26e18214d7534290a272a080f9e149ba71fd9579 Mon Sep 17 00:00:00 2001 From: Mike D'Morto Date: Thu, 20 May 2021 16:15:34 +0700 Subject: [PATCH 3/7] docker.sh created --- docker/docker.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 docker/docker.sh diff --git a/docker/docker.sh b/docker/docker.sh new file mode 100755 index 0000000..73c60c4 --- /dev/null +++ b/docker/docker.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# ABOUT docker for zabbix +# author mikedmorto 2021 year +export LC_ALL="" +export LANG="en_US.UTF-8" +version="0.0" + +echo "test" + + From 8f60aee9d6aabd7ab6abad586bb4482b8fd40bb8 Mon Sep 17 00:00:00 2001 From: danil Date: Wed, 21 Jul 2021 16:36:21 +0700 Subject: [PATCH 4/7] docker.sh added discovery empty --- docker/docker.sh | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/docker/docker.sh b/docker/docker.sh index 73c60c4..57d09dd 100755 --- a/docker/docker.sh +++ b/docker/docker.sh @@ -5,6 +5,30 @@ export LC_ALL="" export LANG="en_US.UTF-8" version="0.0" -echo "test" +JSON="" +#### PARAMETRS #### +METRIC="$1" +ITEM="$2" + +case "$METRIC" in +discovery) + +JSON="{ \"data\":[" +JSON=${JSON::-1} +JSON=${JSON}"]}" +echo ${JSON} +exit 0 +;; + +help) +echo "please use these parametrs +{ +discovery +}" +;; +*) + echo "" +;; +esac From cb423f4432f8f2089d4dd3c08dc95a55aa7e91bd Mon Sep 17 00:00:00 2001 From: Fedor Date: Thu, 23 Sep 2021 17:30:57 +0700 Subject: [PATCH 5/7] docker.sh discovery test --- docker/docker.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker/docker.sh b/docker/docker.sh index 57d09dd..b78e74c 100755 --- a/docker/docker.sh +++ b/docker/docker.sh @@ -4,6 +4,7 @@ export LC_ALL="" export LANG="en_US.UTF-8" version="0.0" +DOCKER="/usr/bin/docker" JSON="" #### PARAMETRS #### @@ -14,6 +15,18 @@ case "$METRIC" in discovery) JSON="{ \"data\":[" +DCLIST="" + + +# get all docker containers list of id + +DCLIST=`${DOCKER} ps -a | tail -n +2 | awk '{print $1}'` + + +#show all docker id +for DOCKERID in ${DCLIST}; do + JSON=${JSON}" {\"{#DOCKERID}\":\"${DOCKERID}\"}," +done JSON=${JSON::-1} From 0d666a840515f77612dd94584ea1297530e32385 Mon Sep 17 00:00:00 2001 From: fedor Date: Thu, 30 Sep 2021 15:07:17 +0700 Subject: [PATCH 6/7] docker.sh container_running testgit --- docker/docker.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docker/docker.sh b/docker/docker.sh index b78e74c..219367b 100755 --- a/docker/docker.sh +++ b/docker/docker.sh @@ -19,11 +19,10 @@ DCLIST="" # get all docker containers list of id - DCLIST=`${DOCKER} ps -a | tail -n +2 | awk '{print $1}'` -#show all docker id +# show all docker id for DOCKERID in ${DCLIST}; do JSON=${JSON}" {\"{#DOCKERID}\":\"${DOCKERID}\"}," done @@ -35,6 +34,16 @@ echo ${JSON} exit 0 ;; +# get container status +docker.container_running) + +RET=`${DOCKER} stats --no-stream | tail -n +2 | awk -v IT="${ITEM}" ' BEGIN {$count=0;} { if ($1 == IT) count += 1 } END {if (count > 1) print ""; else if (count == 1) print 1; else if (count == 0) print 0} '` + echo ${RET} + + + exit 0 +;; + help) echo "please use these parametrs { From 291bd94750d051db7f4de9610ec206ab9364e3c8 Mon Sep 17 00:00:00 2001 From: fedor Date: Thu, 30 Sep 2021 15:25:16 +0700 Subject: [PATCH 7/7] docker v0.1 - docker.container_running - released --- docker/docker.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docker/docker.sh b/docker/docker.sh index 219367b..95def97 100755 --- a/docker/docker.sh +++ b/docker/docker.sh @@ -3,7 +3,7 @@ # author mikedmorto 2021 year export LC_ALL="" export LANG="en_US.UTF-8" -version="0.0" +version="0.1" DOCKER="/usr/bin/docker" JSON="" @@ -44,10 +44,19 @@ RET=`${DOCKER} stats --no-stream | tail -n +2 | awk -v IT="${ITEM}" ' BEGIN {$co exit 0 ;; +script.version) + + echo ${version} + + exit 0 +;; + help) echo "please use these parametrs { discovery +docker.container_running +script.version }" ;; *)