X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=d2de6302c2c3d60b3915110d03b763bd97466d53;hb=bdf1c29f9f88970b480656a9c4d24e49073431b8;hp=11ca836aedb2d6aedc7d355cb1fe0449056fe6c3;hpb=c7c3b4d5362b34bf34c4a879153d8f15e87be8ce;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 11ca836..ceb81c6 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -19,11 +19,6 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
-  gw-1und1:
-    parents: gw-ubcece
-    hostgroups: notacomputer
-    pingable: false
-    check_command: dsa_check_always_ok
   gw-1und1-sec:
     parents: gw-ubcece
     hostgroups: notacomputer
@@ -33,8 +28,12 @@ servers:
     address: 130.239.18.97
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-accumu2:
+    address: 130.242.6.198
+    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:
@@ -66,7 +65,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-dgi:
-    address: 93.94.131.13
+    address: 93.94.130.190
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-freenet:
@@ -82,11 +81,12 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-isc:
-    address: 149.20.20.1
+    # really henet, because of something weird
+    address: 72.52.94.70
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-karlsruhe:
-    address: 129.143.57.177
+    address: 129.143.59.214
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-leaseweb:
@@ -97,12 +97,8 @@ servers:
     address: 64.28.108.36
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-man-da:
-    address: 82.195.75.126
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-man-da2:
-    address: 82.195.78.116
+  gw-manda:
+    address: 82.195.78.118
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-marist:
@@ -134,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,121 +170,112 @@ servers:
     hostgroups: layer3-infrastructure
   # }}}
   # {{{ servers
-  # {{{ gw-1und1
-  powell:
-    address: 87.106.64.223
-    parents: gw-1und1
-    hostgroups: computers, service, jessie
-  pkgmirror-1and1:
-    address: 213.165.95.4
-    parents: powell
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https
-  # }}}
   # {{{ gw-1und1-sec
   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, 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, postgres94-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-systemd-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, dl380, hpnewraid, jessie, hassrvfs, postgres94-hosts
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, hpnewraid, rsyncd-systemd-hosts, jessie, hassrvfs, postgres94-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -343,7 +338,7 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, systemd-timesyncd
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
@@ -351,33 +346,33 @@ servers:
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server
+    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
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
     contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   binet:
     address: 5.153.231.8
     parents: gw-bytemark
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -385,39 +380,39 @@ 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
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, apache-https, apache2-hosts, systemd-timesyncd
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie
+    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
   rapoport:
     address: 5.153.231.15
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie
+    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
+    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
+    hostgroups: computers, general, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -427,95 +422,105 @@ servers:
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ticharich:
     address: 5.153.231.23
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https
+    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
   olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie
+    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, porterbox
+    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
+    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
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    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
+    hostgroups: computers, kvmdomains, stretch, no-bacula, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
-  httpredir-bm-01:
-    address: 5.153.231.35
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client
-  fede:
+    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, systemd-timesyncd
+  mirror-bytemark:
     address: 5.153.231.37
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, apache2-hosts, hassrvfs
+  mirror-bytemark-debian:
+    address: 5.153.231.45
+    hostgroups: secondary-IPs
+    parents: mirror-bytemark
+  mirror-bytemark-security:
+    address: 5.153.231.46
+    hostgroups: secondary-IPs
+    parents: mirror-bytemark
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client, systemd-timesyncd
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
   pinel:
     address: 5.153.231.42
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim, systemd-timesyncd
   rusca:
     address: 5.153.231.43
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   manziarly:
     address: 5.153.231.44
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
+
+  casulana:
+    address: 5.153.231.41
+    parents: gw-bytemark
+    hostgroups: computers, service, stretch, hpnewraid, hassrvfs, dl380
   # }}}
   # {{{ gw-c3sl
   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, security_mirror, apache-https
+    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, stretch, apache-https
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -523,20 +528,40 @@ servers:
   mirror-anu3:
     address: 150.203.164.61
     parents: mirror-anu
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, security_mirror
   mirror-anu4:
     address: 150.203.164.62
     parents: mirror-anu
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
+  aagaard:
+    address: 217.196.149.227
+    parents: gw-conova
+    hostgroups: computers, jessie, service, sw-raid
+  acker:
+    address: 217.196.149.228
+    parents: gw-conova
+    hostgroups: computers, stretch, service, sw-raid
+  mirror-conova:
+    address: 217.196.149.229
+    parents: gw-conova
+    hostgroups: computers, jessie, service, apache2-hosts
+  mirror-conova-debian:
+    address: 217.196.149.232
+    hostgroups: secondary-IPs
+    parents: mirror-conova
+  mirror-conova-security:
+    address: 217.196.149.233
+    hostgroups: secondary-IPs
+    parents: mirror-conova
+
+  arm-conova-01:
+    address: 217.196.149.230
+    parents: aagaard
+    hostgroups: computers, hassrvfs, buildd, stretch
   # }}}
   # {{{ gw-csail
-  steffani:
-    address: 128.31.0.36
-    parents: gw-csail
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
-
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
@@ -561,39 +586,39 @@ 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
+    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
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
-  httpredir-csail-01:
-    address: 128.31.0.66
-    parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https, systemd-timesyncd
   pkgmirror-csail:
     address: 128.31.0.51
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
+  usper:
+    address: 128.31.0.69
+    parents: ganeti-csail
+    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:
@@ -608,62 +633,58 @@ servers:
     address: 194.177.211.196
     parents: gw-grnet
     hostgroups: computers, service, dl380, jessie, drbd-hosts
-  rautavaara:
-    address: 194.177.211.199
-    parents: gw-grnet
-    hostgroups: computers, megaraid, service, jessie
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   geo3:
     address: 194.177.211.201
     parents: gw-grnet
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie, systemd-timesyncd
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts, systemd-timesyncd
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   gigault:
     address: 194.177.211.204
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   vittoria:
     address: 194.177.211.205
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https, systemd-timesyncd
   boott:
     address: 194.177.211.206
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-systemd-hosts, systemd-timesyncd
+  melartin:
+    address: 194.177.211.208
+    parents: ganeti-grnet
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, postgres96-hosts
   # }}}
   # {{{ gw-isc
-  schein:
-    address: 149.20.20.6
-    parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
   mirror-isc:
-    address: 149.20.20.7
+    address: 149.20.4.13
     parents: gw-isc
     hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
   mirror-isc2:
-    address: 149.20.20.19
+    address: 149.20.4.14
     parents: mirror-isc
     hostgroups: secondary-IPs
   mirror-isc3:
-    address: 149.20.20.22
+    address: 149.20.4.15
     parents: mirror-isc
     hostgroups: secondary-IPs
   mirror-isc-syncproxy:
-    address: 149.20.20.21
+    address: 149.20.4.16
     parents: mirror-isc
     hostgroups: secondary-IPs
   # }}}
@@ -671,19 +692,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
@@ -697,31 +718,31 @@ 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-man-da
+  # {{{ gw-manda
   czerny:
     address: 82.195.75.109
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   clementi:
     address: 82.195.75.103
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   bendel:
     address: 82.195.75.100
@@ -760,31 +781,31 @@ servers:
   handel:
     address: 82.195.75.104
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, apache2-hosts, jessie
+    hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, jessie, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, stretch, apache-https
   stockhausen:
     address: 82.195.75.108
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, jessie
   ganeti3:
     address: 82.195.75.111
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: notacomputer
   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
@@ -795,34 +816,38 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https
   mips-manda-01:
     address: 82.195.75.66
-    parents: gw-man-da
-    hostgroups: computers, buildd, jessie, hassrvfs
+    parents: gw-manda
+    hostgroups: computers, buildd, stretch, hassrvfs
   mipsel-manda-01:
     address: 82.195.75.72
-    parents: gw-man-da
-    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
+    parents: gw-manda
+    hostgroups: computers, buildd, stretch, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-02:
     address: 82.195.75.74
-    parents: gw-man-da
-    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
+    parents: gw-manda
+    hostgroups: computers, buildd, stretch, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-03:
     address: 82.195.75.67
-    parents: gw-man-da
-    hostgroups: computers, buildd, jessie, hassrvfs
+    parents: gw-manda
+    hostgroups: computers, buildd, stretch, hassrvfs
   seger:
     address: 82.195.75.93
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-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:
-    address: 140.211.15.34
+    address: 140.211.166.202
     parents: gw-osuosl
     hostgroups: computers, service, dl360, hassrvfs, jessie, hasvarlogfs, apache2-hosts, no-bacula, apache-https
 
@@ -833,7 +858,7 @@ 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
@@ -842,7 +867,7 @@ servers:
   ppc64el-osuosl-01:
     address: 140.211.166.196
     parents: pieta
-    hostgroups: computers, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, stretch
   powerpc-osuosl-01:
     address: 140.211.166.197
     parents: pieta
@@ -857,10 +882,14 @@ servers:
     hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
   # }}}
   # {{{ gw-sanger
+  sallinen:
+    address: 193.62.202.26
+    parents: gw-sanger
+    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-hosts, xinetd-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
@@ -872,25 +901,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:
@@ -939,10 +974,6 @@ servers:
     address: 206.12.19.218
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ganeti2:
-    address: 206.12.19.23
-    parents: sw-ubcece-kais
-    hostgroups: notacomputer
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -955,40 +986,33 @@ servers:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  glinka:
-    address: 206.12.19.126
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, xinetd-hosts
-  jenko:
-    address: 206.12.19.133
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie
   # }}}
   # {{{ ubc-gateway
-  ubc-enc2bl1:
+  ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
-  ubc-enc2bl2:
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
-  ubc-enc2bl9:
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+
   rachmaninoff:
     address: 209.87.16.20
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
   x86-ubc-01:
     address: 209.87.16.21
     parents: ubc-gateway
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   finzi:
     address: 209.87.16.22
     parents: ubc-gateway
@@ -1002,77 +1026,86 @@ servers:
   elgar:
     address: 209.87.16.24
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
   gombert:
     address: 209.87.16.25
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
   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
+    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
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd
   diabelli:
     address: 209.87.16.28
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost, systemd-timesyncd
   menotti:
     address: 209.87.16.29
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   danzi:
     address: 209.87.16.30
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
   geo2:
     address: 209.87.16.31
     parents: ubc-gateway
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie, systemd-timesyncd
   lotti:
     address: 209.87.16.32
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   muffat:
     address: 209.87.16.33
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
+    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay, systemd-timesyncd
   sonntag:
     address: 209.87.16.34
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
   tchaikovsky:
     address: 209.87.16.35
     parents: ubc-gateway
-    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
+    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, stretch, systemd-timesyncd
   gretchaninov:
     address: 209.87.16.36
     parents: ubc-gateway
-    hostgroups: computers, general, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   tye:
     address: 209.87.16.37
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ullmann:
     address: 209.87.16.38
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https, systemd-timesyncd
   buxtehude:
     address: 209.87.16.39
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
+  piu-slave-ubc-01:
+    address: 209.87.16.42
+    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
@@ -1098,17 +1131,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
@@ -1135,14 +1168,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
-  poulenc:
-    address: 144.32.168.77
-    parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, jessie
   #antheil:
   #  address: 217.140.96.60
   #  parents: gw-arm
@@ -1160,17 +1185,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 #############################
@@ -1224,6 +1249,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  bl460g8:
+    alias: HP BL460 Gen8 blades
+    private: 1
   bm-bl:
     alias: HP blades at bytemark
     private: 1
@@ -1239,9 +1267,6 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
-  megaraid:
-    alias: Hosts with LSI Logic MegaRAID
-    private: 1
 
   wheezy:
     alias: Hosts running wheezy
@@ -1249,6 +1274,8 @@ hostgroups:
     alias: Hosts running jessie
   jessie-freebsd:
     alias: kFreebsd hosts running jessie
+  stretch:
+    alias: Hosts running stretch
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -1279,13 +1306,15 @@ hostgroups:
   bind9-hosts:
     alias: hosts running bind9
     private: 1
-  # once every host runs unbound, do away with this group and check "computers" instead
   amavis-hosts:
     alias: hosts running amavis
     private: 1
   rsyncd-hosts:
     alias: hosts providing rsync services via xinetd
     private: 1
+  rsyncd-systemd-hosts:
+    alias: hosts providing rsync services via systemd
+    private: 1
   xinetd-hosts:
     alias: hosts providing services via xinetd
     private: 1
@@ -1295,6 +1324,9 @@ hostgroups:
   postgres94-hosts:
     alias: hosts running postgres94
     private: 1
+  postgres96-hosts:
+    alias: hosts running postgres96
+    private: 1
   no-ulogd:
     alias: hosts not running ulogd
     private: 1
@@ -1304,6 +1336,9 @@ hostgroups:
   uploadqueue:
     alias: hosts that are an anonymous ftp uploadqueue
     private: 1
+  queued:
+    alias: hosts running queued
+    private: 1
   bosserver:
     alias: hosts running bosserver
     private: 1
@@ -1327,6 +1362,9 @@ hostgroups:
   autofs:
     alias: hosts running the automounter
     private: 1
+  systemd-timesyncd:
+    alias: Vms running systemd-timesyncd
+    private: 1
 
   highload:
     alias: "hosts on which high load is normal"
@@ -1342,9 +1380,6 @@ hostgroups:
   hassrvfs:
     alias: hosts with a /srv filesystem
     private: 1
-  hasorgfs:
-    alias: hosts with a /org filesystem
-    private: 1
   hasvarlogfs:
     alias: hosts with a /var/log filesystem
     private: 1
@@ -1418,21 +1453,21 @@ services:
     excludehostgroups: layer3-infrastructure, high-RTT
     check_interval: 5
     max_check_attempts: 4
-    retry_check_interval: 1
+    retry_interval: 1
   -
     name: PING
     check: "check_ping!600.0,20%!900.0,40%"
     hostgroups: high-RTT
     check_interval: 5
     max_check_attempts: 4
-    retry_check_interval: 1
+    retry_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
     hostgroups: layer3-infrastructure
     check_interval: 5
     max_check_attempts: 4
-    retry_check_interval: 1
+    retry_interval: 1
   # }}}
   # {{{ ### disk usage
   -
@@ -1457,15 +1492,10 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
     hostgroups: hasbootfs
-  -
-    name: disk usage on /org
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hostgroups: hasorgfs
   -
     name: disk usage on /srv
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
     hostgroups: hassrvfs
   -
     name: disk usage on /var/lib/postgresql
@@ -1547,6 +1577,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/morgue.debian.org"
     hosts: lw03
+  -
+    name: disk usage on /srv/QNAP-big/
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-big"
+    hosts: storace
+  -
+    name: disk usage on /srv/QNAP-tiny
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-tiny"
+    hosts: storace
   # }}}
   # {{{ ### system
   # {{{ setup
@@ -1585,11 +1625,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: prokofiev, pieta, ubc-enc2bl1, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
+    excludehosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo, casulana
   -
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-    hosts: prokofiev, pieta, ubc-enc2bl1, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
+    hosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo, casulana
   -
     name: swap usage - percent
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
@@ -1598,12 +1638,20 @@ services:
     name: swap usage - mb
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20000 -c 5000"
     hostgroups: computers
+  -
+    name: free memory - mb
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m mb"
+    hostgroups: computers
+  -
+    name: free memory - percent
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m pct"
+    hostgroups: computers
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
     excludehosts: zelenka, zandonai
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/getty"
@@ -1611,7 +1659,7 @@ services:
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
 
   -
@@ -1628,7 +1676,7 @@ services:
     name: system - filesystem check
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
     hostgroups: computers
   # }}}
   # {{{ backup
@@ -1640,7 +1688,7 @@ services:
     excludehosts: backuphost, storace
     check_interval: 60
     max_check_attempts: 2
-    retry_check_interval: 5
+    retry_interval: 5
   -
     name: backup server config
     servicegroups: backup
@@ -1648,7 +1696,7 @@ services:
     hosts: storace
     check_interval: 60
     max_check_attempts: 2
-    retry_check_interval: 5
+    retry_interval: 5
   -
     name: backup - bacula - last backup
     servicegroups: backup
@@ -1657,7 +1705,7 @@ services:
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
   -
     name: backup - bacula - last full backup
     servicegroups: backup
@@ -1666,11 +1714,11 @@ services:
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
   -
     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
@@ -1684,6 +1732,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: freebsd
 
+  -
+    name: network backup status - draghi
+    servicegroups: backup
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile -a 2h /home/debbackup/nagios-status"
+    hosts: draghi
+
   ####
   -
     name: process - acc.umu.se backup
@@ -1697,14 +1751,14 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-running-kernel"
     hostgroups: computers
     check_interval: 60
-    retry_check_interval: 5
+    retry_interval: 5
   -
     name: apt - security updates
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
   -
     name: unexpected file - apt sources.list
     servicegroups: apt
@@ -1713,17 +1767,12 @@ services:
   -
     name: upgraded libraries
     servicegroups: security
-    nrpe: "sudo /usr/local/sbin/dsa-check-libs"
-    #nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
+    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
     hostgroups: computers
     excludehostgroups: freebsd
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
     notification_interval: 10080
-  -
-    name: system - all services running
-    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
-    hostgroups: jessie
   -
     name: installed firewall
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
@@ -1738,11 +1787,11 @@ services:
     name: process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
     hostgroups: computers
-    excludehostgroups: freebsd, sparc, jessie
+    excludehostgroups: freebsd, sparc, jessie, stretch
   -
     name: process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ulog -C ulogd -a '/usr/sbin/ulogd --daemon --uid ulog'"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
   -
     name: unexpected process - ulogd
@@ -1761,7 +1810,7 @@ services:
     hostgroups: computers
     depends: process - samhain
     check_interval: 60
-    retry_check_interval: 5
+    retry_interval: 5
     excludehostgroups: brokensamhain
   -
     name: processes - samhain zombies
@@ -1775,7 +1824,7 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
-    excludehostgroups: freebsd, jessie
+    excludehostgroups: freebsd, jessie, stretch
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
@@ -1783,7 +1832,7 @@ services:
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -F'"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
 
   -
@@ -1828,6 +1877,13 @@ services:
     name: process - nrpe
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -d'"
     hostgroups: computers
+    excludehostgroups: stretch
+    max_check_attempts: -1
+    depends: network service - nrpe
+  -
+    name: process - nrpe
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -f'"
+    hostgroups: stretch
     max_check_attempts: -1
     depends: network service - nrpe
   ###
@@ -1850,19 +1906,41 @@ services:
     name: process - ntpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
+    excludehostgroups: systemd-timesyncd
     servicegroups: time
   -
     name: network service - ntp
     check: dsa_check_ntp
     hostgroups: computers
+    excludehostgroups: systemd-timesyncd
     depends: process - ntpd
     servicegroups: time
+  -
+    name: system time synced
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl -s"
+    hostgroups: computers
+    excludehostgroups: systemd-timesyncd, freebsd, wheezy
+    servicegroups: time
+  -
+    name: system time synced
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl"
+    hostgroups: systemd-timesyncd
+    servicegroups: time
   ###
   -
     name: process - atd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C atd -a /usr/sbin/atd"
     hostgroups: computers
   ###
+  -
+    name: process - irqbalance
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
+    #hosts: casulana
+    hostgroups: computers
+    #excludehostgroups: single-cpu, freebsd
+    excludehostgroups: freebsd
+    excludehosts: harris, smetana
+  ###
   -
     name: process - cron
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C cron -a /usr/sbin/cron"
@@ -1882,7 +1960,7 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
-    excludehostgroups: alioth, jessie
+    excludehostgroups: alioth, jessie, stretch
   ###
   -
     name: MQ connection on rainier
@@ -1891,7 +1969,7 @@ services:
     runfrom: rainier
     hostgroups: computers
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
     excludehostgroups: alioth, broken_mq
   -
     name: MQ connection on rapoport
@@ -1900,7 +1978,7 @@ services:
     runfrom: rapoport
     hostgroups: computers
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
     excludehostgroups: alioth, broken_mq
   ###
   -
@@ -1923,11 +2001,11 @@ services:
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C udevd -a 'udevd'"
     hostgroups: computers
-    excludehostgroups: freebsd, jessie
+    excludehostgroups: freebsd, jessie, stretch
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C systemd-udevd -a '/lib/systemd/systemd-udevd'"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
   -
     name: unexpected process - udev
@@ -1938,7 +2016,7 @@ services:
     name: process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid'"
     hostgroups: acpid-hosts
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: unexpected process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
@@ -1958,7 +2036,7 @@ services:
   -
     name: process - stunnel4 - puppet-ekeyd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
-    hostgroups: wheezy, jessie
+    hostgroups: wheezy, jessie, stretch
     excludehostgroups: freebsd, alioth
   -
     name: process - stunnel4 - puppet-ekeyd is crazy
@@ -1971,16 +2049,13 @@ 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
   -
     name: ganeti - job watcher paused
     nrpe: "/usr/lib/nagios/plugins/negate /usr/lib/nagios/plugins/dsa-check-file -f /var/lib/ganeti/watcher.pause"
     hostgroups: computers
-  -
-    name: unwanted process - irqbalance
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
-    hostgroups: computers
   -
     name: unwanted process - openvpn
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C openvpn"
@@ -1995,6 +2070,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"
@@ -2039,7 +2118,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: process - mdadm monitor
     servicegroups: raid
@@ -2063,8 +2142,8 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
-    hostgroups: dl380, dl360, bl460, dl180
-    excludehosts: schein, busoni
+    hostgroups: dl380, dl360, bl460, bl460g8, dl180
+    excludehosts: busoni
     excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
@@ -2077,7 +2156,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
-    hosts: schein, busoni
+    hosts: busoni
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2096,13 +2175,13 @@ services:
 #    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
 #    check_interval: 120
     #hostgroups: computers
-    #excludehosts: villa, lobos, schein
+    #excludehosts: villa, lobos
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     check_interval: 120
     hostgroups: dl380, dl360, bl460, bm-bl
-    excludehosts: villa, lobos, schein, storace, mirror-anu
+    excludehosts: villa, lobos, storace, mirror-anu, sallinen
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
@@ -2113,27 +2192,21 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant  --ignore-failed='PS2'"
     check_interval: 120
     hosts: lobos
-  -
-    name: HW - hpasmcli status
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
-    check_interval: 120
-    hosts: schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
     check_interval: 120
-    hosts: storace
+    hosts: storace, sallinen
   -
     name: HW - hpasmcli status
     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: RAID - 3ware
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
-    hosts: powell
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
+    check_interval: 120
+    hostgroups: bl460g8
   ###
   -
     name: RAID - aacraid
@@ -2141,23 +2214,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid"
     hostgroups: aacraid
   ###
-  -
-    name: RAID - megaraid
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid"
-    hostgroups: megaraid
-  ###
   -
     name: RAID - DRBD
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
-    excludehosts: ubc-bl8
+    excludehosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
   -
     name: RAID - DRBD
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All --ok-no-devices"
-    hosts: ubc-bl8
+    hosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2201,7 +2268,7 @@ services:
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
     hostgroups: heavy-exim, heavy-postfix
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --foreground=true'"
@@ -2224,7 +2291,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
     excludehosts: picconi
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamassassin.pid --create-prefs --max-children 5 --helper-home-dir'"
@@ -2263,7 +2330,7 @@ services:
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
     hostgroups: heavy-exim
-    excludehostgroups: jessie
+    excludehostgroups: jessie, stretch
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a 'postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
@@ -2473,19 +2540,26 @@ services:
     name: network service - ftp
     check: check_ftp
     hostgroups: uploadqueue, security_mirror
-    excludehosts: klecker
+    excludehosts: klecker, mirror-isc, mirror-umn
   -
     name: network service - ftp
     check: check_ftp
     hosts: klecker-ftp
-    depends: klecker:process - xinetd
+  -
+    name: network service - ftp
+    check: check_ftp
+    hosts: mirror-umn2
+  -
+    name: network service - ftp
+    check: check_ftp
+    hosts: mirror-isc2
   # }}}
   # {{{ postgres
   -
     name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres91-hosts, postgres94-hosts
+    excludehostgroups: postgres91-hosts, postgres94-hosts, postgres96-hosts
   -
     name: unwanted process - postgresql 9.0
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
@@ -2498,6 +2572,10 @@ services:
     name: process - postgresql94 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.4/bin/postgres'"
     hostgroups: postgres94-hosts
+  -
+    name: process - postgresql96 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.6/bin/postgres'"
+    hostgroups: postgres96-hosts
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
@@ -2548,7 +2626,7 @@ services:
     contact_groups: +buildd
     check_interval: 5
     max_check_attempts: 24
-    retry_check_interval: 5
+    retry_interval: 5
   -
     name: processes - lvcreate
     nrpe: "/usr/lib/nagios/plugins/check_procs -m 'ELAPSED' -c 500 -C lvcreate -u root -a 'lvcreate'"
@@ -2560,6 +2638,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]'"
@@ -2600,7 +2679,7 @@ services:
     hosts: global
     check_interval: 15
     max_check_attempts: 5
-    retry_check_interval: 5
+    retry_interval: 5
     servicegroups: mirror
   -
     name: mirror sync - snapshot
@@ -2608,7 +2687,7 @@ services:
     hosts: global
     check_interval: 15
     max_check_attempts: 5
-    retry_check_interval: 5
+    retry_interval: 5
     servicegroups: mirror
 
   -
@@ -2716,11 +2795,21 @@ services:
     check: "dsa_check_staticsync_nossl!metadata.ftp-master.debian.org"
     hosts: global
     servicegroups: mirror
+  -
+    name: mirror static sync - mirror-master
+    check: "dsa_check_staticsync_nossl!mirror-master.debian.org"
+    hosts: global
+    servicegroups: mirror
   -
     name: mirror static sync - deb
     check: "dsa_check_staticsync_nossl!deb.debian.org"
     hosts: global
     servicegroups: mirror
+  -
+    name: mirror static sync - manpages
+    check: "dsa_check_staticsync!manpages.debian.org"
+    hosts: global
+    servicegroups: mirror
 
   -
     name: mirror static sync - 10years
@@ -2768,8 +2857,8 @@ services:
     hosts: global
     servicegroups: mirror
   -
-    name: mirror static sync - debconf1
-    check: "dsa_check_staticsync!debconf1.debconf.org"
+    name: mirror static sync - debconf16
+    check: "dsa_check_staticsync!debconf16.debconf.org"
     hosts: global
     servicegroups: mirror
   -
@@ -2860,6 +2949,11 @@ services:
     hosts: global
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-statusfile /srv/dns.debian.org/var/nagios/ds"
     runfrom: denis
+  -
+    name: DNS - zones signed properly
+    hosts: global
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-signature-all"
+    runfrom: denis
   # }}}
   # {{{ storage
   -
@@ -2869,7 +2963,7 @@ services:
     hosts: giustini
     check_interval: 5
     max_check_attempts: 4
-    retry_check_interval: 1
+    retry_interval: 1
   -
     name: Overall Unit Status
     remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
@@ -2897,7 +2991,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dchroots-current"
     hostgroups: porterbox
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
   # }}}
   # {{{ openstack
 #  -
@@ -2945,7 +3039,7 @@ services:
   -
     name: system - all services running
     nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
   ###
   -
@@ -2965,6 +3059,10 @@ services:
     hosts: draghi
     depends: process - xinetd
   ###
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hostgroups: rsyncd-systemd-hosts
   -
     name: network service - rsync
     check: check_tcp!873
@@ -2974,32 +3072,28 @@ 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
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:60 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:90 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
     hosts: tchaikovsky
   ###
   -
     name: process - debianqueued
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak-unpriv -C debianqueued"
-    hostgroups: uploadqueue
+    hostgroups: queued
   ####
   -
     name: network service - gobby
@@ -3024,7 +3118,14 @@ services:
     hosts: handel
     check_interval: 60
     max_check_attempts: 2
-    retry_check_interval: 5
+    retry_interval: 5
+  -
+    name: puppet - agent check
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/puppet-agent"
+    hostgroups: computers
+    excludehosts: moszumanska
+    check_interval:  60
+    retry_interval: 15
   # }}}
 # }}}