X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=00bc93309ce6f07bf1896a5360a5bfa31e3367df;hb=da046d75e280c1c4ca3b1db59e8300c681f6bd71;hp=bbb458d2a7237c6a69353ed39bb3d733ae5610b0;hpb=9f78d231a0c173d2aa59b94f68a0968a83ab0137;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index bbb458d..00bc933 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -36,7 +36,7 @@ servers:
     address: 130.239.18.97
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-anu:
+  gw-cecsit:
     address: 150.203.164.38
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
@@ -69,7 +69,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: bzed
-  gw-ftc:
+  gw-ftcollins:
     address: 192.25.206.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
@@ -198,10 +198,10 @@ servers:
     parents: gw-accumu
     hostgroups: computers, buildd, hassrvfs, squeeze
   # }}}
-  # {{{ gw-anu
+  # {{{ gw-cecsit
   gluck:
     address: 150.203.164.38
-    parents: gw-anu
+    parents: gw-cecsit
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
   # }}}
   # {{{ gw-arm
@@ -320,40 +320,40 @@ servers:
     hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, squeeze
     contacts: bzed
   # }}}
-  # {{{ gw-ftc
+  # {{{ gw-ftcollins
   alkman:
     address: 192.25.206.63
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, buildd, acpid-hosts, squeeze
   merulo:
     address: 192.25.206.58
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, porterbox, hasusrfs, squeeze
   mundy:
     address: 192.25.206.62
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
   penalosa:
     address: 192.25.206.68
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, buildd, hasbootfs, lenny
     contacts: dannf
   paer:
     address: 192.25.206.11
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, porterbox, hasbootfs, hashomefs, lenny
   peri:
     address: 192.25.206.15
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   samosa:
     address: 192.25.206.57
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
   spohr:
     address: 192.25.206.33
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
   # }}}
   # {{{ gw-grnet
@@ -557,8 +557,6 @@ servers:
     hostgroups: computers, buildd, sw-raid, squeeze
   # }}}
   # {{{ gw-sanger
-  # albeniz TODO
-  # goetz TODO
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger