X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=client%2Flib%2Ftests%2FRAID.tst;h=806186ee1d8d9816ec31fb712ebef282f77abc99;hb=deca40ea27eb9990496e88db3ceec44c2cdd391b;hp=074113d65c648164268c1f200687a88ac5b3054e;hpb=cb570e625ca87fc5656a97dfc879fca54f7c979f;p=nagcollect.git

diff --git a/client/lib/tests/RAID.tst b/client/lib/tests/RAID.tst
index 074113d..806186e 100644
--- a/client/lib/tests/RAID.tst
+++ b/client/lib/tests/RAID.tst
@@ -5,7 +5,7 @@ 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`
@@ -14,13 +14,13 @@ if [ `uname` = "Darwin" ]; then
 		statusText=`echo $statusString | sed -e 's/Status: //g' | sed -e 's/ /, /g'`
 		if [ "$status" != "Online" ]; then
 			STATUS=2
-			TEXT="ERROR - RAID is $statusText"
+			TEXT="$TEXT SW-RAID is $statusText."
 		else
-			STATUS=0
-			TEXT="OK - RAID status is good."
+			[ -z "$STATUS" ] && STATUS=0
+			TEXT="$TEXT SW-RAID status is good."
 		fi
 	fi
-	LC_ALL=C raidutil list status | grep "RAID " >"$tmp"
+	LC_ALL=C raidutil list status 2>/dev/null | grep "RAID " >"$tmp"
 	if [ $? -eq 0 ]; then
 		# Apple Hardware-RAID detected
 		declare -i good=0
@@ -36,29 +36,41 @@ if [ `uname` = "Darwin" ]; then
 			[ "$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"
+			[ -z "$STATUS" ] && STATUS=0
+			TEXT="$TEXT Apple HW-RAID is good: $status."
 		elif [ $bad -gt 0 ]; then
 			STATUS=2
-			TEXT="ERROR - HW-RAID status: $status"
+			TEXT="$TEXT Apple HW-RAID status: $status."
 		else
-			STATUS=1
-			TEXT="ERROR - HW-RAID status is unknown!? ($status)"
+			[ -z "$STATUS" -o "$STATUS" = "1" ] && STATUS=1
+			TEXT="$TEXT  Apple 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
+	status=$(cat /proc/mdstat | grep -E "(^md|^      [0-9])" \
+	 | while read info1; do
 		read info2
 		dev=`echo $info1 | cut -d' ' -f1`
 		stat=`echo $info2 | cut -d'[' -f 3 | cut -d']' -f1`
 		echo -n " $dev:$stat"
 	done)
-	if [ "`echo $status | tr -d 'md0123456789: U'`" = "" ]; then
-		STATUS=0
-		TEXT="OK - RAID is good: $status"
-	else
-		STATUS=2
-		TEXT="ERROR - RAID status: $status"
+	if [ -n "$status" ]; then
+		if [ "`echo $status | tr -d 'md0123456789: U'`" = "" ]; then
+			[ -z "$STATUS" ] && STATUS=0
+			TEXT="$TEXT SW-RAID is good: $status."
+		else
+			STATUS=2
+			TEXT="$TEXT SW-RAID status: $status."
+		fi
 	fi
 fi
+
+if [ -n "$TEXT" ]; then
+	case "$STATUS" in
+		0)	TEXT="OK -${TEXT}"; ;;
+		1)	TEXT="WARNING -${TEXT}"; ;;
+		2)	TEXT="ERROR -${TEXT}"; ;;
+		*)	TEXT="UNKNOWN -${TEXT}"; ;;
+	esac
+fi