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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 08db195..f9073bf 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -33,7 +33,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-aql:
-    address: 141.170.2.17
+    address: 141.170.2.19
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-bytemark:
@@ -130,6 +130,14 @@ servers:
     address: 86.59.118.145
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-skroutz1:
+    address: 154.57.0.249
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-skroutz2:
+    address: 154.57.0.250
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-ubcece:
     address: 206.12.19.254
     hostgroups: layer3-infrastructure
@@ -166,107 +174,100 @@ 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
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula
   # }}}
   # {{{ gw-accumu
   pettersson:
     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, xinetd-hosts
+    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts
   # }}}
   # {{{ gw-aql
   eller:
     address: 141.170.6.156
     parents: gw-aql
-    hostgroups: computers, porterbox, jessie, hassrvfs
+    hostgroups: computers, porterbox, stretch, hassrvfs
   mips-aql-01:
     address: 141.170.6.149
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, nfs-client
+    hostgroups: computers, buildd, stretch, nfs-client
   mips-aql-02:
     address: 141.170.6.150
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, nfs-client
+    hostgroups: computers, buildd, stretch, nfs-client
   mips-aql-04:
     address: 141.170.6.154
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, nfs-client
+    hostgroups: computers, buildd, stretch, nfs-client
   mips-aql-05:
     address: 141.170.6.155
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, nfs-client
+    hostgroups: computers, buildd, stretch, nfs-client
   mips-aql-06:
     address: 141.170.6.157
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
   minkus:
     address: 141.170.6.151
     parents: gw-aql
-    hostgroups: computers, porterbox, jessie, nfs-client
+    hostgroups: computers, porterbox, stretch, nfs-client
   mipsel-aql-01:
     address: 141.170.6.152
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid
+    hostgroups: computers, buildd, stretch, hassrvfs, hasbootfs, sw-raid
   mipsel-aql-02:
     address: 141.170.6.153
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid
+    hostgroups: computers, buildd, stretch, hassrvfs, hasbootfs, sw-raid
   mipsel-aql-03:
     address: 141.170.6.158
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
   # }}}
   # {{{ gw-arm
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, jessie, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, stretch, broken_mq
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
   arm-arm-01:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
   arm-arm-03:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
   arm-arm-04:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, jessie, armhf, porterbox, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, stretch, armhf, porterbox, broken_mq
   hartmann:
     address: 217.140.96.67
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, jessie, armhf, buildd, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, stretch, armhf, buildd, broken_mq
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd, broken_mq
+    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-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
@@ -333,7 +334,7 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, systemd-timesyncd
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
@@ -345,11 +346,11 @@ servers:
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
@@ -363,7 +364,7 @@ servers:
   binet:
     address: 5.153.231.8
     parents: gw-bytemark
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
@@ -375,7 +376,7 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, apache-https, apache2-hosts, systemd-timesyncd
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
@@ -399,11 +400,11 @@ servers:
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
@@ -433,11 +434,11 @@ servers:
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, porterbox, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, porterbox, systemd-timesyncd
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
@@ -445,11 +446,11 @@ 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
-    hostgroups: computers, kvmdomains, jessie, no-bacula, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, no-bacula, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
@@ -458,10 +459,6 @@ servers:
     address: 5.153.231.34
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
-  httpredir-bm-01:
-    address: 5.153.231.35
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
@@ -469,7 +466,7 @@ servers:
   mirror-bytemark:
     address: 5.153.231.37
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, apache2-hosts, hassrvfs, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, apache2-hosts, hassrvfs
   mirror-bytemark-debian:
     address: 5.153.231.45
     hostgroups: secondary-IPs
@@ -485,7 +482,7 @@ servers:
   jerea:
     address: 5.153.231.39
     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
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
@@ -512,14 +509,14 @@ servers:
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
   # {{{ gw-cecsit
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, apache-https
+    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, stretch, apache-https
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -537,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
@@ -545,7 +542,7 @@ servers:
   mirror-conova:
     address: 217.196.149.229
     parents: gw-conova
-    hostgroups: computers, jessie, service, apache2-hosts, xinetd-hosts
+    hostgroups: computers, jessie, service, apache2-hosts
   mirror-conova-debian:
     address: 217.196.149.232
     hostgroups: secondary-IPs
@@ -585,19 +582,15 @@ servers:
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-systemd-hosts, apache-https, systemd-timesyncd
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
-  httpredir-csail-01:
-    address: 128.31.0.66
-    parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, systemd-timesyncd
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
@@ -609,19 +602,19 @@ servers:
   usper:
     address: 128.31.0.69
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts, queued, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, queued, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
     address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, jessie, dl380, nfs-client, hassrvfs
+    hostgroups: computers, stretch, dl380, nfs-client, hassrvfs
   # }}}
   # {{{ gw-gatech
   sechter:
     address: 128.61.240.73
     parents: gw-gatech
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, sw-raid, hasbootfs, hassrvfs, jessie, security_mirror
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -651,7 +644,7 @@ servers:
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   gigault:
     address: 194.177.211.204
     parents: ganeti-grnet
@@ -667,7 +660,7 @@ servers:
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-systemd-hosts, xinetd-hosts, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-systemd-hosts, systemd-timesyncd
   melartin:
     address: 194.177.211.208
     parents: ganeti-grnet
@@ -695,19 +688,19 @@ servers:
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
@@ -721,21 +714,21 @@ servers:
   arm-linaro-01:
     address: 64.28.108.83
     parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
   arm-linaro-03:
     address: 64.28.108.85
     parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
   asachi:
     address: 64.28.108.84
     parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, jessie, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, stretch, broken_mq
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
     address: 129.143.160.6
     parents: gw-karlsruhe
-    hostgroups: computers, buildd, jessie
+    hostgroups: computers, buildd, stretch
     contacts: pkern
   # }}}
   # {{{ gw-manda
@@ -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
@@ -800,15 +793,15 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-systemd-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
+    hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay
   denis:
     address: 82.195.75.91
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, bind9-hosts
+    hostgroups: computers, service, kvmdomains, stretch, bind9-hosts
   vogler:
     address: 82.195.75.92
     parents: ganeti3
@@ -820,29 +813,33 @@ servers:
   mips-manda-01:
     address: 82.195.75.66
     parents: gw-manda
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-manda
-    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
+    hostgroups: computers, buildd, stretch, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-02:
     address: 82.195.75.74
     parents: gw-manda
-    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
+    hostgroups: computers, buildd, stretch, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-03:
     address: 82.195.75.67
     parents: gw-manda
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
   seger:
     address: 82.195.75.93
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-systemd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres94-hosts, jessie
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-systemd-hosts, uploadqueue, kvmdomains, apache-https, postgres94-hosts, jessie
+  suchon:
+    address: 82.195.75.68
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, stretch, uploadqueue, queued, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
     address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, buildd, hassrvfs, jessie, incomingmailrelayed
+    hostgroups: computers, buildd, hassrvfs, stretch, incomingmailrelayed
   # }}}
   # {{{ gw-osuosl
   busoni:
@@ -857,12 +854,12 @@ servers:
   beach:
     address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, rsyncd-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
 
   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
@@ -884,11 +881,11 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, jessie, dl380, hpnewraid
+    hostgroups: computers, service, stretch, dl380, hpnewraid, nfs-client, autofs
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-systemd-hosts, hasvarlogfs, multipath-hosts
+    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-systemd-hosts, hasvarlogfs, multipath-hosts, nfs-server
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -900,25 +897,31 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, 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
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl360, hassrvfs, jessie, security_mirror
   # }}}
   # {{{ gw-sil
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
-    hostgroups: computers, buildd, jessie, sw-raid
+    hostgroups: computers, buildd, stretch, sw-raid
   mips-sil-01:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
   mipsel-sil-01:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
+  # }}}
+  # {{{ gw-skroutz
+  mirror-skroutz:
+    address: 154.57.0.251
+    parents: gw-skroutz1, gw-skroutz2
+    hostgroups: computers, stretch, service, sw-raid, hassrvfs, apache2-hosts
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -1027,11 +1030,11 @@ servers:
   nono:
     address: 209.87.16.26
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs, systemd-timesyncd
   reger:
     address: 209.87.16.27
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd
   diabelli:
     address: 209.87.16.28
     parents: ubc-gateway
@@ -1043,7 +1046,7 @@ servers:
   danzi:
     address: 209.87.16.30
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
   geo2:
     address: 209.87.16.31
     parents: ubc-gateway
@@ -1063,7 +1066,7 @@ servers:
   tchaikovsky:
     address: 209.87.16.35
     parents: ubc-gateway
-    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie, systemd-timesyncd
+    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, stretch, systemd-timesyncd
   gretchaninov:
     address: 209.87.16.36
     parents: ubc-gateway
@@ -1085,16 +1088,20 @@ servers:
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
     contacts: holger
+  hier:
+    address: 209.87.16.43
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   # }}}
   # {{{ gw-umn
   #saens:
   #  address: 128.101.240.212
   #  parents: gw-umn
-  #  hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+  #  hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, jessie, security_mirror
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
@@ -1120,17 +1127,17 @@ servers:
   ppc64el-unicamp-01:
     address: 177.220.10.142
     parents: prokofiev
-    hostgroups: computers, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, stretch
   plummer:
     address: 177.220.10.143
     parents: prokofiev
-    hostgroups: computers, porterbox, hassrvfs, jessie
+    hostgroups: computers, porterbox, hassrvfs, stretch
   # }}}
   # {{{ gw-utwente
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-systemd-hosts, dl380, jessie, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1157,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, buildd, sw-raid, hassrvfs, jessie
   #antheil:
   #  address: 217.140.96.60
   #  parents: gw-arm
@@ -1178,17 +1181,17 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, jessie
+    hostgroups: computers, buildd, hassrvfs, stretch
   zelenka:
     address: 80.245.147.40
     parents: gw-zivit
-    hostgroups: computers, porterbox, hassrvfs, jessie
+    hostgroups: computers, porterbox, hassrvfs, stretch
   # }}}
   # {{{ gw-sakura
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror
+    hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-systemd-hosts, security_mirror
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1711,7 +1714,7 @@ services:
   -
     name: process - bacula-dir
     servicegroups: backup
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-dir -a '/usr/sbin/bacula-dir -c /etc/bacula/bacula-dir.conf'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-dir -a '/usr/sbin/bacula-dir -f -c /etc/bacula/bacula-dir.conf'"
     hosts: dinis
   -
     name: process - bacula-fd
@@ -2042,6 +2045,7 @@ services:
     name: process - rngd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd -a '/usr/sbin/rngd -r /dev/hwrng'"
     hostgroups: kvmdomains
+    excludehostgroups: stretch
   # }}}
   # {{{ anti-services
   -
@@ -2062,6 +2066,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
     hostgroups: computers
     excludehostgroups: nfs-client, nfs-server
+  -
+    name: unwanted process - rpc.statd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
+    hostgroups: stretch
   -
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
@@ -2190,6 +2198,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present --ps-no-redundant --ignore-failed='PS1'"
     check_interval: 120
     hosts: mirror-anu
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
+    check_interval: 120
+    hostgroups: bl460g8
   ###
   -
     name: RAID - aacraid
@@ -2528,17 +2541,14 @@ services:
     name: network service - ftp
     check: check_ftp
     hosts: klecker-ftp
-    depends: klecker:process - xinetd
   -
     name: network service - ftp
     check: check_ftp
     hosts: mirror-umn2
-    depends: mirror-umn:process - xinetd
   -
     name: network service - ftp
     check: check_ftp
     hosts: mirror-isc2
-    depends: mirror-isc:process - xinetd
   # }}}
   # {{{ postgres
   -
@@ -2624,6 +2634,7 @@ services:
     name: process - statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"
     hostgroups: nfs-client, nfs-server
+    excludehostgroups: stretch
   -
     name: process - nfsd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C nfsd -a '[nfsd]'"
@@ -3057,22 +3068,18 @@ services:
     name: network service - rsync
     check: check_tcp!873
     hosts: milanollo2
-    depends: milanollo:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873
     hosts: mirror-isc2, mirror-isc-syncproxy
-    depends: mirror-isc:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873
     hosts: mirror-umn2, mirror-umn3
-    depends: mirror-umn:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873
     hosts: mirror-anu2, mirror-anu3
-    depends: mirror-anu:process - xinetd
   ###
   -
     name: process - icinga