Last hosts moved to new debian vlan/network

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b54a313..855cfcb 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -23,159 +23,154 @@
 servers:
   gw-man-da:
     address: 82.195.75.126
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: joerg, bzed
   gw-man-da2:
     address: 82.195.75.46
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-brainfood:
     address: 70.103.162.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-brown.edu:
     address: 128.148.34.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-osuosl:
     address: 140.211.166.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-scanplus-villa:
     address: 212.211.132.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-scanplus-lobos:
     address: 212.211.132.249
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-mit-csail:
     address: 128.30.0.254
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-xs4all:
     address: 194.109.137.217
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-umn.edu:
     address: 128.101.240.222
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-dg-i.net:
     address: 93.94.130.190
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: bzed
   gw-freenet:
     address: 62.104.23.249
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-sanger:
     address: 193.62.202.18
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: tjrc1
   gw-frost:
     address: 130.81.242.195
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-1und1:
     address: 195.20.247.54
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: joerg
   gw-1und1-karlsruhe:
     address: 212.227.120.29
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-blackcat:
     address: 193.201.200.129
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-grnet:
     address: 194.177.211.193
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-utwente:
     address: 130.89.149.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   #gw-ughent:
   #  address: 157.193.39.254
-  #  parents: gw-ubcnew
+  #  parents: gw-ubc
   #  hostgroups: routing-infrastructure
   gw-agnesi:
     address: 65.173.90.22
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-ubc:
-    address: 137.82.84.94
-    parents: gw-ubcnew
-    hostgroups: routing-infrastructure
-    contacts: lfilipoz
-  gw-ubcnew:
     address: 206.12.19.254
     parents: tchaikovsky
     hostgroups: routing-infrastructure
     contacts: lfilipoz
   gw-carnet:
     address: 161.53.160.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-telegraaf:
     address: 82.94.249.153
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-helsinki:
     address: 128.214.173.25
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: holger
   gw-telefonica:
     address: 195.71.99.193
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-ball:
     address: 78.32.9.209
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-cst:
     address: 213.188.99.215
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-isc:
     address: 149.20.20.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-aca:
     address: 130.239.18.97
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-esiee:
     address: 195.220.83.13
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-ghent:
     address: 193.191.17.50
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-anu:
     address: 150.203.164.38
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-sil:
     address: 86.59.118.145
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
 
   global:
@@ -495,7 +490,7 @@ servers:
     hostgroups: deadslow
 
   spontini:
-    address: 137.82.84.65
+    address: 206.12.19.14
     parents: gw-ubc
     hostgroups: computers, buildd, hasbootfs, hassrvfs
     contacts: lfilipoz
@@ -535,7 +530,7 @@ servers:
     parents: dijkstra
     hostgroups: computers, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim
   bellini:
-    address: 137.82.84.79
+    address: 206.12.19.7
     parents: gw-ubc
     hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim
   morricone:
@@ -543,11 +538,11 @@ servers:
     parents: tchaikovsky
     hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim
   stabile:
-    address: 137.82.84.72
+    address: 206.12.19.13
     parents: gw-ubc
     hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts
   cimarosa:
-    address: 137.82.84.80
+    address: 206.12.19.8
     parents: gw-ubc
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim
   paganini:
@@ -555,7 +550,7 @@ servers:
     parents: tchaikovsky
     hostgroups: computers, hasbootfs, aacraid, hassrvfs
   respighi:
-    address: 137.82.84.83
+    address: 206.12.19.11
     parents: gw-ubc
     hostgroups: computers, hasbootfs, aacraid, hassrvfs
   vivaldi: