rachmaninoff to buster

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5490939..f81e85f 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -20,149 +20,140 @@ servers:
     pingable: false
     check_command: dsa_check_always_ok
   gw-1und1-sec:
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
   gw-accumu:
     address: 130.239.18.97
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-accumu2:
     address: 130.242.6.198
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-aql:
     address: 141.170.2.19
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-bytemark:
     address: 89.16.160.116
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-c3sl:
     address: 200.17.202.254
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-cecsit:
     address: 150.203.164.1
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-arm:
     address: 213.104.121.213
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-brown:
     address: 138.16.160.1
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-conova:
     address: 217.196.149.238
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-csail:
     address: 128.31.0.1
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-dgi:
     address: 93.94.130.190
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-freenet:
     address: 62.104.23.249
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-gatech:
     address: 128.61.240.1
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-grnet:
     address: 194.177.211.193
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-isc:
     # really henet, because of something weird
     address: 72.52.94.70
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-karlsruhe:
-    address: 129.143.59.214
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-leaseweb:
     address: 185.17.185.190
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-manda:
     address: 82.195.78.118
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-marist:
     address: 148.100.88.1
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-osuosl:
     address: 140.211.166.1
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-sakura:
     address: 133.242.99.65
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-sanger:
-    address: 193.62.202.20
-    parents: gw-ubcece
+    address: 193.62.202.25
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
     contacts: tjrc1, dave
   gw-scanplus-lobos:
     address: 212.211.132.249
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-scanplus-villa:
     address: 212.211.132.1
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-sil:
     address: 86.59.118.145
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-skroutz1:
     address: 154.57.0.249
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-skroutz2:
     address: 154.57.0.250
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-ubcece:
-    address: 206.12.19.254
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
-    contacts: lfilipoz
   gw-umn:
     address: 128.101.240.222
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-unicamp:
-    address: 177.220.10.129
-    parents: gw-ubcece
+    address: 143.106.167.113
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-utwente:
     address: 130.89.149.1
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-ynic:
     # really janet, because ynic is stupid about firewalling
-    address: 146.97.71.46
-    parents: gw-ubcece
+    address: 144.32.255.227
+    parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-zivit:
-    parents: gw-ubcece
+    parents: ubc-gateway
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
   ubc-gateway:
     address: 209.87.16.254
-    parents: gw-ubcece
     hostgroups: layer3-infrastructure
   # }}}
   # {{{ servers
@@ -170,103 +161,105 @@ 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, physical_x86_intel
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula, pe1950, physical_x86_intel
   # }}}
   # {{{ gw-accumu
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, stretch, autofs, sw-raid
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, buster, autofs, sw-raid, physical_x86_intel
+    contacts: zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32, dsa-nsa
+    contact_groups: ""
   mirror-accumu:
     address: 130.242.6.199
     parents: gw-accumu2
-    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts
+    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, physical_x86_intel
   # }}}
   # {{{ gw-aql
   eller:
     address: 141.170.6.156
     parents: gw-aql
-    hostgroups: computers, porterbox, stretch, hassrvfs
+    hostgroups: computers, porterbox, buster, hassrvfs
   mips-aql-01:
     address: 141.170.6.149
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, nfs-client
+    hostgroups: computers, buildd, buster, nfs-client
   mips-aql-02:
     address: 141.170.6.150
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, nfs-client
+    hostgroups: computers, buildd, buster, nfs-client
   mips-aql-04:
     address: 141.170.6.154
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, nfs-client
+    hostgroups: computers, buildd, buster, nfs-client
   mips-aql-05:
     address: 141.170.6.155
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, nfs-client
+    hostgroups: computers, buildd, buster, nfs-client
   mips-aql-06:
     address: 141.170.6.157
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   minkus:
     address: 141.170.6.151
     parents: gw-aql
-    hostgroups: computers, porterbox, stretch, nfs-client
+    hostgroups: computers, porterbox, buster, nfs-client
   mipsel-aql-01:
     address: 141.170.6.152
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, hassrvfs, hasbootfs, sw-raid
+    hostgroups: computers, buildd, buster, hassrvfs, hasbootfs, sw-raid
   mipsel-aql-02:
     address: 141.170.6.153
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, hassrvfs, hasbootfs, sw-raid
+    hostgroups: computers, buildd, buster, hassrvfs, hasbootfs, sw-raid
   mipsel-aql-03:
     address: 141.170.6.158
     parents: gw-aql
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   # }}}
   # {{{ gw-arm
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, stretch, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, buster, broken_mq
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, buster, broken_mq
   arm-arm-01:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
+    hostgroups: computers, hassrvfs, buildd, buster, broken_mq, sw-raid
   arm-arm-03:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
+    hostgroups: computers, hassrvfs, buildd, buster, broken_mq, sw-raid
   arm-arm-04:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hassrvfs, buildd, stretch, broken_mq
+    hostgroups: computers, hassrvfs, buildd, buster, broken_mq, sw-raid
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, stretch, armhf, porterbox, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, buster, armhf, porterbox, broken_mq
   hartmann:
     address: 217.140.96.67
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, stretch, armhf, buildd, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, buster, armhf, buildd, broken_mq
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, buster, buildd, broken_mq
   # }}}
   # {{{ gw-brown
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-hosts, stretch, hassrvfs, postgres96-hosts, manyprocesses
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-hosts, stretch, hassrvfs, postgres96-hosts, manyprocesses, physical_x86_intel
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -345,21 +338,17 @@ servers:
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
     contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, nfs-client, autofs, systemd-timesyncd
     contacts: holger
-  binet:
-    address: 5.153.231.8
-    parents: gw-bytemark
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
@@ -379,7 +368,7 @@ servers:
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, 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
@@ -399,17 +388,11 @@ servers:
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, buster, hassrvfs, systemd-timesyncd
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
-  moszumanska:
-    address: 5.153.231.21
-    parents: ganeti-bytemark
-    contact_groups: alioth-admins
-    hostgroups: computers, general, wheezy, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain, no-bacula, bind9-hosts, xinetd-hosts, alioth, heavy-exim, spamd
-    no-servicegroups: true
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
@@ -421,15 +404,7 @@ servers:
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
-  olin:
-    address: 5.153.231.26
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
-  barriere:
-    address: 5.153.231.27
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, porterbox, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
@@ -442,10 +417,6 @@ servers:
     address: 5.153.231.30
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
-  x86-bm-01:
-    address: 5.153.231.32
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, no-bacula, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
@@ -457,19 +428,7 @@ servers:
   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, stretch, 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
+    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
@@ -477,7 +436,7 @@ servers:
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
@@ -498,20 +457,22 @@ servers:
   casulana:
     address: 5.153.231.41
     parents: gw-bytemark
-    hostgroups: computers, service, stretch, hassrvfs, dl380, manyprocesses
+    hostgroups: computers, service, buster, hassrvfs, dl380, manyprocesses, apache2-hosts, physical_x86_intel
+    contacts: zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32, dsa-nsa
+    contact_groups: ""
   # }}}
   # {{{ gw-c3sl
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-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, physical_x86_intel
     contacts: faw
   # }}}
   # {{{ gw-cecsit
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, dl360, hassrvfs, stretch, apache-https
+    hostgroups: computers, service, apache2-hosts, dl360, hassrvfs, stretch, apache-https, physical_x86_intel
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -529,61 +490,62 @@ servers:
   conova-node01:
     address: 217.196.149.227
     parents: gw-conova
-    hostgroups: computers, stretch, service, sw-raid
+    hostgroups: computers, stretch, service, sw-raid, drbd-hosts
   conova-node02:
     address: 217.196.149.228
     parents: gw-conova
-    hostgroups: computers, stretch, service, sw-raid
+    hostgroups: computers, stretch, service, sw-raid, drbd-hosts
   ganeti-conova:
     address: 217.196.149.235
     parents: gw-conova
     hostgroups: notacomputer
-  mirror-conova:
-    address: 217.196.149.229
-    parents: gw-conova
-    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, rsyncd-hosts, security_mirror
-    parents: mirror-conova
-  mirror-conova-archive:
-    address: 217.196.149.234
-    hostgroups: secondary-IPs, rsyncd-hosts
-    parents: mirror-conova
-  mirror-conova-syncproxy4-eu:
-    address: 217.196.149.237
-    hostgroups: secondary-IPs, rsyncd-hosts, https-service
-    parents: mirror-conova
 
   arm-conova-01:
     address: 217.196.149.230
     parents: ganeti-conova
-    hostgroups: computers, hassrvfs, buildd, stretch
+    hostgroups: computers, hassrvfs, buildd, buster
   arm-conova-02:
     address: 217.196.149.231
     parents: ganeti-conova
-    hostgroups: computers, hassrvfs, buildd, stretch
+    hostgroups: computers, hassrvfs, buildd, buster
   amdahl:
     address: 217.196.149.236
     parents: ganeti-conova
-    hostgroups: computers, hassrvfs, porterbox, stretch
+    hostgroups: computers, hassrvfs, porterbox, buster
+
+  schmelzer:
+    address: 185.69.161.161
+    parents: gw-conova
+    hostgroups: computers, service, stretch, r540, manyprocesses, apache2-hosts, apache-https, systemd-timesyncd, physical_x86_intel
+  schmelzer-debian:
+    address: 217.196.149.232
+    hostgroups: secondary-IPs
+    parents: schmelzer
+  schmelzer-security:
+    address: 217.196.149.233
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
+    parents: schmelzer
+  schmelzer-archive:
+    address: 217.196.149.234
+    hostgroups: secondary-IPs, rsyncd-hosts
+    parents: schmelzer
+  schmelzer-syncproxy4-eu:
+    address: 217.196.149.237
+    hostgroups: secondary-IPs, rsyncd-hosts, https-service
+    parents: schmelzer
   # }}}
   # {{{ gw-csail
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
-    hostgroups: computers, service, dl360, stretch, drbd-hosts
+    hostgroups: computers, service, dl360, stretch, drbd-hosts, physical_x86_intel
   csail-node02:
     address: 128.31.0.46
     parents: gw-csail
-    hostgroups: computers, service, dl360, stretch, drbd-hosts
+    hostgroups: computers, service, dl360, stretch, drbd-hosts, physical_x86_intel
   ganeti-csail:
     address: 128.31.0.49
-    parents: gw-bytemark
+    parents: gw-csail
     hostgroups: notacomputer
 
   mirror-csail:
@@ -593,11 +555,11 @@ servers:
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
@@ -605,23 +567,31 @@ servers:
   pkgmirror-csail:
     address: 128.31.0.51
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd, varnish-hosts
   usper:
     address: 128.31.0.69
     parents: ganeti-csail
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, uploadqueue, queued, systemd-timesyncd
+  barriere:
+    address: 128.31.0.66
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, porterbox, systemd-timesyncd
+  olin:
+    address: 128.31.0.65
+    parents: ganeti-csail
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
     address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, stretch, dl380, nfs-client, hassrvfs
+    hostgroups: computers, stretch, dl380, nfs-client, hassrvfs, physical_x86_intel
   # }}}
   # {{{ gw-gatech
   sechter:
     address: 128.61.240.73
     parents: gw-gatech
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror, physical_x86_intel
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -631,15 +601,15 @@ servers:
   grnet-node01:
     address: 194.177.211.195
     parents: gw-grnet
-    hostgroups: computers, service, dl380, stretch, drbd-hosts
+    hostgroups: computers, service, dl380, stretch, drbd-hosts, physical_x86_intel
   grnet-node02:
     address: 194.177.211.196
     parents: gw-grnet
-    hostgroups: computers, service, dl380, stretch, drbd-hosts
+    hostgroups: computers, service, dl380, stretch, drbd-hosts, physical_x86_intel
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, systemd-timesyncd
   geo3:
     address: 194.177.211.201
     parents: gw-grnet
@@ -651,7 +621,11 @@ servers:
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, pybuildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
+  x86-grnet-02:
+    address: 194.177.211.204
+    parents: ganeti-grnet
+    hostgroups: computers, pybuildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
   vittoria:
     address: 194.177.211.205
     parents: ganeti-grnet
@@ -659,7 +633,7 @@ servers:
   boott:
     address: 194.177.211.206
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, buster, systemd-timesyncd
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
@@ -677,7 +651,7 @@ servers:
   mirror-isc:
     address: 149.20.4.13
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch, physical_x86_intel
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
@@ -695,321 +669,398 @@ servers:
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
   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, stretch, dl180, nfs-client, autofs, hassrvfs, postgres96-hosts, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-hosts, physical_x86_intel
+  lw07-2:
+    address: 185.17.185.185
+    parents: lw07
+    hostgroups: secondary-IPs, https-service
+
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
-  # }}}
-  # {{{ gw-karlsruhe
-  zemlinsky:
-    address: 129.143.160.6
-    parents: gw-karlsruhe
-    hostgroups: computers, buildd, stretch
-    contacts: pkern
+    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, apache2-hosts, physical_x86_intel
+  lw09:
+    address: 185.17.185.181
+    parents: gw-leaseweb
+    hostgroups: computers, service, stretch, dl180, physical_x86_intel
+  lw10:
+    address: 185.17.185.182
+    parents: gw-leaseweb
+    hostgroups: computers, service, stretch, dl180, physical_x86_intel
   # }}}
   # {{{ gw-manda
   czerny:
     address: 82.195.75.109
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses
+    hostgroups: computers, service, dl380, acpid-hosts, buster, manyprocesses, physical_x86_intel
   clementi:
     address: 82.195.75.103
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses
+    hostgroups: computers, service, dl380, acpid-hosts, stretch, manyprocesses, physical_x86_intel
+  manda-node03:
+    address: 82.195.75.69
+    parents: gw-manda
+    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses, physical_x86_intel
+  manda-node04:
+    address: 82.195.75.70
+    parents: gw-manda
+    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses, physical_x86_intel
   bendel:
     address: 82.195.75.100
-    parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, stretch, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs
+    parents: ganeti-manda
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, stretch, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs, systemd-timesyncd
   master:
     address: 82.195.75.110
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload, systemd-timesyncd
   vento:
     address: 82.195.75.98
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, heavy-exim
-  lully:
-    address: 82.195.75.99
-    parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, stretch, hasvarlogfs
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd
   draghi:
     address: 82.195.75.106
-    parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, stretch
+    parents: ganeti-manda
+    hostgroups: computers, service, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, stretch, systemd-timesyncd
   geo1:
     address: 82.195.75.105
-    parents: ganeti3
-    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch
+    parents: ganeti-manda
+    hostgroups: computers, service, bind9-hosts, kvmdomains, buster, systemd-timesyncd
   handel:
     address: 82.195.75.104
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts, hassrvfs, systemd-timesyncd
   kaufmann:
     address: 82.195.75.107
-    parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, stretch, apache-https
-  ganeti3:
-    address: 82.195.75.111
+    parents: ganeti-manda
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, buster, apache-https, systemd-timesyncd, bind9-hosts
+  ganeti-manda:
+    address: 82.195.75.71
     parents: gw-manda
     hostgroups: notacomputer
   wilder:
     address: 82.195.75.112
-    parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-hosts
+    parents: ganeti-manda
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-hosts, systemd-timesyncd
   mailly:
     address: 82.195.75.114
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay, systemd-timesyncd
   denis:
     address: 82.195.75.91
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, stretch, bind9-hosts
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, stretch, bind9-hosts, systemd-timesyncd
   vogler:
     address: 82.195.75.92
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, stretch
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   wolkenstein:
     address: 82.195.75.65
-    parents: ganeti3
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, stretch, apache-https
+    parents: ganeti-manda
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, stretch, apache-https, systemd-timesyncd
   mips-manda-01:
     address: 82.195.75.66
     parents: gw-manda
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-manda
-    hostgroups: computers, buildd, stretch, hassrvfs, sw-raid, hasbootfs
+    hostgroups: computers, buildd, buster, hassrvfs, sw-raid, hasbootfs
+  snapshotdb-manda-01:
+    address: 82.195.75.73
+    parents: gw-manda
+    hostgroups: computers, hassrvfs, kvmdomains, buster, postgres96-hosts, systemd-timesyncd
   mipsel-manda-02:
     address: 82.195.75.74
     parents: gw-manda
-    hostgroups: computers, buildd, stretch, hassrvfs, sw-raid, hasbootfs
+    hostgroups: computers, buildd, buster, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-03:
     address: 82.195.75.67
     parents: gw-manda
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   seger:
     address: 82.195.75.93
-    parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, hassrvfs, rsyncd-hosts, kvmdomains, apache-https, postgres96-hosts, stretch
+    parents: ganeti-manda
+    hostgroups: computers, service, apache2-hosts, hassrvfs, rsyncd-hosts, kvmdomains, apache-https, postgres96-hosts, stretch, systemd-timesyncd
   suchon:
     address: 82.195.75.68
-    parents: ganeti3
+    parents: ganeti-manda
     hostgroups: computers, service, kvmdomains, stretch, uploadqueue, queued, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
     address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, buildd, hassrvfs, stretch, incomingmailrelayed
+    hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed
   # }}}
   # {{{ gw-osuosl
   byrd:
     address: 140.211.166.200
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, stretch
+    hostgroups: computers, service, dl380, stretch, physical_x86_intel
   beach:
     address: 140.211.166.201
     parents: byrd
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, apache-https
 
+  mipsel-osuosl-01:
+    address: 140.211.166.210
+    parents: gw-osuosl
+    hostgroups: computers, buildd, buster, hassrvfs
+
+  mipsel-osuosl-02:
+    address: 140.211.166.211
+    parents: gw-osuosl
+    hostgroups: computers, buildd, buster, hassrvfs
+
+  pijper:
+    address: 140.211.166.194
+    parents: gw-osuosl
+    hostgroups: computers, stretch, service, manyprocesses
+  loghost-osuosl-01:
+    address: 140.211.166.202
+    parents: pijper
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, systemd-timesyncd
+
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
     hostgroups: computers, stretch, service, manyprocesses
   ppc64el-osuosl-01:
     address: 140.211.166.196
-    parents: pieta
-    hostgroups: computers, hassrvfs, buildd, stretch
-  powerpc-osuosl-01:
-    address: 140.211.166.197
-    parents: pieta
-    hostgroups: computers, hassrvfs, buildd, jessie
-  partch:
-    address: 140.211.15.152
-    parents: gw-osuosl
-    hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
+    parents: pijper
+    hostgroups: computers, hassrvfs, buildd, buster
   # }}}
   # {{{ gw-sanger
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, stretch, dl380, nfs-client, autofs, postgres96-hosts
+    hostgroups: computers, service, stretch, dl380, nfs-client, autofs, postgres96-hosts, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-hosts, physical_x86_intel
+  sallinen-2:
+    address: 193.62.202.27
+    parents: sallinen
+    hostgroups: secondary-IPs, https-service
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    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
-    parents: gw-sanger
-    hostgroups: computers, sw-raid, sparc, wheezy, no-bacula
+    hostgroups: computers, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server, varnish-hosts
     contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, stretch, security_mirror, physical_x86_intel
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, stretch, security_mirror, physical_x86_intel
   # }}}
   # {{{ gw-sil
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
-    hostgroups: computers, buildd, stretch, sw-raid
+    hostgroups: computers, buildd, buster, sw-raid
   mips-sil-01:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   mipsel-sil-01:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, buildd, stretch, hassrvfs
+    hostgroups: computers, buildd, buster, hassrvfs
   # }}}
   # {{{ gw-skroutz
   mirror-skroutz:
     address: 154.57.0.251
     parents: gw-skroutz1, gw-skroutz2
-    hostgroups: computers, stretch, service, sw-raid, hassrvfs, apache2-hosts
+    hostgroups: computers, stretch, service, sw-raid, hassrvfs, apache2-hosts, physical_x86_intel
   # }}}
   # {{{ ubc-gateway
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
+  ganeti2-ubc:
+    address: 209.87.16.17
+    parents: ubc-gateway
+    hostgroups: notacomputer
 
   rachmaninoff:
     address: 209.87.16.20
-    parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
   x86-ubc-01:
     address: 209.87.16.21
-    parents: ubc-gateway
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
-  finzi:
+    parents: ganeti2-ubc
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
+  x86-ubc-02:
     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
+    parents: ganeti2-ubc
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
   elgar:
     address: 209.87.16.24
-    parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
   gombert:
     address: 209.87.16.25
-    parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, apache2-hosts, apache-https, systemd-timesyncd
   nono:
     address: 209.87.16.26
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs, systemd-timesyncd
   reger:
     address: 209.87.16.27
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd
   diabelli:
     address: 209.87.16.28
-    parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, broken_https_default_vhost, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, apache2-hosts, apache-https, broken_https_default_vhost, systemd-timesyncd
   menotti:
     address: 209.87.16.29
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   danzi:
     address: 209.87.16.30
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd
   geo2:
     address: 209.87.16.31
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, bind9-hosts, kvmdomains, stretch, systemd-timesyncd
   lotti:
     address: 209.87.16.32
-    parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, systemd-timesyncd
   muffat:
     address: 209.87.16.33
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay, systemd-timesyncd
   sonntag:
     address: 209.87.16.34
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   tchaikovsky:
     address: 209.87.16.35
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, stretch, systemd-timesyncd
   gretchaninov:
     address: 209.87.16.36
-    parents: ubc-gateway
-    hostgroups: computers, general, kvmdomains, stretch, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, general, kvmdomains, buster, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   tye:
     address: 209.87.16.37
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     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
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, postgres96-hosts, nfs-client, apache2-hosts, autofs, apache-https, systemd-timesyncd
   buxtehude:
     address: 209.87.16.39
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, heavy-exim, postgres96-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
   piu-slave-ubc-01:
     address: 209.87.16.42
-    parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   hier:
     address: 209.87.16.43
-    parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   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
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts, crazymanyprocesses
+  godard-pages:
+    address: 209.87.16.45
+    parents: godard
+    hostgroups: notacomputer
   debussy:
     address: 209.87.16.46
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost
+  grabbe:
+    address: 209.87.16.48
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd, apache2-hosts, apache-https
+  trabaci:
+    address: 209.87.16.49
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+
+  ganeti3-ubc:
+    address: 209.87.16.50
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
+    hostgroups: notacomputer
+  ubc-node-arm01:
+    address: 209.87.16.51
+    parents: ubc-gateway
+    hostgroups: computers, buster, service, sw-raid, drbd-hosts
+  ubc-node-arm02:
+    address: 209.87.16.52
+    parents: ubc-gateway
+    hostgroups: computers, buster, service, sw-raid, drbd-hosts
+  ubc-node-arm03:
+    address: 209.87.16.53
+    parents: ubc-gateway
+    hostgroups: computers, buster, service, sw-raid, drbd-hosts
+
+  arm-ubc-01:
+    address: 209.87.16.54
+    parents: ganeti3-ubc
+    hostgroups: computers, hassrvfs, buildd, buster, systemd-timesyncd
+  arm-ubc-02:
+    address: 209.87.16.55
+    parents: ganeti3-ubc
+    hostgroups: computers, hassrvfs, buildd, buster, systemd-timesyncd
+  arm-ubc-03:
+    address: 209.87.16.56
+    parents: ganeti3-ubc
+    hostgroups: computers, hassrvfs, buildd, buster, systemd-timesyncd
+  arm-ubc-04:
+    address: 209.87.16.57
+    parents: ganeti3-ubc
+    hostgroups: computers, hassrvfs, buildd, buster, systemd-timesyncd
+  arm-ubc-05:
+    address: 209.87.16.58
+    parents: ganeti3-ubc
+    hostgroups: computers, hassrvfs, buildd, buster, systemd-timesyncd
+  arm-ubc-06:
+    address: 209.87.16.59
+    parents: ganeti3-ubc
+    hostgroups: computers, hassrvfs, buildd, buster, systemd-timesyncd
+
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1019,7 +1070,7 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch, physical_x86_intel
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
@@ -1035,27 +1086,23 @@ servers:
   # }}}
   # {{{ gw-unicamp
   prokofiev:
-    address: 177.220.10.140
+    address: 143.106.167.124
     parents: gw-unicamp
     hostgroups: computers, stretch, service, manyprocesses
-  powerpc-unicamp-01:
-    address: 177.220.10.141
-    parents: prokofiev
-    hostgroups: computers, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
-    address: 177.220.10.142
+    address: 143.106.167.121
     parents: prokofiev
-    hostgroups: computers, hassrvfs, buildd, stretch
+    hostgroups: computers, hassrvfs, buildd, buster
   plummer:
-    address: 177.220.10.143
+    address: 143.106.167.122
     parents: prokofiev
-    hostgroups: computers, porterbox, hassrvfs, stretch
+    hostgroups: computers, porterbox, hassrvfs, buster
   # }}}
   # {{{ gw-utwente
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs, physical_x86_intel
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1068,6 +1115,10 @@ servers:
     address: 130.89.148.14
     parents: klecker
     hostgroups: secondary-IPs
+  smit:
+    address: 130.89.148.78
+    parents: gw-utwente
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel
   # }}}
   # {{{ gw-ynic
   henze:
@@ -1077,27 +1128,27 @@ servers:
   hasse:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, buster, buildd
   antheil:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, buster, buildd
   # }}}
   # {{{ gw-zivit
   zandonai:
     address: 80.245.147.46
     parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, stretch
+    hostgroups: computers, buildd, hassrvfs, buster
   zelenka:
     address: 80.245.147.40
     parents: gw-zivit
-    hostgroups: computers, porterbox, hassrvfs, stretch
+    hostgroups: computers, porterbox, hassrvfs, buster
   # }}}
   # {{{ gw-sakura
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, security_mirror
+    hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, security_mirror, physical_x86_intel
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1105,26 +1156,14 @@ hostgroups:
   computers:
     alias: computers
     private: 1
-    extinfo-icon_image: base/debian.png
-    extinfo-icon_image_alt: Debian GNU/Linux
-    extinfo-notes_url: https://db.debian.org/machines.cgi?host=%s
   layer3-infrastructure:
     alias: Layer 3 Devices
-    extinfo-icon_image: base/switch40.png
-    extinfo-icon_image_alt: router
   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
-  sparc:
-    alias: sparc
-    private: 1
 
   porterbox:
     alias: developer accessible porter machines
@@ -1132,6 +1171,8 @@ hostgroups:
     alias: machines running services
   buildd:
     alias: buildd systems
+  pybuildd:
+    alias: buildd systems running pybuildd
   general:
     alias: general purpose developer accessible machines
 
@@ -1162,13 +1203,23 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
+  pe1950:
+    alias: Dell PowerEdge 1950 hosts
+    private: 1
+  r540:
+    alias: Dell PowerEdge R540 hosts
+    private: 1
+
+  physical_x86_intel:
+    alias: Physical machines with Intel CPUs
+    private: 1
 
-  wheezy:
-    alias: Hosts running wheezy
   jessie:
     alias: Hosts running jessie
   stretch:
     alias: Hosts running stretch
+  buster:
+    alias: Hosts running buster
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -1208,12 +1259,6 @@ hostgroups:
   xinetd-hosts:
     alias: hosts providing services via xinetd
     private: 1
-  postgres91-hosts:
-    alias: hosts running postgres91
-    private: 1
-  postgres94-hosts:
-    alias: hosts running postgres94
-    private: 1
   postgres96-hosts:
     alias: hosts running postgres96
     private: 1
@@ -1243,6 +1288,17 @@ hostgroups:
     private: 1
   manyprocesses:
     alias: hosts with lots and lots of (kernel) processes
+  crazymanyprocesses:
+    alias: hosts with stupidly lots of processes
+  varnish-hosts:
+    alias: hosts running varnish
+    private: 1
+  haproxy-hosts:
+    alias: hosts running haproxy
+    private: 1
+  haproxy-https-host:
+    alias: "host providing https on the standard port via haproxy"
+    private: 1
 
   no-bacula:
     alias: hosts which are not being backed up with bacula
@@ -1294,9 +1350,6 @@ hostgroups:
   high-RTT:
     alias: machines with high round trip times
     private: 1
-  alioth:
-    alias: machines that just are just awkward
-    private: 1
   #openstack-compute:
   #  alias: nodes that run OpenStack compute
   #  private: 1
@@ -1363,6 +1416,11 @@ services:
     check_interval: 5
     max_check_attempts: 4
     retry_interval: 1
+  -
+    name: network - v6 gw
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-ipv6-default-gw"
+    hostgroups: computers
+    check_interval: 60
   # }}}
   # {{{ ### disk usage
   -
@@ -1420,42 +1478,42 @@ services:
   -
     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"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /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"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /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-2017-2"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /srv/farm-snapshot/farm-2017-2"
     hosts: sibelius
   -
     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-2017-3"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /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"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /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"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /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"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /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"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /srv/farm-snapshot/farm-2017-7"
     hosts: sibelius
   -
     name: disk usage on /srv/ftp-master.debian.org
@@ -1465,37 +1523,79 @@ services:
   -
     name: disk usage on /storage/snapshot-farm-1
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 98 92 /storage/snapshot-farm-1"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-1"
     hosts: lw01
   -
     name: disk usage on /storage/snapshot-farm-2
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 98 92 /storage/snapshot-farm-2"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-2"
     hosts: lw02
   -
     name: disk usage on /storage/snapshot-farm-3
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 98 92 /storage/snapshot-farm-3"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-3"
     hosts: lw03
   -
     name: disk usage on /storage/snapshot-farm-4
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 98 92 /storage/snapshot-farm-4"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-4"
     hosts: lw04
+  -
+    name: disk usage on /storage/snapshot-farm-90
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-09"
+    hosts: lw09
+  -
+    name: disk usage on /storage/snapshot-farm-10
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-10"
+    hosts: lw10
+
+  -
+    name: disk usage on nfs farm 1
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /auto.dsa/snapshot-1"
+    hosts: lw07
+  -
+    name: disk usage on nfs farm 2
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /auto.dsa/snapshot-2"
+    hosts: lw07
+  -
+    name: disk usage on nfs farm 3
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /auto.dsa/snapshot-3"
+    hosts: lw07
+  -
+    name: disk usage on nfs farm 4
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /auto.dsa/snapshot-4"
+    hosts: lw07
+  -
+    name: disk usage on nfs farm 09
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /auto.dsa/snapshot-09"
+    hosts: lw07
+  -
+    name: disk usage on nfs farm 10
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /auto.dsa/snapshot-10"
+    hosts: lw07
+
   -
     name: disk usage on /srv/morgue.debian.org/
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/morgue.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
     hosts: lw03
   -
     name: disk usage on /srv/QNAP-big/
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-big"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/QNAP-big"
     hosts: storace
   -
     name: disk usage on /srv/QNAP-tiny
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-tiny"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/QNAP-tiny"
     hosts: storace
   # }}}
   # {{{ ### system
@@ -1505,7 +1605,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
     check_interval: 60
-    excludehostgroups: alioth
   -
     name: setup - local hostname etc-hosts
     nrpe: 'if getent ahosts `hostname` | grep -q 127.0; then echo "Warning: local hostname resolves to 127/8 address"; exit 1; else echo "OK: Hostname resolves to non-127/8 address."; exit 0; fi'
@@ -1535,19 +1634,15 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehostgroups: manyprocesses
+    excludehostgroups: manyprocesses, crazymanyprocesses
   -
     name: processes - total
     hostgroups: manyprocesses
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
   -
-    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: processes - total
+    hostgroups: crazymanyprocesses
+    nrpe: "/usr/lib/nagios/plugins/check_procs 15000 25000"
   -
     name: free memory - mb
     nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m mb"
@@ -1556,17 +1651,10 @@ services:
     name: free memory - percent
     nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m pct"
     hostgroups: computers
-  -
-    name: process - getty
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
-    hostgroups: computers
-    excludehosts: zelenka, zandonai
-    excludehostgroups: jessie, stretch
   -
     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
+    hostgroups: computers
 
   -
     name: processes - zombies
@@ -1577,7 +1665,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"
@@ -1609,7 +1696,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula $HOSTNAME$.debian.org"
     runfrom: dinis
     hostgroups: computers
-    excludehostgroups: buildd, porterbox, no-bacula
+    excludehostgroups: buildd, pybuildd, porterbox, no-bacula
     check_interval:  60
     retry_interval: 15
   -
@@ -1618,25 +1705,19 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula -w 1080 -c 1560 $HOSTNAME$.debian.org F"
     runfrom: dinis
     hostgroups: computers
-    excludehostgroups: buildd, porterbox, no-bacula
+    excludehostgroups: buildd, pybuildd, porterbox, no-bacula
     check_interval:  60
     retry_interval: 15
   -
     name: process - bacula-dir
     servicegroups: backup
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-dir -a '/usr/sbin/bacula-dir -f -c /etc/bacula/bacula-dir.conf'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-dir -a '/usr/sbin/bacula-dir -fP -c /etc/bacula/bacula-dir.conf'"
     hosts: dinis
   -
     name: process - bacula-fd
     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
 
   -
     name: network backup status - draghi
@@ -1673,9 +1754,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
@@ -1683,26 +1763,14 @@ 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
   -
     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: computers
   ####
   -
     name: process - samhain
@@ -1726,39 +1794,26 @@ services:
     excludehostgroups: brokensamhain
   # }}}
   # {{{ logging
-  -
-    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
   -
     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
+    hostgroups: computers
 
   -
     name: remote logging on lotti
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: lotti
     hostgroups: computers
-    excludehostgroups: alioth
   -
-    name: remote logging on lully
+    name: remote logging on loghost-grnet-01
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-    runfrom: lully
+    runfrom: loghost-grnet-01
     hostgroups: computers
-    excludehostgroups: alioth
   -
-    name: remote logging on loghost-grnet-01
+    name: remote logging on loghost-osuosl-01
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-    runfrom: loghost-grnet-01
+    runfrom: loghost-osuosl-01
     hostgroups: computers
-    excludehostgroups: alioth
   # }}}
   # {{{ base service
   -
@@ -1783,13 +1838,13 @@ services:
     name: process - nrpe
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -d'"
     hostgroups: computers
-    excludehostgroups: stretch
+    excludehostgroups: stretch, buster
     max_check_attempts: -1
     depends: network service - nrpe
   -
     name: process - nrpe
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -f'"
-    hostgroups: stretch
+    hostgroups: stretch, buster
     max_check_attempts: -1
     depends: network service - nrpe
   ###
@@ -1797,11 +1852,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
@@ -1825,7 +1875,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
     servicegroups: time
   -
     name: system time synced
@@ -1842,8 +1892,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'"
     hostgroups: computers
-    excludehostgroups: freebsd
-    excludehosts: harris, smetana
+    excludehosts: harris
   ###
   -
     name: process - cron
@@ -1854,17 +1903,6 @@ 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
-  ###
-  -
-    name: process - monit
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
-    hostgroups: computers
-    excludehostgroups: alioth, jessie, stretch
   ###
   -
     name: MQ connection on rainier
@@ -1874,7 +1912,7 @@ services:
     hostgroups: computers
     check_interval:  60
     retry_interval: 15
-    excludehostgroups: alioth, broken_mq
+    excludehostgroups: broken_mq
   -
     name: MQ connection on rapoport
     servicegroups: MQ
@@ -1883,7 +1921,7 @@ services:
     hostgroups: computers
     check_interval:  60
     retry_interval: 15
-    excludehostgroups: alioth, broken_mq
+    excludehostgroups: broken_mq
   ###
   -
     name: local resolver
@@ -1894,33 +1932,21 @@ services:
     name: process - unbound
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
     hostgroups: computers
-    excludehostgroups: alioth
-  ###
   -
-    name: process - uptimed
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
+    name: unbound trust anchors
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-unbound-anchors"
     hostgroups: computers
+    check_interval: 60
   ###
   -
-    name: process - udevd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C udevd -a 'udevd'"
+    name: process - uptimed
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
     hostgroups: computers
-    excludehostgroups: freebsd, jessie, stretch
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C systemd-udevd -a '/lib/systemd/systemd-udevd'"
-    hostgroups: jessie, stretch
-    excludehostgroups: freebsd
-  -
-    name: unexpected process - udev
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
-    hostgroups: freebsd
+    hostgroups: computers
   ###
-  -
-    name: process - acpid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid'"
-    hostgroups: acpid-hosts
-    excludehostgroups: jessie, stretch
   -
     name: unexpected process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
@@ -1940,20 +1966,12 @@ 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
+    hostgroups: computers
   -
     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
-  ###
-  -
-    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
+    excludehosts: manda-node04, grnet-node01, storace
   # }}}
   # {{{ anti-services
   -
@@ -1977,7 +1995,7 @@ services:
   -
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
-    hostgroups: stretch
+    hostgroups: stretch, buster
     excludehosts: storace
   -
     name: unwanted process - inetd
@@ -2002,15 +2020,14 @@ services:
     name: "host SSL cert - debian client"
     nrpe: "if [ -e /etc/ssl/debian/certs/thishost.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost.crt; else echo 'No thishost.crt on this host.'; fi"
     hostgroups: computers
+  -
+    name: "host SSL cert - CA"
+    nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /srv/puppet.debian.org/ca/ca.crt"
+    hosts: handel
   -
     name: "sso CRL"
     nrpe: "if [ -e /var/lib/dsa/sso/ca.crl ]; then /usr/lib/nagios/plugins/dsa-check-crl-expire -w 129600 -c 86400 /var/lib/dsa/sso/ca.crl; else echo 'No sso/ca.crl on this host.'; fi"
     hostgroups: computers
-  -
-    name: SSL certs - puppet
-    hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /etc/puppet/modules/ssl/files/servicecerts"
-    runfrom: handel
   -
     name: SSL certs - LE
     hosts: global
@@ -2019,17 +2036,17 @@ services:
   # }}}
   # {{{ HW health/raid
   -
-    name: process - mdadm monitor
+    name: Intel - CPU microcode
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
-    hostgroups: sw-raid
-    excludehostgroups: jessie, stretch
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-ucode-intel"
+    check_interval: 120
+    hostgroups: physical_x86_intel
+  ###
   -
     name: process - mdadm monitor
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --scan'"
     hostgroups: sw-raid
-    excludehostgroups: wheezy
   -
     name: RAID - sw raid
     servicegroups: raid
@@ -2104,6 +2121,15 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
+  -
+    name: HW - OpenManage status
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage"
+    hostgroups: pe1950, r540
+    excludehosts: wieck, schumann
+  -
+    name: HW - OpenManage status
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0 -b bat_charge=0:0"
+    hosts: wieck, schumann
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2132,6 +2158,15 @@ services:
     name: mail queue
     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
     hostgroups: heavy-exim
+  -
+    name: process - fail2ban
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -C fail2ban-server"
+    hostgroups: heavy-exim, heavy-postfix
+  -
+    name: unwanted process - fail2ban
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C fail2ban-server"
+    hostgroups: computers
+    excludehostgroups: heavy-exim, heavy-postfix
   # }}}
   # {{{ clamav
   -
@@ -2143,16 +2178,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_clamd -H /var/run/clamav/clamd.ctl"
     hostgroups: heavy-exim, heavy-postfix
     depends: process - clamav - clamd
-  -
-    name: process - clamav - freshclam
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
-    hostgroups: heavy-exim, heavy-postfix
-    excludehostgroups: jessie, stretch
   -
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --foreground=true'"
     hostgroups: heavy-exim, heavy-postfix
-    excludehostgroups: wheezy
   -
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
@@ -2165,18 +2194,11 @@ services:
     excludehostgroups: heavy-exim, heavy-postfix
   # }}}
   # {{{ anti-spam
-  -
-    name: process - spamd - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hostgroups: spamd
-    excludehosts: picconi
-    excludehostgroups: jessie, 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/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/spamd.pid --create-prefs --max-children 20 --min-spare=5 --helper-home-dir'"
@@ -2205,16 +2227,10 @@ services:
     hostgroups: computers
 
   ###
-  -
-    name: process - postgrey
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
-    hostgroups: heavy-exim
-    excludehostgroups: jessie, stretch
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a 'postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
     hostgroups: heavy-exim
-    excludehostgroups: wheezy
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a 'postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
@@ -2245,23 +2261,23 @@ services:
   -
     name: process - weightd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (master)'"
-    hostgroups: heavy-postfix, alioth
+    hostgroups: heavy-postfix
   -
     name: process - weightd - cache
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (cache)'"
-    hostgroups: heavy-postfix, alioth
+    hostgroups: heavy-postfix
     depends: process - weightd - master
   -
     name: process - weightd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u polw -a 'policyd-weight (child)'"
-    hostgroups: heavy-postfix, alioth
+    hostgroups: heavy-postfix
     depends: process - weightd - master
   ###
   -
     name: unwanted process - policyd-weight
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight"
     hostgroups: computers
-    excludehostgroups: heavy-postfix, alioth
+    excludehostgroups: heavy-postfix
   # }}}
   # {{{ postfix
   ###
@@ -2368,7 +2384,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
@@ -2413,15 +2429,52 @@ services:
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hostgroups: apache-https, https-service
+    hostgroups: apache-https, https-service, haproxy-https-host
     depends: network service - https
     check_interval: 60
   -
     name: unwanted network service - https
     check: dsa_check_port_closed!443
     hostgroups: apache2-hosts
-    excludehostgroups: apache-https
+    excludehostgroups: apache-https, haproxy-https-host
     check_interval: 60
+
+ ###
+  -
+    name: process - haproxy - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -a '/usr/sbin/haproxy-systemd-wrapper'"
+    hostgroups: haproxy-hosts
+  -
+    name: process - haproxy - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1:15 -u haproxy -a '/usr/sbin/haproxy '"
+    hostgroups: haproxy-hosts
+    depends: process - haproxy - master
+  -
+    name: network service - https
+    check: check_https
+    hostgroups: haproxy-https-host
+    depends: "process - haproxy - master"
+    check_interval: 120
+
+  -
+    name: unwanted process - haproxy
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C haproxy"
+    hostgroups: computers
+    excludehostgroups: haproxy-hosts
+
+ ###
+  -
+    name: process - varnish
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1:15 -u vcache -a '/usr/sbin/varnishd -j unix,user=vcache -F -a '"
+    hostgroups: varnish-hosts
+    excludehostgroups: jessie
+  -
+    name: unwanted process - varnish
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C varnishd"
+    hostgroups: computers
+    excludehostgroups: varnish-hosts
+
+
   # }}}
   # {{{ FTP
   -
@@ -2434,19 +2487,11 @@ services:
     name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres91-hosts, postgres94-hosts, postgres96-hosts
+    excludehostgroups: postgres96-hosts
   -
     name: unwanted process - postgresql 9.0
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
     hostgroups: computers
-  -
-    name: process - postgresql91 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
-    hostgroups: postgres91-hosts
-  -
-    name: process - postgresql94 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.4/bin/postgres'"
-    hostgroups: postgres94-hosts
   -
     name: process - postgresql96 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.6/bin/postgres'"
@@ -2460,36 +2505,30 @@ services:
   -
     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
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
+    hostgroups: buildd
     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
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C python3 -a 'buildd.py'"
+    hostgroups: pybuildd
     contact_groups: buildd
   -
     name: processes - zombie schroot
     nrpe: "(/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0 > /dev/null || /usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0) && /usr/lib/nagios/plugins/check_procs -a schroot -s ZNs -c 0"
-    hostgroups: buildd
+    hostgroups: buildd, pybuildd
     contact_groups: +buildd
     check_interval: 5
     max_check_attempts: 24
     retry_interval: 5
-  -
-    name: processes - lvcreate
-    nrpe: "/usr/lib/nagios/plugins/check_procs -m 'ELAPSED' -c 500 -C lvcreate -u root -a 'lvcreate'"
-    hostgroups: buildd
-    contact_groups: +buildd
   # }}}
   # {{{ NFS Stuff
   -
     name: process - statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"
     hostgroups: nfs-client, nfs-server
-    excludehostgroups: stretch
+    excludehostgroups: stretch, buster
   -
     name: process - nfsd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C nfsd -a '[nfsd]'"
@@ -2735,6 +2774,16 @@ services:
     check: "dsa_check_staticsync!miniconf10.debconf.org"
     hosts: global
     servicegroups: mirror
+  -
+    name: mirror static sync - wiki
+    check: "dsa_check_staticsync!wiki.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - www
+    check: "dsa_check_staticsync!www.debconf.org"
+    hosts: global
+    servicegroups: mirror
   # }}}
   # {{{ DNS
   -
@@ -2768,10 +2817,6 @@ services:
     name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
     check: "dsa_check_soas_add!denis.debian.org!144-28.118.59.86.in-addr.arpa"
     hosts: global
-  -
-    name: DNS SOA sync - alioth.debian.org
-    check: "dsa_check_soas_add!denis.debian.org!alioth.debian.org"
-    hosts: global
   -
     name: DNS SOA sync - debconf.net
     check: "dsa_check_soas_add!denis.debian.org!debconf.net"
@@ -2878,9 +2923,8 @@ services:
   # {{{ misc
   -
     name: system - all services running
-    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
-    hostgroups: jessie, stretch
-    excludehostgroups: freebsd
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-systemd-services"
+    hostgroups: computers
   ###
   -
     name: process - slapd
@@ -2930,6 +2974,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
@@ -2942,9 +2991,51 @@ services:
     name: puppet - agent check
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/puppet-agent"
     hostgroups: computers
-    excludehosts: moszumanska
     check_interval:  60
     retry_interval: 15
+
+  -
+    name: puppet - catalog run
+    remotecheck: "/usr/lib/nagios/plugins/check_puppetdb_nodes -a 4 --node $HOSTNAME$.debian.org -w 720 -c 1440"
+    hostgroups: computers
+    runfrom: handel
+
+  -
+    name: puppet - all catalog runs
+    nrpe: "/usr/lib/nagios/plugins/check_puppetdb_nodes -a 4 -w 720 -c 1440"
+    hosts: handel
+
+  ####
+  -
+    name: ping peer on mgmt network
+    nrpe: "/usr/lib/nagios/plugins/check_ping -H 172.29.184.12 -w 50,10% -c 200,30%"
+    hosts: conova-node01
+    check_interval: 5
+    max_check_attempts: 4
+    retry_interval: 1
+  -
+    name: ping peer on mgmt network
+    nrpe: "/usr/lib/nagios/plugins/check_ping -H 172.29.184.11 -w 50,10% -c 200,30%"
+    hosts: conova-node02
+    check_interval: 5
+    max_check_attempts: 4
+    retry_interval: 1
+
+  -
+    name: ping peer on mgmt network
+    nrpe: "/usr/lib/nagios/plugins/check_ping -H 172.29.182.14 -w 50,10% -c 200,30%"
+    hosts: manda-node03
+    check_interval: 5
+    max_check_attempts: 4
+    retry_interval: 1
+  -
+    name: ping peer on mgmt network
+    nrpe: "/usr/lib/nagios/plugins/check_ping -H 172.29.182.13 -w 50,10% -c 200,30%"
+    hosts: manda-node04
+    check_interval: 5
+    max_check_attempts: 4
+    retry_interval: 1
+  # }}}
   # }}}
 # }}}