X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=3dcecd8d9fa840735d5bf33c45b0140f167153a8;hb=b4421c1a9e48b9bb183437579be19c34999a916d;hp=cc2a62b6e1043b0031c59c9ff39f38434d3764d1;hpb=b0fac31de3bbe238ae7437475986ac672baa9433;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index cc2a62b..3dcecd8 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -332,7 +332,7 @@ servers:
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, wheezy, high-RTT, security_mirror
     contacts: faw
   # }}}
   # {{{ gw-carnet
@@ -705,7 +705,7 @@ servers:
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   pasquini:
     address: 206.12.19.217
     parents: sw-ubcece-kais
@@ -713,7 +713,7 @@ servers:
   luchesi:
     address: 206.12.19.214
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   tristano:
     address: 206.12.19.213
     parents: sw-ubcece-kais
@@ -732,7 +732,7 @@ servers:
     hostgroups: notacomputer
   tchaikovsky:
     address: 206.12.19.118
-    parents: luchesi
+    parents: ganeti2
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
   dinis:
     address: 206.12.19.139 
@@ -740,15 +740,15 @@ servers:
     hostgroups: computers, general, kvmdomains, wheezy, bacula-client
   wolkenstein:
     address: 206.12.19.116
-    parents: dijkstra
+    parents: ganeti2
     hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy, bacula-client
   brahms:
     address: 206.12.19.115
-    parents: dijkstra
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, squeeze
+    parents: ganeti2
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, wheezy
   geo2:
     address: 206.12.19.113
-    parents: dijkstra
+    parents: ganeti2
     hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
   morricone:
     address: 206.12.19.9
@@ -776,16 +776,16 @@ servers:
     check_command: dsa_check_always_ok
   falla:
     address: 206.12.19.117
-    parents: luchesi
+    parents: ganeti2
     hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
   fano:
     address: 206.12.19.110
-    parents: luchesi
+    parents: ganeti2
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     contacts: christoph
   finzi:
     address: 206.12.19.111
-    parents: luchesi
+    parents: ganeti2
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     contacts: christoph
   fischer:
@@ -835,11 +835,11 @@ servers:
   reger:
     address: 206.12.19.124
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, heavy-exim
   danzi:
     address: 206.12.19.125
-    parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts, xinetd-hosts
+    parents: ganeti2
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, postgres91-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: traetta
@@ -855,7 +855,7 @@ servers:
   elgar:
     address: 206.12.19.130
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   berlioz:
     address: 206.12.19.131
     parents: traetta
@@ -886,12 +886,12 @@ servers:
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   lilburn:
     address: 206.12.19.138
-    parents: dijkstra
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs
+    parents: ganeti2
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs
   popov:
     address: 206.12.19.119
-    parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    parents: ganeti2
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   beach:
     address: 206.12.19.140
     parents: ganeti2
@@ -912,7 +912,7 @@ servers:
   coincy:
     address: 206.12.19.144
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy
   stanley:
     address: 206.12.19.145
     parents: ganeti2
@@ -933,7 +933,7 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-utwente
   klecker: