From dbc2e57887f18b0aec79875b22f7eb857a27be1c Mon Sep 17 00:00:00 2001 From: Eric Duault Date: Wed, 16 Dec 2020 16:45:29 +0100 Subject: [PATCH] Update check_service.sh - Remove color codes from STATUS_MSG - Use STATUS_MSG in lower case in switch statement --- check_service.sh | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/check_service.sh b/check_service.sh index 8be80c6..ee4d7b3 100755 --- a/check_service.sh +++ b/check_service.sh @@ -257,13 +257,19 @@ EXIT_CODE=$? ## Ref https://github.com/jonschipp/nagios-plugins/issues/15 [ $TRUST_EXIT_CODE -eq 1 ] && [ $EXIT_CODE -eq 0 ] && echo "$STATUS_MSG" && exit $OK -case $STATUS_MSG in +# Remove color codes +STATUS_MSG=$(echo $STATUS_MSG | sed 's/\x1b\[[0-9;]*m//g' 2>&1) + +# Convert to lower case +STATUS_MSG_IN_LOWER_CASE=$(echo $STATUS_MSG | sed -e 's/\(.*\)/\L\1/' 2>&1) + +case $STATUS_MSG_IN_LOWER_CASE in *stop*) echo "$STATUS_MSG" exit $CRITICAL ;; -*STOPPED*) +*stopped*) echo "$STATUS_MSG" exit $CRITICAL ;; @@ -271,14 +277,6 @@ case $STATUS_MSG in echo "$STATUS_MSG" exit $CRITICAL ;; -*NOT*running*) - echo "$STATUS_MSG" - exit $CRITICAL - ;; -*NOT*RUNNING*) - echo "$STATUS_MSG" - exit $CRITICAL - ;; #*inactive*) # echo "$STATUS_MSG" # exit $CRITICAL @@ -291,39 +289,35 @@ case $STATUS_MSG in echo "$STATUS_MSG" exit $OK ;; -*RUNNING*) - echo "$STATUS_MSG" - exit $OK - ;; -*SUCCESS*) +*success*) echo "$STATUS_MSG" exit $OK ;; -*[eE]rr*) +*err*) echo "Error in command: $STATUS_MSG" exit $CRITICAL ;; -*[fF]ailed*) +*failed*) echo "$STATUS_MSG" exit $CRITICAL ;; -*[eE]nable*) +*enable*) echo "$STATUS_MSG" exit $OK ;; -*[dD]isable*) +*disable*) echo "$STATUS_MSG" exit $CRITICAL ;; -*[cC]annot*) +*cannot*) echo "$STATUS_MSG" exit $CRITICAL ;; -*[aA]ctive*) +*active*) echo "$STATUS_MSG" exit $OK ;; -*Subsystem*not*on*file) +*subsystem*not*on*file) echo "$STATUS_MSG" exit $CRITICAL ;;