X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=bb249e0fe3307d17dbf1157ddb9a203717c353e3;hb=bacdb5545cf3ae08b56b4f1984967d2632588ae2;hp=7c4626fab813a593e0a1a3bf02faeb4e19697266;hpb=7280044d5d1e6d9f3e8ab97e770420f35e52a667;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 7c4626f..bb249e0 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -70,10 +70,9 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-dgi:
-    address: 93.94.132.102
+    address: 93.94.131.13
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contacts: bzed
   gw-freenet:
     address: 62.104.23.249
     parents: gw-ubcece
@@ -194,11 +193,11 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, wheezy
+    hostgroups: computers, acpid-hosts, service, jessie
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres91-hosts, wheezy
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres94-hosts, jessie
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -282,7 +281,7 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, spamd, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -371,7 +370,7 @@ servers:
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres91-hosts, postgres94-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -379,7 +378,7 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
@@ -641,7 +640,7 @@ servers:
   asachi:
     address: 64.28.108.84
     parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, jessie, broken_mq
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -867,28 +866,28 @@ servers:
     parents: sw-ubcece-mcld
     hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
     contacts: lfilipoz
-  ubc-bl8:
-    address: 206.12.19.218
+  ubc-bl7:
+    address: 206.12.19.217
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  pasquini:
-    address: 206.12.19.217
+  ubc-bl6:
+    address: 206.12.19.216
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  luchesi:
-    address: 206.12.19.214
+  ubc-bl2:
+    address: 206.12.19.212
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  tristano:
+  ubc-bl3:
     address: 206.12.19.213
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  boito:
-    address: 206.12.19.216
+  ubc-bl4:
+    address: 206.12.19.214
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  bertali:
-    address: 206.12.19.212
+  ubc-bl8:
+    address: 206.12.19.218
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   ganeti2:
@@ -1000,7 +999,7 @@ servers:
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, postgres91-hosts, nfs-client, apache2-hosts, autofs, apache-https
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
@@ -1911,7 +1910,7 @@ services:
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
     hostgroups: computers
     excludehostgroups: freebsd, alioth
-    excludehosts: czerny, grnet-node01, storace
+    excludehosts: czerny, grnet-node01, storace, ubc-bl2
   # }}}
   # {{{ anti-services
   -