X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=75e449cdf20b8cf40cefc05473e2f01c3932c0fa;hb=bf6452d53cf6f9c163ca8dafdff3a68d174760aa;hp=fc2fe883259d0dd33ae220fe4a1177795d4a4d21;hpb=f1c60cf401257b14b892ed5b483ef5a6ca7f6e1e;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index fc2fe88..75e449c 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -943,14 +943,6 @@ servers:
     address: 206.12.19.23
     parents: sw-ubcece-kais
     hostgroups: notacomputer
-  tchaikovsky:
-    address: 206.12.19.118
-    parents: ganeti2
-    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
-  geo2:
-    address: 206.12.19.113
-    parents: ganeti2
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -963,18 +955,10 @@ servers:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  lotti:
-    address: 206.12.19.121
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   glinka:
     address: 206.12.19.126
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, xinetd-hosts
-  tye:
-    address: 206.12.19.129
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs
   jenko:
     address: 206.12.19.133
     parents: ganeti2
@@ -983,14 +967,6 @@ servers:
     address: 206.12.19.141
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https
-  sonntag:
-    address: 206.12.19.142
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
-  muffat:
-    address: 206.12.19.146
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
   buxtehude:
     address: 206.12.19.147
     parents: ganeti2
@@ -1059,6 +1035,34 @@ servers:
     address: 209.87.16.30
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts
+  geo2:
+    address: 209.87.16.31
+    parents: ubc-gateway
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+  lotti:
+    address: 209.87.16.32
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+  muffat:
+    address: 209.87.16.33
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
+  sonntag:
+    address: 209.87.16.34
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
+  tchaikovsky:
+    address: 209.87.16.35
+    parents: ubc-gateway
+    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
+  gretchaninov:
+    address: 209.87.16.36
+    parents: ubc-gateway
+    hostgroups: computers, general, kvmdomains, jessie, hassrvfs
+  tye:
+    address: 209.87.16.37
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs
   # }}}
   # {{{ gw-umn
   #saens:
@@ -2056,7 +2060,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
     hostgroups: dl380, dl360, bl460, dl180
-    excludehosts: schein
+    excludehosts: schein, busoni
     excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
@@ -2069,7 +2073,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
-    hosts: schein
+    hosts: schein, busoni
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid