diff options
| -rw-r--r-- | contrib/check_axis.sh | 2 | ||||
| -rwxr-xr-x | contrib/check_mssql.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/check_axis.sh b/contrib/check_axis.sh index e97d4cd6..231d9da4 100644 --- a/contrib/check_axis.sh +++ b/contrib/check_axis.sh @@ -73,6 +73,8 @@ elif [ "$status" == "Printing" ]; then exit="1" && stdio="WARNING - PRINTING. Out of paper."; elif [ "$comments" == "Out of" ]; then exit="1" && stdio="WARNING - PRINTING. Out of paper. Bytes printed: $bytes."; + elif [ "$comments" == "Busy Out" ]; then + exit="1" && stdio="WARNING - Busy, out of paper."; elif [ "$comments" == "Ready " ]; then exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes."; elif [ "$comments" == "Printer off-line" ]; then diff --git a/contrib/check_mssql.sh b/contrib/check_mssql.sh index 048da720..7faa6bed 100755 --- a/contrib/check_mssql.sh +++ b/contrib/check_mssql.sh @@ -10,6 +10,7 @@ # # Version 1.0. # Version 1.1: rewritten the initial script so that it not only works from the CLI but also from within Nagios. Always helpful... +# Version 1.2: grouped output so things look a bit better. # # You might want to change these values: @@ -21,6 +22,7 @@ mktempcmd=`which mktemp` wccmd=`which wc` sedcmd=`which sed` trcmd=`which tr` +uniqcmd=`which uniq` ################################################################################################################### @@ -68,7 +70,7 @@ if [ ! -s $resultfile ]; then exit 2; else nmbr=`$catcmd $resultfile | $grepcmd -v "\-\-\-\-\-" | $grepcmd -v "loginame" | $grepcmd -v "affected" | $sedcmd '/^$/d' | $sedcmd 's/ //g' | $wccmd -l | sed 's/ //g'`; - users=`$catcmd $resultfile | $grepcmd -v "\-\-\-\-\-" | $grepcmd -v "loginame" | $grepcmd -v "affected" | $sedcmd '/^$/d' | $sedcmd 's/ //g' | $trcmd \\\n , | $sedcmd 's/,$/./g' | $sedcmd 's/,/, /g'`; + users=`$catcmd $resultfile | $grepcmd -v "\-\-\-\-\-" | $grepcmd -v "loginame" | $grepcmd -v "affected" | $sedcmd '/^$/d' | $sedcmd 's/ //g' | $uniqcmd -c | $trcmd \\\n , | $sedcmd 's/,$/./g' | $sedcmd 's/,/, /g' | $sedcmd 's/ //g' | $trcmd \\\t " "`; $rmcmd -f $tmpfile $resultfile; echo "OK - MS SQL Server $srv has $nmbr user(s) connected: $users" | sed 's/: $/./g'; exit 0; |