remove biber from bacula-clients

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d5b89f7..0957eec 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -257,35 +257,35 @@ servers:
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
 
   milanollo:
     address: 5.153.231.2
@@ -333,7 +333,7 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, wheezy
   # }}}
   # {{{ gw-cecsit
   gluck:
@@ -399,7 +399,7 @@ servers:
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy, bacula-client
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
@@ -1041,6 +1041,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  bm-bl:
+    alias: HP blades at bytemark
+    private: 1
   dl585:
     alias: HP DL385 hosts
     private: 1
@@ -2093,6 +2096,12 @@ services:
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
     excludehosts: schein
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
+    normal_check_interval: 120
+    hostgroups: bm-bl
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -2116,7 +2125,7 @@ services:
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl585
+    hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
     excludehosts: villa, lobos, senfl, schein
   -
     name: HW - hpasmcli status
@@ -2130,9 +2139,9 @@ services:
     hosts: senfl, schein
  ###
   -
-    name: RAID - areca
+    name: RAID - 3ware
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-areca"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
     hosts: powell
  ###
   -
@@ -2476,14 +2485,14 @@ services:
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
-    hosts: fano, fasch, finzi, fils
+    hosts: fano, fasch, finzi, fils, fayrfax
     contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: fano, fasch, finzi, fils
+    excludehosts: fano, fasch, finzi, fils, fayrfax
     contact_groups: buildd
   -
     name: processes - zombie schroot