X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=d513ae41681f87f65ec350eb84fa45329a5b7586;hb=6667bbddc7c69a1ac4d939480989b6120fd312ca;hp=a25b5da1a789cdce45e837d14fca1975af41e93e;hpb=09770fd5c3e8aebef2885eb685a56d464136ee5d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a25b5da..d513ae4 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -381,7 +381,7 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-ftcollins
-    hostgroups: computers, buildd, acpid-hosts, squeeze
+    hostgroups: computers, buildd, acpid-hosts, wheezy
   merulo:
     address: 192.25.206.58
     parents: gw-ftcollins
@@ -705,7 +705,7 @@ servers:
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    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 
@@ -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:
@@ -799,7 +799,7 @@ servers:
   corelli:
     address: 206.12.19.16
     parents: sw-ubcece-kais
-    hostgroups: computers, buildd, squeeze
+    hostgroups: computers, buildd, wheezy
   lucatelli:
     address: 206.12.19.15
     parents: sw-ubcece-kais
@@ -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
@@ -862,7 +862,7 @@ servers:
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https, bacula-client
   gombert:
     address: 206.12.19.132
-    parents: traetta
+    parents: ganeti2
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, heavy-exim, apache2-hosts
   jenkins:
     address: 206.12.19.133
@@ -871,7 +871,7 @@ servers:
   blavet:
     address: 206.12.19.134
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts, nfs-client, autofs
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
   barriere:
     address: 206.12.19.135
     parents: traetta
@@ -890,8 +890,8 @@ servers:
     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: