From: Alexander Barton <alex@barton.de>
Date: Fri, 20 Aug 2010 13:40:36 +0000 (+0200)
Subject: Mac OS X RAID check: handle more than one software RAID system
X-Git-Tag: rel-2~11
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=nagcollect.git;a=commitdiff_plain;h=ba1c1c91f1ff555dc53a95ba817035c8d0cc469f;hp=6b76f2469e3b6ba5dfd12738cafcc33e64787c17

Mac OS X RAID check: handle more than one software RAID system
---

diff --git a/client/lib/tests/RAID.tst b/client/lib/tests/RAID.tst
index d536e12..3ce95d9 100644
--- a/client/lib/tests/RAID.tst
+++ b/client/lib/tests/RAID.tst
@@ -1,5 +1,5 @@
 # NagCollect -- Nagios Data Collector for Passive Checks
-# Copyright (c)2009 Alexander Barton, alex@barton.de
+# Copyright (c)2009-2010 Alexander Barton, alex@barton.de
 
 SERVICE="RAID_p"
 
@@ -8,11 +8,13 @@ if [ `uname` = "Darwin" ]; then
 	LC_ALL=C diskutil checkRAID >"$tmp"
 	if [ $? -eq 0 ]; then
 		# Apple Software-RAID detected
-		statusText=`grep "^Status:" "$tmp"`
-		status=`echo $statusText | cut -d' ' -f2-`
+		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'`
 		if [ "$status" != "Online" ]; then
 			STATUS=2
-			TEXT="ERROR - RAID is $status"
+			TEXT="ERROR - RAID is $statusText"
 		else
 			STATUS=0
 			TEXT="OK - RAID status is good."