X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=c768a81a4adc2cea681f6d277d0a9889f94984c0;hb=56c6f84eb4d6e1258a0eaebbf37b32cf10cd19fe;hp=6da6fe45288c541f05e8451cfaa7b0f666a27143;hpb=763cc579a807e4b5f785de048e8231beaae31085;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 6da6fe4..c768a81 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -199,11 +199,11 @@ servers:
   mips-aql-05:
     address: 141.170.6.155
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, nfs-client
+    hostgroups: computers, buildd, buster, nfs-client
   mips-aql-06:
     address: 141.170.6.157
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   minkus:
     address: 141.170.6.151
     parents: gw-aql
@@ -215,11 +215,11 @@ servers:
   mipsel-aql-02:
     address: 141.170.6.153
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, hassrvfs, hasbootfs, sw-raid
+    hostgroups: computers, buildd, buster, hassrvfs, hasbootfs, sw-raid
   mipsel-aql-03:
     address: 141.170.6.158
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   # }}}
   # {{{ gw-arm
   abel:
@@ -233,11 +233,11 @@ servers:
   arm-arm-01:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq, sw-raid
+    hostgroups: computers, hassrvfs, buildd, buster, broken_mq, sw-raid
   arm-arm-03:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq, sw-raid
+    hostgroups: computers, hassrvfs, buildd, buster, broken_mq, sw-raid
   arm-arm-04:
     address: 217.140.96.61
     parents: gw-arm
@@ -349,10 +349,6 @@ servers:
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
     contacts: holger
-  binet:
-    address: 5.153.231.8
-    parents: gw-bytemark
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
@@ -515,11 +511,11 @@ servers:
   arm-conova-01:
     address: 217.196.149.230
     parents: ganeti-conova
-    hostgroups: computers, hassrvfs, buildd, stretch
+    hostgroups: computers, hassrvfs, buildd, buster
   arm-conova-02:
     address: 217.196.149.231
     parents: ganeti-conova
-    hostgroups: computers, hassrvfs, buildd, stretch
+    hostgroups: computers, hassrvfs, buildd, buster
   amdahl:
     address: 217.196.149.236
     parents: ganeti-conova
@@ -571,7 +567,7 @@ servers:
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
@@ -625,7 +621,7 @@ servers:
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
-    hostgroups: computers, pybuildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, pybuildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
   x86-grnet-02:
     address: 194.177.211.204
     parents: ganeti-grnet
@@ -752,7 +748,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: ganeti-manda
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, stretch, apache-https, systemd-timesyncd
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, buster, apache-https, systemd-timesyncd
   ganeti-manda:
     address: 82.195.75.71
     parents: gw-manda
@@ -780,7 +776,7 @@ servers:
   mips-manda-01:
     address: 82.195.75.66
     parents: gw-manda
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-manda
@@ -792,7 +788,7 @@ servers:
   mipsel-manda-02:
     address: 82.195.75.74
     parents: gw-manda
-    hostgroups: computers, buildd, stretch, hassrvfs, sw-raid, hasbootfs
+    hostgroups: computers, buildd, buster, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-03:
     address: 82.195.75.67
     parents: gw-manda
@@ -869,7 +865,7 @@ servers:
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
-    hostgroups: computers, buildd, stretch, sw-raid
+    hostgroups: computers, buildd, buster, sw-raid
   mips-sil-01:
     address: 86.59.118.146
     parents: gw-sil
@@ -877,7 +873,7 @@ servers:
   mipsel-sil-01:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   # }}}
   # {{{ gw-skroutz
   mirror-skroutz:
@@ -914,7 +910,11 @@ servers:
   x86-ubc-01:
     address: 209.87.16.21
     parents: ganeti2-ubc
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
+  x86-ubc-02:
+    address: 209.87.16.22
+    parents: ganeti2-ubc
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
   elgar:
     address: 209.87.16.24
     parents: ganeti2-ubc
@@ -1082,7 +1082,7 @@ servers:
   ppc64el-unicamp-01:
     address: 143.106.167.121
     parents: prokofiev
-    hostgroups: computers, hassrvfs, buildd, stretch
+    hostgroups: computers, hassrvfs, buildd, buster
   plummer:
     address: 143.106.167.122
     parents: prokofiev
@@ -1128,7 +1128,7 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, stretch
+    hostgroups: computers, buildd, hassrvfs, buster
   zelenka:
     address: 80.245.147.40
     parents: gw-zivit