From 5b18571870dd2ca38c161a6d1015bb12ff0e8946 Mon Sep 17 00:00:00 2001
From: fedor <f.lushev@yandex.ru>
Date: Tue, 26 Oct 2021 11:29:17 +0700
Subject: [PATCH] docker v0.3 - docker.container_running with docker ps - fixed
 file location

---
 docker.sh        | 65 ------------------------------------------------
 docker/docker.sh |  4 +--
 2 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100755 docker.sh

diff --git a/docker.sh b/docker.sh
deleted file mode 100755
index ecfd77c..0000000
--- a/docker.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-# ABOUT docker for zabbix
-# author mikedmorto 2021 year
-export LC_ALL=""
-export LANG="en_US.UTF-8"
-version="0.3"
-DOCKER="/usr/bin/docker"
-
-JSON=""
-#### PARAMETRS ####
-METRIC="$1"
-ITEM="$2"
-
-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}
-JSON=${JSON}"]}"
-echo ${JSON}
-exit 0
-;;
-
-# get container status
-docker.container_running)
-
-RET=`${DOCKER} ps -a | tail -n +2 | awk -v IT="${ITEM}" ' BEGIN {$count=0;} { if ($1 == IT && $7 == "Up") count += 1 } END {if (count > 1) print ""; else if (count == 1) print 1; else if (count == 0) print 0} '`
-	echo ${RET}
-
-
-	exit 0
-;;
-
-script.version)
-
-      echo ${version}
-	
-      exit 0
-;;
-
-help)
-echo "please use these parametrs
-{
-discovery
-docker.container_running
-script.version
-}"
-;;
-*)
-	echo ""
-;;
-esac
diff --git a/docker/docker.sh b/docker/docker.sh
index 95def97..ecfd77c 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.1"
+version="0.3"
 DOCKER="/usr/bin/docker"
 
 JSON=""
@@ -37,7 +37,7 @@ 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} '`
+RET=`${DOCKER} ps -a | tail -n +2 | awk -v IT="${ITEM}" ' BEGIN {$count=0;} { if ($1 == IT && $7 == "Up") count += 1 } END {if (count > 1) print ""; else if (count == 1) print 1; else if (count == 0) print 0} '`
 	echo ${RET}