packages: nagios-plugin-check_raid/check_raid - do not call out hpaucli *an...

[glen]

Author: glen                         Date: Fri Mar  9 12:36:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not call out hpaucli *and* cciss_vol_status when both are available.
  prefer cciss_vol_status (faster, however it can't detect predicitive disk
  failures)
patch kindly provided by Bernd Zeimetz <bernd#bzed.de>:
Hi,
I think its not necessary to call hpaucli *and* cciss_vol_status in case
both tools aree available.
Also I know from the cciss module upstream from HP that hpaucli is not
recommended to be used for monitoring as it does way too much locking
and other stuff you don't want regularily, his recommendation was to use
cciss_vol_status. The attached patch fixes that.
Cheers,
Bernd

---- Files affected:
packages/nagios-plugin-check_raid:
   check_raid (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.107 packages/nagios-plugin-check_raid/check_raid:1.108
--- packages/nagios-plugin-check_raid/check_raid:1.107	Tue Feb 28 15:31:52 2012
+++ packages/nagios-plugin-check_raid/check_raid	Fri Mar  9 13:36:35 2012
@@ -1359,9 +1359,9 @@
 if ($cciss_vol_status) {
 	my @cciss_devs = detect_cciss;
 	check_cciss @cciss_devs;
+} elsif ($hpacucli) {
+    check_hpacucli;
 }
-
-check_hpacucli if $hpacucli;
 # disabled: use hpacucli instead
 #check_hp_msa if sys_have_msa;
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_raid/check_raid?r1=1.107&r2=1.108&f=u