RAID.tst: suppress warning and error messages

[nagcollect.git] / client / lib / tests / RAID.tst

diff --git a/client/lib/tests/RAID.tst b/client/lib/tests/RAID.tst
index 8b537e5660249a645d09489b3caada91332f3fb3..d814588d4f83dd27316e8e84b84d97502850f525 100644 (file)
--- a/client/lib/tests/RAID.tst
+++ b/client/lib/tests/RAID.tst
@@ -1,17 +1,17 @@
 # NagCollect -- Nagios Data Collector for Passive Checks
-# Copyright (c)2009-2010 Alexander Barton, alex@barton.de
+# Copyright (c)2009-2011 Alexander Barton, alex@barton.de
 
 SERVICE="RAID_p"
 
 if [ `uname` = "Darwin" ]; then
        tmp=`mktemp "/tmp/$$.XXXX"`
-       LC_ALL=C diskutil checkRAID >"$tmp"
+       LC_ALL=C diskutil checkRAID >"$tmp" 2>/dev/null
        if [ $? -eq 0 ]; then
                # Apple Software-RAID detected
                statusString1=`grep "^Status:" "$tmp" | uniq`
                status=`echo $statusString1 | sed -e 's/Status: //g'`
                statusString=`grep "^Status:" "$tmp"`
-               statusText=`echo $statusStringAll | sed -e 's/Status: //g' | sed -e 's/ /, /g'`
+               statusText=`echo $statusString | sed -e 's/Status: //g' | sed -e 's/ /, /g'`
                if [ "$status" != "Online" ]; then
                        STATUS=2
                        TEXT="ERROR - RAID is $statusText"
@@ -20,6 +20,32 @@ if [ `uname` = "Darwin" ]; then
                        TEXT="OK - RAID status is good."
                fi
        fi
+       LC_ALL=C raidutil list status 2>/dev/null | grep "RAID " >"$tmp"
+       if [ $? -eq 0 ]; then
+               # Apple Hardware-RAID detected
+               declare -i good=0
+               declare -i bad=0
+               status=""
+               while read x; do
+                       v=`echo "$x" | cut -d' ' -f1`
+                       s=`echo "$x" | cut -b67- | sed -e 's/://g'`
+                       s2=`echo "$x" | cut -b78-`
+                       [ -n "$status" ] \
+                               && status="$status, $v:$s" \
+                               || status="$v:$s"
+                       [ "$s2" = "Good" ] && good=$good+1 || bad=bad+1
+               done <"$tmp"
+               if [ $bad -eq 0 -a $good -ge 1 ]; then
+                       STATUS=0
+                       TEXT="OK - HW-RAID is good: $status"
+               elif [ $bad -gt 0 ]; then
+                       STATUS=2
+                       TEXT="ERROR - HW-RAID status: $status"
+               else
+                       STATUS=1
+                       TEXT="ERROR - HW-RAID status is unknown!? ($status)"
+               fi
+       fi
        rm -f "$tmp"
 elif [ `uname` = "Linux" -a -r /proc/mdstat ]; then
        status=$(cat /proc/mdstat | grep -E "(^md|^      [0-9])" | while read info1; do