X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=21ee3352feaade4ed7895e2d6ceda4c99fd1ec29;hb=48437fb73afd844c7b0514251504efed2f5e6d27;hp=4cd694b5b30584ad3a6a94438f09ed3faa137924;hpb=693bc0e09b346c4f206ead3554472b792a3dd0fe;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4cd694b..21ee335 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -517,7 +517,7 @@ servers:
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, single-cpu, apache2-hosts, kvmdomains
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, apache2-hosts, kvmdomains
   valente:
     address: 206.12.19.112
     parents: dijkstra
@@ -533,7 +533,7 @@ servers:
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
-    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts
+    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts
   cimarosa:
     address: 137.82.84.80
     parents: gw-ubc
@@ -1497,12 +1497,23 @@ 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, liszt, senfl, schein, rore
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
+    normal_check_interval: 120
+    hosts: villa, lobos, liszt
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
+    normal_check_interval: 120
+    hosts: senfl, schein, rore
  ###
   -
     name: RAID - areca
@@ -1823,15 +1834,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 -a '/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
 
  ###
@@ -1958,3 +1962,8 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
     runfrom: dijkstra
     hosts: giustini
+  -
+    name: event log
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=0 $HOSTADDRESS$ public"
+    runfrom: dijkstra
+    hosts: giustini