X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f9073bf4f9cded1e4675ea436bf11b7bbc2f7b82;hb=72657d0db3996174732f25bb05919a4e94cadd0f;hp=f55fa301d24e8e3ec2f7ed4b9b5a49ea498c9de8;hpb=a7f656ebdfdf4743ccff0d1959b46d585f787728;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f55fa30..f9073bf 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -174,7 +174,7 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, service, jessie
+    hostgroups: computers, service, stretch
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
@@ -185,14 +185,11 @@ servers:
     address: 130.239.18.123
     parents: gw-accumu
     hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, jessie, autofs, sw-raid
-  praetorius:
-    address: 130.239.18.121
-    parents: gw-accumu
-    hostgroups: computers, buildd, hassrvfs, jessie
+    ## No need to update to Stretch, casulana replaces it. It should eventually die.
   mirror-accumu:
     address: 130.242.6.199
     parents: gw-accumu2
-    hostgroups: computers, service, jessie, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts
   # }}}
   # {{{ gw-aql
   eller:
@@ -271,10 +268,6 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd, broken_mq
   # }}}
   # {{{ gw-brown
-  franck:
-    address: 138.16.160.12
-    parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-systemd-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
@@ -453,7 +446,7 @@ servers:
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
@@ -523,7 +516,7 @@ servers:
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, jessie, apache-https
+    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, stretch, apache-https
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -541,7 +534,7 @@ servers:
   aagaard:
     address: 217.196.149.227
     parents: gw-conova
-    hostgroups: computers, jessie, service, sw-raid
+    hostgroups: computers, stretch, service, sw-raid
   acker:
     address: 217.196.149.228
     parents: gw-conova
@@ -788,7 +781,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, jessie, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, stretch, apache-https
   stockhausen:
     address: 82.195.75.108
     parents: ganeti3
@@ -866,7 +859,7 @@ servers:
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
-    hostgroups: computers, jessie, service
+    hostgroups: computers, stretch, service
   ppc64el-osuosl-01:
     address: 140.211.166.196
     parents: pieta
@@ -904,7 +897,7 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hassrvfs, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hassrvfs, stretch, security_mirror
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
@@ -1171,10 +1164,6 @@ servers:
     address: 144.32.168.76
     parents: gw-ynic
     hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
-  porpora:
-    address: 144.32.168.78
-    parents: gw-ynic
-    hostgroups: computers, sw-raid, jessie, no-bacula
   #antheil:
   #  address: 217.140.96.60
   #  parents: gw-arm