mirror-accumu is now on a different gateway
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index 985ec2c..29bd83c 100644 (file)
@@ -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,6 +28,10 @@ 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
     parents: gw-ubcece
@@ -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,7 +81,8 @@ 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:
@@ -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:
@@ -166,12 +162,6 @@ servers:
     hostgroups: layer3-infrastructure
   # }}}
   # {{{ servers
-  # {{{ gw-1und1
-  powell:
-    address: 87.106.64.223
-    parents: gw-1und1
-    hostgroups: computers, service, jessie
-  # }}}
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
@@ -191,6 +181,10 @@ servers:
     address: 130.239.18.121
     parents: gw-accumu
     hostgroups: computers, buildd, hassrvfs, jessie
+  mirror-accumu:
+    address: 130.242.6.199
+    parents: gw-accumu2
+    hostgroups: computers, service, jessie, apache2-hosts, hassrvfs
   # }}}
   # {{{ gw-aql
   eller:
@@ -276,7 +270,7 @@ servers:
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, apache-https, dl380, hpnewraid, rsyncd-hosts, xinetd-hosts, jessie, hassrvfs, postgres94-hosts
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, hpnewraid, rsyncd-systemd-hosts, jessie, hassrvfs, postgres94-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -471,10 +465,19 @@ servers:
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd
-  fede:
+    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, systemd-timesyncd
+  mirror-bytemark:
     address: 5.153.231.37
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, apache2-hosts, hassrvfs, xinetd-hosts
+  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
@@ -499,6 +502,11 @@ servers:
     address: 5.153.231.44
     parents: ganeti-bytemark
     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:
@@ -533,14 +541,26 @@ servers:
   acker:
     address: 217.196.149.228
     parents: gw-conova
-    hostgroups: computers, jessie, service, sw-raid
+    hostgroups: computers, stretch, service, sw-raid
+  mirror-conova:
+    address: 217.196.149.229
+    parents: gw-conova
+    hostgroups: computers, jessie, service, apache2-hosts, xinetd-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, jessie
   # }}}
   # {{{ 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
@@ -565,31 +585,31 @@ 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-hosts, xinetd-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, jessie, systemd-timesyncd
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   httpredir-csail-01:
     address: 128.31.0.66
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, 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, xinetd-hosts, queued
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts, queued, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
@@ -616,62 +636,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, jessie, 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, xinetd-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
   # }}}
@@ -722,14 +738,14 @@ servers:
     hostgroups: computers, buildd, jessie
     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
@@ -768,18 +784,18 @@ 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, jessie, 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
@@ -803,24 +819,24 @@ 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
+    parents: gw-manda
     hostgroups: computers, buildd, jessie, hassrvfs
   mipsel-manda-01:
     address: 82.195.75.72
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-02:
     address: 82.195.75.74
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-03:
     address: 82.195.75.67
-    parents: gw-man-da
+    parents: gw-manda
     hostgroups: computers, buildd, jessie, 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, xinetd-hosts, apache-https, postgres94-hosts, jessie
   # }}}
   # {{{ gw-marist
   zani:
@@ -830,7 +846,7 @@ servers:
   # }}}
   # {{{ 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
 
@@ -865,10 +881,14 @@ servers:
     hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
   # }}}
   # {{{ gw-sanger
+  sallinen:
+    address: 193.62.202.26
+    parents: gw-sanger
+    hostgroups: computers, service, jessie, dl380, hpnewraid
   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
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -947,10 +967,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
@@ -963,10 +979,6 @@ 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
   # }}}
   # {{{ ubc-gateway
   ubc-enc2bl01:
@@ -985,14 +997,15 @@ servers:
     address: 209.87.16.10
     parents: ubc-gateway
     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, jessie, systemd-timesyncd
   finzi:
     address: 209.87.16.22
     parents: ubc-gateway
@@ -1006,67 +1019,72 @@ 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, jessie, heavy-exim, xinetd-hosts, 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, jessie, 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, xinetd-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, jessie, systemd-timesyncd
   gretchaninov:
     address: 209.87.16.36
     parents: ubc-gateway
-    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts
+    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
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1143,10 +1161,6 @@ servers:
     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
@@ -1246,9 +1260,6 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
-  megaraid:
-    alias: Hosts with LSI Logic MegaRAID
-    private: 1
 
   wheezy:
     alias: Hosts running wheezy
@@ -1256,6 +1267,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
@@ -1292,6 +1305,9 @@ hostgroups:
   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
@@ -1301,6 +1317,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
@@ -1354,9 +1373,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
@@ -1430,21 +1446,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
   -
@@ -1469,15 +1485,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
@@ -1559,6 +1570,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
@@ -1597,11 +1618,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo
+    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-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo
+    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%"
@@ -1610,12 +1631,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"
@@ -1623,7 +1652,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
 
   -
@@ -1640,7 +1669,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
@@ -1652,7 +1681,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
@@ -1660,7 +1689,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
@@ -1669,7 +1698,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
@@ -1678,7 +1707,7 @@ services:
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
   -
     name: process - bacula-dir
     servicegroups: backup
@@ -1696,6 +1725,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
@@ -1709,14 +1744,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
@@ -1725,12 +1760,11 @@ 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: installed firewall
@@ -1746,11 +1780,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
@@ -1769,7 +1803,7 @@ services:
     hostgroups: computers
     depends: process - samhain
     check_interval: 60
-    retry_check_interval: 5
+    retry_interval: 5
     excludehostgroups: brokensamhain
   -
     name: processes - samhain zombies
@@ -1783,7 +1817,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'"
@@ -1791,7 +1825,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
 
   -
@@ -1836,6 +1870,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
   ###
@@ -1867,6 +1908,12 @@ services:
     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"
@@ -1878,6 +1925,15 @@ services:
     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"
@@ -1897,7 +1953,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
@@ -1906,7 +1962,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
@@ -1915,7 +1971,7 @@ services:
     runfrom: rapoport
     hostgroups: computers
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
     excludehostgroups: alioth, broken_mq
   ###
   -
@@ -1938,11 +1994,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
@@ -1953,7 +2009,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"
@@ -1973,7 +2029,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
@@ -1992,10 +2048,6 @@ 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"
@@ -2054,7 +2106,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
@@ -2079,7 +2131,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
     hostgroups: dl380, dl360, bl460, bl460g8, dl180
-    excludehosts: schein, busoni
+    excludehosts: busoni
     excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
@@ -2092,7 +2144,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
@@ -2111,13 +2163,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"
@@ -2128,40 +2180,23 @@ 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: RAID - aacraid
     servicegroups: raid
     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
@@ -2216,7 +2251,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'"
@@ -2239,7 +2274,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'"
@@ -2278,7 +2313,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'"
@@ -2488,19 +2523,29 @@ 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
+    depends: mirror-umn:process - xinetd
+  -
+    name: network service - ftp
+    check: check_ftp
+    hosts: mirror-isc2
+    depends: mirror-isc:process - xinetd
   # }}}
   # {{{ 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'"
@@ -2513,6 +2558,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"
@@ -2563,7 +2612,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'"
@@ -2615,7 +2664,7 @@ services:
     hosts: global
     check_interval: 15
     max_check_attempts: 5
-    retry_check_interval: 5
+    retry_interval: 5
     servicegroups: mirror
   -
     name: mirror sync - snapshot
@@ -2623,7 +2672,7 @@ services:
     hosts: global
     check_interval: 15
     max_check_attempts: 5
-    retry_check_interval: 5
+    retry_interval: 5
     servicegroups: mirror
 
   -
@@ -2731,11 +2780,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
@@ -2783,8 +2842,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
   -
@@ -2889,7 +2948,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"
@@ -2917,7 +2976,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dchroots-current"
     hostgroups: porterbox
     check_interval:  60
-    retry_check_interval: 15
+    retry_interval: 15
   # }}}
   # {{{ openstack
 #  -
@@ -2965,7 +3024,7 @@ services:
   -
     name: system - all services running
     nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
-    hostgroups: jessie
+    hostgroups: jessie, stretch
     excludehostgroups: freebsd
   ###
   -
@@ -2985,6 +3044,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
@@ -3044,7 +3107,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
   # }}}
 # }}}