Monitor the freeradius service on vogler
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index 52b0d64..cbf6c67 100644 (file)
@@ -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
@@ -174,22 +170,21 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, service, stretch
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hassrvfs, pe1950
   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, pe1950
   # }}}
   # {{{ 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, stretch, 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, stretch, 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, stretch, 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, stretch, 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, stretch, 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, stretch, 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, stretch, 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, stretch, 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, stretch, 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, stretch, 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,9 +363,9 @@ 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:
@@ -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, broken_https_default_vhost
   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
@@ -408,7 +403,7 @@ servers:
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -418,15 +413,15 @@ 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
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
@@ -438,7 +433,7 @@ 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
@@ -454,31 +449,19 @@ 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
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, systemd-timesyncd
-  mirror-bytemark:
-    address: 5.153.231.37
-    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, 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 +469,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, apache2-hosts
   # }}}
   # {{{ 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,11 +503,11 @@ 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
@@ -546,22 +529,22 @@ servers:
   mirror-conova:
     address: 217.196.149.229
     parents: gw-conova
-    hostgroups: computers, stretch, service, apache2-hosts, apache-https
+    hostgroups: computers, stretch, 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
+    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,28 +564,20 @@ 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
+    parents: gw-csail
     hostgroups: notacomputer
 
-  falla:
-    address: 128.31.0.65
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie, jessie-freebsd
-  fischer:
-    address: 128.31.0.35
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie
   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 +589,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 +609,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:
@@ -660,7 +635,7 @@ servers:
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, xinetd-hosts, systemd-timesyncd
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
@@ -676,11 +651,11 @@ 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
@@ -690,11 +665,11 @@ servers:
   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
@@ -702,47 +677,41 @@ 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
-    hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     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
+    hostgroups: computers, service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+  lw09:
+    address: 185.17.185.181
+    parents: gw-leaseweb
+    hostgroups: computers, service, stretch, dl180
+  lw10:
+    address: 185.17.185.182
+    parents: gw-leaseweb
+    hostgroups: computers, service, stretch, dl180
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -755,29 +724,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
-  fils:
-    address: 82.195.75.89
-    parents: ganeti3
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  fayrfax:
-    address: 82.195.75.82
-    parents: ganeti3
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload
   vento:
     address: 82.195.75.98
     parents: ganeti3
@@ -801,7 +760,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
@@ -809,7 +768,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
@@ -821,11 +780,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
@@ -845,7 +804,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
@@ -858,24 +817,19 @@ servers:
     hostgroups: computers, buildd, hassrvfs, stretch, incomingmailrelayed
   # }}}
   # {{{ gw-osuosl
-  busoni:
-    address: 140.211.166.202
-    parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, jessie, hasvarlogfs, apache2-hosts, no-bacula, apache-https
-
   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
@@ -884,10 +838,6 @@ servers:
     address: 140.211.166.197
     parents: pieta
     hostgroups: computers, hassrvfs, buildd, jessie
-  pizzetti:
-    address: 140.211.166.198
-    parents: pieta
-    hostgroups: computers, jessie, hassrvfs, porterbox
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
@@ -897,11 +847,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
@@ -913,11 +863,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:
@@ -939,110 +889,40 @@ servers:
     parents: gw-skroutz1, gw-skroutz2
     hostgroups: computers, stretch, service, sw-raid, hassrvfs, apache2-hosts
   # }}}
-  # {{{ gw-ubcece
-  sw-ubcece:
-    hostgroups: layer2-infrastructure
-    contacts: lfilipoz
-    pingable: false
-    check_command: dsa_check_always_ok
-  sw-ubcece-mcld:
-    hostgroups: layer2-infrastructure
-    parents: sw-ubcece
-    contacts: lfilipoz
-    pingable: false
-    check_command: dsa_check_always_ok
-  sw-ubcece-kais:
-    hostgroups: layer2-infrastructure
-    parents: sw-ubcece
-    contacts: lfilipoz
-    pingable: false
-    check_command: dsa_check_always_ok
-  spontini:
-    address: 206.12.19.14
-    parents: sw-ubcece-mcld
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
-    contacts: lfilipoz
-  ubc-bl7:
-    address: 206.12.19.217
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl6:
-    address: 206.12.19.216
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl2:
-    address: 206.12.19.212
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl3:
-    address: 206.12.19.213
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl4:
-    address: 206.12.19.214
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl8:
-    address: 206.12.19.218
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  # MSA 2000 (2012i)
-  giustini:
-    address: 192.168.2.6
-    parents: sw-ubcece-kais
-    hostgroups: notacomputer
-    # unless we implement runfrom for host alive checks
-    pingable: false
-    check_command: dsa_check_always_ok
-#  locke:
-#    address: 206.12.19.120
-#    parents: sw-ubcece-kais
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  # }}}
   # {{{ ubc-gateway
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
   ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
   ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, 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
     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
-  finzi:
-    address: 209.87.16.22
-    parents: ubc-gateway
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  fano:
-    address: 209.87.16.23
-    parents: ubc-gateway
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
   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
@@ -1058,11 +938,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
@@ -1078,7 +958,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
@@ -1090,7 +970,7 @@ servers:
   tye:
     address: 209.87.16.37
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ullmann:
     address: 209.87.16.38
     parents: ubc-gateway
@@ -1111,25 +991,29 @@ servers:
   godard:
     address: 209.87.16.44
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts, manyprocesses
+  debussy:
+    address: 209.87.16.46
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost
   # }}}
   # {{{ 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
@@ -1139,7 +1023,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
@@ -1157,7 +1041,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
@@ -1199,7 +1083,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 #############################
@@ -1210,10 +1094,6 @@ hostgroups:
     extinfo-icon_image: base/debian.png
     extinfo-icon_image_alt: Debian GNU/Linux
     extinfo-notes_url: https://db.debian.org/machines.cgi?host=%s
-  layer2-infrastructure:
-    alias: Layer 2 Devices
-    extinfo-icon_image: base/switch40.png
-    extinfo-icon_image_alt: switch
   layer3-infrastructure:
     alias: Layer 3 Devices
     extinfo-icon_image: base/switch40.png
@@ -1221,10 +1101,6 @@ hostgroups:
   notacomputer:
     alias: Systems that are not really systems.  Yeah :)
     private: 1
-  freebsd:
-    alias: freebsd
-    private: 1
-    extinfo-icon_image_alt: Debian GNU/kFreeBSD
   armhf:
     alias: armhf
     private: 1
@@ -1268,13 +1144,14 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
+  pe1950:
+    alias: Dell PowerEdge 1950 hosts
+    private: 1
 
   wheezy:
     alias: Hosts running wheezy
   jessie:
     alias: Hosts running jessie
-  jessie-freebsd:
-    alias: kFreebsd hosts running jessie
   stretch:
     alias: Hosts running stretch
 
@@ -1311,10 +1188,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
@@ -1346,9 +1220,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
@@ -1502,7 +1381,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, busoni, buxtehude, lw07, fasolo
+    hosts: sibelius, buxtehude, lw07, fasolo
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1524,24 +1403,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-1"
+    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-2
+    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-2"
+    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-3
+    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-3"
+    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-4
+    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-4"
+    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-2017-4
+    servicegroups: diskspace
+    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-2017-5
+    servicegroups: diskspace
+    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
@@ -1621,19 +1520,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%"
-    hostgroups: computers
-  -
-    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"
@@ -1648,15 +1539,10 @@ services:
     hostgroups: computers
     excludehosts: zelenka, zandonai
     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"
-    hostgroups: jessie-freebsd
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
     hostgroups: jessie, stretch
-    excludehostgroups: freebsd
 
   -
     name: processes - zombies
@@ -1667,7 +1553,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy"
     event_handler: dsa_event_handler_restart_ekey
     hostgroups: computers
-    excludehostgroups: freebsd
   -
     name: system - filesystem check
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
@@ -1721,12 +1606,7 @@ services:
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: computers
-    excludehostgroups: freebsd, alioth
-  -
-    name: process - bacula-fd
-    servicegroups: backup
-    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
+    excludehostgroups: alioth
 
   -
     name: network backup status - draghi
@@ -1763,9 +1643,8 @@ services:
   -
     name: upgraded libraries
     servicegroups: security
-    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
+    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs --ignore-younger=1h"
     hostgroups: computers
-    excludehostgroups: freebsd
     check_interval:  60
     retry_interval: 15
     notification_interval: 10080
@@ -1773,26 +1652,23 @@ services:
     name: installed firewall
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
     hostgroups: computers
-    excludehostgroups: freebsd
   -
     name: puppetized firewall
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
     hostgroups: computers
-    excludehostgroups: freebsd
   -
     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, stretch
+    excludehostgroups: 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, stretch
-    excludehostgroups: freebsd
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
-    hostgroups: freebsd, sparc
+    hostgroups: sparc
   ####
   -
     name: process - samhain
@@ -1820,16 +1696,11 @@ 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, 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'"
-    hostgroups: freebsd
+    excludehostgroups: jessie, stretch
   -
     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, stretch
-    excludehostgroups: freebsd
 
   -
     name: remote logging on lotti
@@ -1887,11 +1758,6 @@ services:
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
     hostgroups: computers
-    excludehostgroups: freebsd
-  -
-    name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
-    hostgroups: freebsd
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1915,7 +1781,7 @@ services:
     name: system time synced
     nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl -s"
     hostgroups: computers
-    excludehostgroups: systemd-timesyncd, freebsd, wheezy
+    excludehostgroups: systemd-timesyncd, wheezy
     servicegroups: time
   -
     name: system time synced
@@ -1931,10 +1797,7 @@ services:
   -
     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
   ###
   -
@@ -1946,11 +1809,7 @@ services:
     name: process - ud-replicated
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C ud-replicated -a '/usr/bin/python /usr/bin/ud-replicated'"
     hostgroups: computers
-    excludehostgroups: freebsd, alioth
-  -
-    name: process - ud-replicated
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C python2.7 -a '/usr/bin/python /usr/bin/ud-replicated'"
-    hostgroups: freebsd
+    excludehostgroups: alioth
   ###
   -
     name: process - monit
@@ -1997,16 +1856,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, stretch
+    excludehostgroups: 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, stretch
-    excludehostgroups: freebsd
-  -
-    name: unexpected process - udev
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
-    hostgroups: freebsd
   ###
   -
     name: process - acpid
@@ -2033,19 +1887,13 @@ 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, stretch
-    excludehostgroups: freebsd, alioth
+    excludehostgroups: alioth
   -
     name: process - stunnel4 - puppet-ekeyd is crazy
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
     hostgroups: computers
-    excludehostgroups: freebsd, alioth
-    excludehosts: czerny, grnet-node01, storace, ubc-bl2
-  ###
-  -
-    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
+    excludehostgroups: alioth
+    excludehosts: czerny, grnet-node01, storace
   # }}}
   # {{{ anti-services
   -
@@ -2106,7 +1954,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
@@ -2146,12 +1994,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
     check_interval: 120
     hostgroups: bm-bl
-  -
-    name: HW - hpacucli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
-    check_interval: 120
-    hosts: busoni
   ###
 #  -
 #    name: HW - edac status
@@ -2202,12 +2044,10 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
-    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-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
+    name: HW - OpenManage status
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage"
+    hostgroups: pe1950
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2217,7 +2057,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts, mail-relay
-    excludehosts: master, busoni, quantz, buxtehude
+    excludehosts: master, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
@@ -2227,11 +2067,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, quantz, buxtehude
+    excludehosts: master, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, busoni, quantz, buxtehude
+    hosts: master, quantz, buxtehude
   -
     name: mail queue
     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
@@ -2277,17 +2117,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
@@ -2301,7 +2141,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: bendel, busoni
+    excludehosts: bendel
 
   -
     name: unwanted process - greylistd
@@ -2369,42 +2209,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
@@ -2492,7 +2312,7 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: klecker
+    excludehosts: klecker, casulana
     depends: process - apache2 - master
   -
     name: network service - http
@@ -2516,6 +2336,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
@@ -2531,7 +2357,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
   -
@@ -2545,20 +2371,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
   -
@@ -2588,18 +2401,11 @@ services:
     hosts: storace, backuphost
   # }}}
   # {{{ buildd
-  -
-    name: process - buildd
-    servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
-    hosts: fano, finzi, fils, fayrfax
-    contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: fano, finzi, fils, fayrfax
     contact_groups: buildd
   -
     name: processes - zombie schroot
@@ -2946,25 +2752,6 @@ services:
     runfrom: denis
   # }}}
   # {{{ storage
-  -
-    name: ping alive check
-    remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
-    runfrom: ubc-bl8
-    hosts: giustini
-    check_interval: 5
-    max_check_attempts: 4
-    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"
-    runfrom: ubc-bl8
-    hosts: giustini
-  -
-    name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=11298 $HOSTADDRESS$ public"
-    runfrom: ubc-bl8
-    hosts: giustini
-  ###
   -
     name: process - multipathd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:15 -c 1: -u root -C multipathd -a '/sbin/multipathd'"
@@ -3028,9 +2815,8 @@ services:
   # {{{ misc
   -
     name: system - all services running
-    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-systemd-services"
     hostgroups: jessie, stretch
-    excludehostgroups: freebsd
   ###
   -
     name: process - slapd
@@ -3049,31 +2835,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
@@ -3101,6 +2866,11 @@ services:
     check: dsa_check_cert!5061
     check_interval: 60
     hosts: vogler
+  -
+    name: freeradius process
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u freerad -C freeradius -a '/usr/sbin/freeradius -xx'"
+    check_interval: 60
+    hosts: vogler
   ####
   -
     name: puppetmaster cert
@@ -3120,3 +2890,5 @@ services:
 # }}}
 
 # vim: set ts=2 sw=2 et ai si fdm=marker:
+
+