X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=994fc3274c93192047f3de4424ad7480230b39eb;hb=568e347fa6cdaa39f0907cab29447e69e723bb98;hp=c11342deb8c0724557a152c05acbc9cd0c067082;hpb=901ac00c51ad581a28721a5e40b8edb059bb1342;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c11342d..994fc32 100644
--- 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
@@ -313,6 +313,10 @@ servers:
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
     contacts: holger
+  binet:
+    address: 5.153.231.8
+    parents: gw-bytemark
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -511,15 +515,15 @@ servers:
   diamond:
     address: 82.195.75.108
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, bind9-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze, bacula-client
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy, bacula-client
   geo1:
     address: 82.195.75.105
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
+    hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
   handel:
     address: 82.195.75.104
     parents: ganeti3
@@ -687,7 +691,7 @@ servers:
   spontini:
     address: 206.12.19.14
     parents: sw-ubcece-mcld
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
@@ -736,7 +740,7 @@ servers:
   brahms:
     address: 206.12.19.115
     parents: ganeti2
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   geo2:
     address: 206.12.19.113
     parents: ganeti2
@@ -1037,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
@@ -2089,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
@@ -2112,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