dsa-check-hpasm: Support a --fan-no-redundant option. If supplied then non-redundant...

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0d3e85a..4b5d89c 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -1497,12 +1497,18 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+ ###
   -
     name: HW - hpasmcli status
-    servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: villa, lobos
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
+    normal_check_interval: 120
+    hosts: villa, lobos
  ###
   -
     name: RAID - areca
@@ -1823,15 +1829,8 @@ services:
   -
     name: process - buildd
     servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: praetorius
-    contacts: luk
-  -
-    name: process - buildd - new
-    servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
-    hosts: praetorius
     contacts: luk
 
  ###