X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=nagcollect.git;a=blobdiff_plain;f=client%2Flib%2Ftests%2FRAID.tst;h=d814588d4f83dd27316e8e84b84d97502850f525;hp=522acd4a3779038aaf578e73ae081484333b0442;hb=d4811465f8a6af9d6afe93d8092ed83794294ce8;hpb=52ce559c9790c6484b9a59a143183642a29305f9

diff --git a/client/lib/tests/RAID.tst b/client/lib/tests/RAID.tst
index 522acd4..d814588 100644
--- a/client/lib/tests/RAID.tst
+++ b/client/lib/tests/RAID.tst
@@ -1,11 +1,11 @@
 # 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`
@@ -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