X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=099bc2a9ecb7071d42db726dd0a83b42b930db18;hb=efb918076aed02fe22eee2737fa52c67b033a69b;hp=faf5b660e6d4d0d224529dbe69b71299ca6989ec;hpb=dcff554253f026c7a774d1ae845c6b661951b5b3;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index faf5b66..099bc2a 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -206,10 +206,6 @@ servers:
     address: 217.140.96.56
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, deadslow
-  alain:
-    address: 217.140.96.58
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
@@ -282,6 +278,10 @@ servers:
     address: 5.153.231.248
     parents: gw-bytemark
     hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl9:
+    address: 5.153.231.249
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
 
   milanollo:
     address: 5.153.231.2
@@ -337,20 +337,16 @@ servers:
     address: 5.153.231.13
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
-  petrova:
-    address: 5.153.231.25
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, apache2-hosts
   couper:
     address: 5.153.231.14
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
   rainier:
-    address: 5.153.231.15
+    address: 5.153.231.16
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, wheezy, no-bacula
   rapoport:
-    address: 5.153.231.16
+    address: 5.153.231.15
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, wheezy, no-bacula
   delfin:
@@ -387,6 +383,18 @@ servers:
     address: 5.153.231.24
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts, no-bacula
+  petrova:
+    address: 5.153.231.25
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy, apache2-hosts
+  oyens:
+    address: 5.153.231.26
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy
+  barriere:
+    address: 5.153.231.27
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -883,10 +891,6 @@ servers:
     address: 206.12.19.134
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
-  barriere:
-    address: 206.12.19.135
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
   diabelli:
     address: 206.12.19.136
     parents: traetta
@@ -956,10 +960,6 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-ynic
-  hildegard:
-    address: 144.32.168.74
-    parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   howells:
     address: 144.32.168.75
     parents: gw-ynic