X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=759faac14e0a69052e3e7b6631bb8fd231de51e7;hb=69fdde01ec4f761b9af20be24c0d7f2d000f6107;hp=9b8d81ca25c2d6655eefef7c73a1e24625ed3dc9;hpb=b5d0d2674d65130fab5aea02d6f731bf00fc72c0;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9b8d81c..759faac 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -93,10 +93,6 @@ servers:
     address: 185.17.185.190
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-linaro:
-    address: 64.28.108.36
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-manda:
     address: 82.195.78.118
     parents: gw-ubcece
@@ -178,18 +174,17 @@ servers:
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-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
-    ## No need to update to Stretch, casulana replaces it. It should eventually die.
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, stretch, autofs, sw-raid
   mirror-accumu:
     address: 130.242.6.199
     parents: gw-accumu2
-    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts
   # }}}
   # {{{ gw-aql
   eller:
@@ -271,65 +266,65 @@ servers:
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-systemd-hosts, jessie, hassrvfs, postgres94-hosts
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-hosts, stretch, hassrvfs, postgres96-hosts, manyprocesses
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl9:
     address: 5.153.231.249
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl10:
     address: 5.153.231.250
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl11:
     address: 5.153.231.251
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl12:
     address: 5.153.231.252
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl13:
     address: 5.153.231.253
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl14:
     address: 5.153.231.254
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
 
   milanollo:
     address: 5.153.231.2
@@ -338,11 +333,11 @@ servers:
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
@@ -368,15 +363,15 @@ servers:
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, postgres94-hosts, postgres96-hosts, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd
   ganeti-bytemark:
-    address: 82.195.75.111
+    address: 5.153.231.1
     parents: gw-bytemark
     hostgroups: notacomputer
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, apache-https, apache2-hosts, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, autofs, nfs-client, uploadqueue, apache-https, apache2-hosts, systemd-timesyncd
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
@@ -384,7 +379,7 @@ servers:
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
@@ -396,7 +391,7 @@ servers:
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
@@ -418,11 +413,11 @@ servers:
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, 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, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
@@ -438,11 +433,11 @@ servers:
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, 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, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
@@ -454,7 +449,7 @@ servers:
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
@@ -466,7 +461,7 @@ servers:
   mirror-bytemark:
     address: 5.153.231.37
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, apache2-hosts, hassrvfs
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, hassrvfs
   mirror-bytemark-debian:
     address: 5.153.231.45
     hostgroups: secondary-IPs
@@ -478,7 +473,7 @@ servers:
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, autofs, nfs-client, systemd-timesyncd
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
@@ -486,30 +481,30 @@ servers:
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, 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, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd
   rusca:
     address: 5.153.231.43
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   manziarly:
     address: 5.153.231.44
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
 
   casulana:
     address: 5.153.231.41
     parents: gw-bytemark
-    hostgroups: computers, service, stretch, hassrvfs, dl380
+    hostgroups: computers, service, stretch, hassrvfs, dl380, manyprocesses
   # }}}
   # {{{ gw-c3sl
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, hassrvfs, stretch, high-RTT, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, hassrvfs, stretch, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
   # {{{ gw-cecsit
@@ -520,22 +515,22 @@ servers:
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   mirror-anu3:
     address: 150.203.164.61
     parents: mirror-anu
-    hostgroups: secondary-IPs, security_mirror
+    hostgroups: secondary-IPs, security_mirror, rsyncd-hosts
   mirror-anu4:
     address: 150.203.164.62
     parents: mirror-anu
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
-  aagaard:
+  conova-node01:
     address: 217.196.149.227
     parents: gw-conova
     hostgroups: computers, stretch, service, sw-raid
-  acker:
+  conova-node02:
     address: 217.196.149.228
     parents: gw-conova
     hostgroups: computers, stretch, service, sw-raid
@@ -553,15 +548,15 @@ servers:
     parents: mirror-conova
   mirror-conova-security:
     address: 217.196.149.233
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
     parents: mirror-conova
   mirror-conova-archive:
     address: 217.196.149.234
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
     parents: mirror-conova
   mirror-conova-syncproxy4-eu:
     address: 217.196.149.237
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, https-service
     parents: mirror-conova
 
   arm-conova-01:
@@ -581,11 +576,11 @@ servers:
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
-    hostgroups: computers, service, dl360, jessie, drbd-hosts
+    hostgroups: computers, service, dl360, stretch, drbd-hosts
   csail-node02:
     address: 128.31.0.46
     parents: gw-csail
-    hostgroups: computers, service, dl360, jessie, drbd-hosts
+    hostgroups: computers, service, dl360, stretch, drbd-hosts
   ganeti-csail:
     address: 128.31.0.49
     parents: gw-bytemark
@@ -602,7 +597,7 @@ servers:
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
-    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, apache2-hosts, rsyncd-systemd-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, apache2-hosts, rsyncd-hosts, apache-https, systemd-timesyncd
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
@@ -614,11 +609,11 @@ servers:
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, hassrvfs, stretch, 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, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
   usper:
     address: 128.31.0.69
     parents: ganeti-csail
@@ -634,7 +629,7 @@ servers:
   sechter:
     address: 128.61.240.73
     parents: gw-gatech
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -644,11 +639,11 @@ servers:
   grnet-node01:
     address: 194.177.211.195
     parents: gw-grnet
-    hostgroups: computers, service, dl380, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, stretch, drbd-hosts
   grnet-node02:
     address: 194.177.211.196
     parents: gw-grnet
-    hostgroups: computers, service, dl380, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, stretch, drbd-hosts
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
@@ -676,21 +671,25 @@ servers:
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, rsyncd-systemd-hosts, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, rsyncd-hosts, systemd-timesyncd
   melartin:
     address: 194.177.211.208
     parents: ganeti-grnet
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, postgres96-hosts
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, postgres96-hosts, hassrvfs
+  static-master-grnet-01:
+    address: 194.177.211.209
+    parents: ganeti-grnet
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, hassrvfs
   # }}}
   # {{{ gw-isc
   mirror-isc:
     address: 149.20.4.13
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
   mirror-isc3:
     address: 149.20.4.15
     parents: mirror-isc
@@ -698,25 +697,25 @@ servers:
   mirror-isc-syncproxy:
     address: 149.20.4.16
     parents: mirror-isc
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   # }}}
   # {{{ gw-leaseweb
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-systemd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
@@ -726,20 +725,6 @@ servers:
     parents: gw-leaseweb
     hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
   # }}}
-  # {{{ gw-linaro
-  arm-linaro-01:
-    address: 64.28.108.83
-    parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
-  arm-linaro-03:
-    address: 64.28.108.85
-    parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
-  asachi:
-    address: 64.28.108.84
-    parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, stretch, broken_mq
-  # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
     address: 129.143.160.6
@@ -751,19 +736,19 @@ servers:
   czerny:
     address: 82.195.75.109
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses
   clementi:
     address: 82.195.75.103
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses
   bendel:
     address: 82.195.75.100
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, jessie, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, stretch, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs
   master:
     address: 82.195.75.110
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, spamd, heavy-exim, highload
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -797,7 +782,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, stretch, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, stretch, apache-https
   ganeti3:
     address: 82.195.75.111
     parents: gw-manda
@@ -805,7 +790,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-systemd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
@@ -817,11 +802,11 @@ servers:
   vogler:
     address: 82.195.75.92
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie
+    hostgroups: computers, service, kvmdomains, stretch
   wolkenstein:
     address: 82.195.75.65
     parents: ganeti3
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, stretch, apache-https
   mips-manda-01:
     address: 82.195.75.66
     parents: gw-manda
@@ -841,7 +826,7 @@ servers:
   seger:
     address: 82.195.75.93
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-systemd-hosts, uploadqueue, kvmdomains, apache-https, postgres94-hosts, jessie
+    hostgroups: computers, service, apache2-hosts, hassrvfs, rsyncd-hosts, kvmdomains, apache-https, postgres96-hosts, stretch
   suchon:
     address: 82.195.75.68
     parents: ganeti3
@@ -862,16 +847,16 @@ servers:
   byrd:
     address: 140.211.166.200
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, jessie
+    hostgroups: computers, service, dl380, stretch
   beach:
     address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, apache-https
 
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
-    hostgroups: computers, stretch, service
+    hostgroups: computers, stretch, service, manyprocesses
   ppc64el-osuosl-01:
     address: 140.211.166.196
     parents: pieta
@@ -893,11 +878,11 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, stretch, dl380, nfs-client, autofs
+    hostgroups: computers, service, stretch, dl380, nfs-client, autofs, postgres96-hosts
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-systemd-hosts, hasvarlogfs, multipath-hosts, nfs-server
+    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -909,11 +894,11 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, stretch, security_mirror
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl360, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, stretch, security_mirror
   # }}}
   # {{{ gw-sil
   eberlin:
@@ -999,24 +984,24 @@ servers:
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
   ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
   ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
 
   rachmaninoff:
     address: 209.87.16.20
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   x86-ubc-01:
     address: 209.87.16.21
     parents: ubc-gateway
@@ -1034,11 +1019,11 @@ servers:
   elgar:
     address: 209.87.16.24
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   gombert:
     address: 209.87.16.25
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   nono:
     address: 209.87.16.26
     parents: ubc-gateway
@@ -1054,11 +1039,11 @@ servers:
   menotti:
     address: 209.87.16.29
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   danzi:
     address: 209.87.16.30
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd
   geo2:
     address: 209.87.16.31
     parents: ubc-gateway
@@ -1074,7 +1059,7 @@ servers:
   sonntag:
     address: 209.87.16.34
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   tchaikovsky:
     address: 209.87.16.35
     parents: ubc-gateway
@@ -1108,24 +1093,28 @@ servers:
     address: 209.87.16.44
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts
+  debussy:
+    address: 209.87.16.46
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   # }}}
   # {{{ gw-umn
   #saens:
   #  address: 128.101.240.212
   #  parents: gw-umn
-  #  hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+  #  hostgroups: computers, service, apache2-hosts, rsyncd-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, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
   mirror-umn3:
     address: 128.101.240.216
     parents: mirror-umn
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   mirror-umn4:
     address: 128.101.240.217
     parents: mirror-umn
@@ -1135,7 +1124,7 @@ servers:
   prokofiev:
     address: 177.220.10.140
     parents: gw-unicamp
-    hostgroups: computers, stretch, service
+    hostgroups: computers, stretch, service, manyprocesses
   powerpc-unicamp-01:
     address: 177.220.10.141
     parents: prokofiev
@@ -1153,7 +1142,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-systemd-hosts, dl380, jessie, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1195,7 +1184,7 @@ servers:
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-systemd-hosts, security_mirror
+    hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, security_mirror
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1307,10 +1296,7 @@ hostgroups:
     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
+    alias: hosts providing rsync services
     private: 1
   xinetd-hosts:
     alias: hosts providing services via xinetd
@@ -1342,9 +1328,14 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
+  https-service:
+    alias: https service for secondary addresses
+    private: 1
   broken_https_default_vhost:
     alias: https default vhost does not say 200 OK
     private: 1
+  manyprocesses:
+    alias: hosts with lots and lots of (kernel) processes
 
   no-bacula:
     alias: hosts which are not being backed up with bacula
@@ -1520,24 +1511,44 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-1
+    name: disk usage on /srv/farm-snapshot/farm-2017-0
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-0"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-1
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-1"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-2
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-1"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-2"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-2
+    name: disk usage on /srv/farm-snapshot/farm-2017-3
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-3"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-3
+    name: disk usage on /srv/farm-snapshot/farm-2017-4
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-3"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-4"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-4
+    name: disk usage on /srv/farm-snapshot/farm-2017-5
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-5"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-6
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-6"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-7
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-7"
     hosts: sibelius
   -
     name: disk usage on /srv/ftp-master.debian.org
@@ -1617,11 +1628,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, casulana
+    excludehostgroups: manyprocesses
   -
     name: processes - total
+    hostgroups: manyprocesses
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-    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%"
@@ -2066,6 +2077,7 @@ services:
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
     hostgroups: stretch
+    excludehosts: storace
   -
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
@@ -2101,7 +2113,7 @@ services:
   -
     name: SSL certs - LE
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /etc/puppet/modules/ssl/files/from-letsencrypt"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /srv/puppet.debian.org/from-letsencrypt"
     runfrom: handel
   # }}}
   # {{{ HW health/raid
@@ -2272,17 +2284,17 @@ services:
     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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamd.pid --create-prefs --max-children 5 --helper-home-dir'"
     hostgroups: spamd
     excludehosts: picconi
     excludehostgroups: wheezy
   -
     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 20 --min-spare=5 --helper-home-dir'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamd.pid --create-prefs --max-children 20 --min-spare=5 --helper-home-dir'"
     hosts: picconi
   -
     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 10 --helper-home-dir'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamd.pid --create-prefs --max-children 10 --helper-home-dir'"
     hosts: bendel
   -
     name: process - spamd - child
@@ -2364,42 +2376,22 @@ services:
   # }}}
   # {{{ postfix
   ###
-  -
-    name: process - postfix - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/master'"
-    hostgroups: postfix-hosts
-    excludehostgroups: stretch
   -
     name: process - postfix - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/sbin/master'"
     hostgroups: postfix-hosts
-    excludehostgroups: jessie
 
-  -
-    name: process - postfix - qmgr
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t fifo -u'"
-    hostgroups: postfix-hosts
-    depends: process - postfix - master
-    excludehostgroups: stretch
   -
     name: process - postfix - qmgr
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t unix -u'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
-    excludehostgroups: jessie
 
-  -
-    name: process - postfix - pickup
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t fifo -u -c'"
-    hostgroups: postfix-hosts
-    depends: process - postfix - master
-    excludehostgroups: stretch
   -
     name: process - postfix - pickup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t unix -u -c'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
-    excludehostgroups: jessie
 
   -
     name: process - postfix - anvil
@@ -2511,6 +2503,12 @@ services:
     excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
     check_interval: 120
+  -
+    name: network service - https
+    check: check_https
+    hostgroups: https-service
+    excludehostgroups: broken_https_default_vhost
+    check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
@@ -2526,7 +2524,7 @@ services:
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hostgroups: apache-https
+    hostgroups: apache-https, https-service
     depends: network service - https
     check_interval: 60
   -
@@ -2540,20 +2538,7 @@ services:
   -
     name: network service - ftp
     check: check_ftp
-    hostgroups: uploadqueue, security_mirror
-    excludehosts: klecker, mirror-isc, mirror-umn
-  -
-    name: network service - ftp
-    check: check_ftp
-    hosts: klecker-ftp
-  -
-    name: network service - ftp
-    check: check_ftp
-    hosts: mirror-umn2
-  -
-    name: network service - ftp
-    check: check_ftp
-    hosts: mirror-isc2
+    hostgroups: uploadqueue
   # }}}
   # {{{ postgres
   -
@@ -2666,6 +2651,14 @@ services:
     max_check_attempts: 5
     retry_interval: 5
     servicegroups: mirror
+  -
+    name: mirror sync - debian archive backend
+    check: "dsa_check_mirrorsync!debian.backend.mirrors.debian.org!debian/project/trace/master"
+    hosts: global
+    check_interval: 15
+    max_check_attempts: 5
+    retry_interval: 5
+    servicegroups: mirror
 
   -
     name: mirror static sync - bits
@@ -3036,31 +3029,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
     hostgroups: rsyncd-hosts
-    depends: process - xinetd
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: milanollo2
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: mirror-isc2, mirror-isc-syncproxy
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: mirror-umn2, mirror-umn3
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: mirror-anu2, mirror-anu3
   ###
   -
     name: process - icinga