ring 3 for gateways, ring 4 for physical machines, ring 5 for virtual machines

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0a1f921..ecc2c9c 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -19,6 +19,14 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
+  gw-1und1:
+    address: 195.20.247.50
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-1und1-sec:
+    address: 212.227.121.194
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-accumu:
     address: 130.239.18.97
     parents: gw-ubcece
@@ -144,7 +152,7 @@ servers:
   # {{{ gw-1und1
   powell:
     address: 87.106.64.223
-    parents: gw-ubcece
+    parents: gw-1und1
     hostgroups: computers, service, acpid-hosts, wheezy
   pkgmirror-1and1:
     address: 213.165.95.4
@@ -158,8 +166,7 @@ servers:
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
-    parents: gw-ubcece
-    #parents: gw-1und1-sec
+    parents: gw-1und1-sec
     hostgroups: computers, acpid-hosts, service, wheezy
   chopin:
     address: 195.20.242.124
@@ -175,8 +182,7 @@ servers:
     hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https
   wieck:
     address: 195.20.242.89
-    parents: gw-ubcece
-    #parents: gw-1und1-sec
+    parents: gw-1und1-sec
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, security_mirror, hasvarlogfs, no-bacula
   # }}}
   # {{{ gw-accumu
@@ -309,61 +315,65 @@ servers:
     address: 5.153.231.10
     parents: gw-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, postgres91-hosts
+  ganeti-bytemark:
+    address: 82.195.75.111
+    parents: gw-bytemark
+    hostgroups: notacomputer
   coccia:
     address: 5.153.231.11
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client
   backuphost:
     address: 5.153.231.12
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy
   philp:
     address: 5.153.231.13
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
   petrova:
     address: 5.153.231.25
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, wheezy, apache2-hosts
   couper:
     address: 5.153.231.14
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
   rainier:
     address: 5.153.231.15
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, wheezy, no-bacula
   rapoport:
     address: 5.153.231.16
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, wheezy, no-bacula
   delfin:
     address: 5.153.231.17
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
   wuiet:
     address: 5.153.231.18
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, wheezy, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
   dinis:
     address: 5.153.231.19
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, wheezy
   donizetti:
     address: 5.153.231.20
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs
   dillon:
     address: 5.153.231.22
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs
   ticharich:
     address: 5.153.231.23
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service
   diamond:
     address: 5.153.231.24
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts, no-bacula
   # }}}
   # {{{ gw-c3sl