From e3b9cf93e1d86a64fe0124b65a661f1ffa41ed36 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 Jun 2021 14:43:05 +0200 Subject: [PATCH 1/2] Update check_all_open_files.sh using command -v instead of which use single if elif loop, instead of nested loops dont overwrite PGREP --- check_all_open_files.sh | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/check_all_open_files.sh b/check_all_open_files.sh index 6d99d64..c64669b 100755 --- a/check_all_open_files.sh +++ b/check_all_open_files.sh @@ -10,9 +10,9 @@ # Bash strict mode, to make debugging easier see http://redsymbol.net/articles/unofficial-bash-strict-mode/ set -euo pipefail IFS=$'\n\t' -SUDO=$(which sudo) -LSOF=$(which lsof) -PGREP=$(which pgrep) +SUDO=$(command -v sudo) +LSOF=$(command -v lsof) +PGREP=$(command -v pgrep) WC=$(which wc) PROGRAM="" ERROR_CODE=-1 @@ -30,7 +30,7 @@ else CRITICAL=$2 fi -if [ ! -z "$3" ];then +if [ -n "$3" ];then PROGRAM="$3" fi @@ -39,16 +39,16 @@ set -u function checkExitStatus { if [ "$1" -ne 0 ]; then echo "!!! command failure !!! $2" - exit -1 + exit 1 fi } if [ -z "$PROGRAM" ];then LSOF=$("$SUDO" "$LSOF" | "$WC" -l) else - PGREP=$("$PGREP" --full "$3") + list=$("$PGREP" --full "$3") summe=0 - for i in $PGREP + for i in $list do tmp=$("$SUDO" "$LSOF" -p "$i" | "$WC" -l) summe=$((summe + tmp)) @@ -58,14 +58,12 @@ fi if [ "$LSOF" -lt "$WARNING" ]; then echo "OK $LSOF files open|files=$LSOF;$WARNING;$CRITICAL;0" ERROR_CODE=0 -else - if [ "$LSOF" -ge "$WARNING" ] && [ "$LSOF" -le "$CRITICAL" ]; then - echo "WARN $LSOF files open|files=$LSOF;$WARNING;$CRITICAL;0" - ERROR_CODE=1 - elif [ "$LSOF" -ge "$CRITICAL" ]; then - echo "CRIT $LSOF files open|files=$LSOF;$WARNING;$CRITICAL;0" - ERROR_CODE=2 - fi +elif [ "$LSOF" -ge "$WARNING" ] && [ "$LSOF" -le "$CRITICAL" ]; then + echo "WARN $LSOF files open|files=$LSOF;$WARNING;$CRITICAL;0" + ERROR_CODE=1 +elif [ "$LSOF" -ge "$CRITICAL" ]; then + echo "CRIT $LSOF files open|files=$LSOF;$WARNING;$CRITICAL;0" + ERROR_CODE=2 fi exit $ERROR_CODE From f8f24cce8f82e6a1bf67cc7d371a7827a05e58ae Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 Jun 2021 14:43:47 +0200 Subject: [PATCH 2/2] Update check_all_open_files.sh command -v isntead of which --- check_all_open_files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_all_open_files.sh b/check_all_open_files.sh index c64669b..8d67d05 100755 --- a/check_all_open_files.sh +++ b/check_all_open_files.sh @@ -13,7 +13,7 @@ IFS=$'\n\t' SUDO=$(command -v sudo) LSOF=$(command -v lsof) PGREP=$(command -v pgrep) -WC=$(which wc) +WC=$(command -v wc) PROGRAM="" ERROR_CODE=-1 set +u