X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-nagios.git;a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f81e85f6297cbb3dd93ee69a19bf2d02bdae2837;hp=ec053f32845f7b0dc65e61a407525be5bae2309f;hb=f4d871985f00ca20fdc16004dd6f172717224bc5;hpb=b5cf530fbbcdd3738345a29b6fbd80ce6d42cc18

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ec053f3..f81e85f 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -20,145 +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
+    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: 143.106.167.113
-    parents: gw-ubcece
+    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
@@ -166,53 +161,53 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hassrvfs, pe1950
+    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, pe1950
+    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
@@ -220,51 +215,51 @@ servers:
   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, sw-raid
+    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, sw-raid
+    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, sw-raid
+    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:
@@ -343,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
@@ -397,7 +388,7 @@ 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
@@ -414,14 +405,6 @@ servers:
     address: 5.153.231.25
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, stretch, 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
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
@@ -434,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, pybuildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
@@ -457,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
@@ -478,7 +457,7 @@ servers:
   casulana:
     address: 5.153.231.41
     parents: gw-bytemark
-    hostgroups: computers, service, stretch, hassrvfs, dl380, manyprocesses, apache2-hosts
+    hostgroups: computers, service, buster, hassrvfs, dl380, manyprocesses, apache2-hosts, physical_x86_intel
     contacts: zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32, dsa-nsa
     contact_groups: ""
   # }}}
@@ -486,14 +465,14 @@ servers:
   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
@@ -524,20 +503,20 @@ servers:
   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
+    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
@@ -559,11 +538,11 @@ servers:
   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-csail
@@ -580,7 +559,7 @@ servers:
   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
@@ -593,18 +572,26 @@ servers:
     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:
@@ -614,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
@@ -634,7 +621,11 @@ servers:
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
-    hostgroups: computers, pybuildd, 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
@@ -642,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
@@ -660,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
@@ -678,23 +669,23 @@ servers:
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, 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, stretch, 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, stretch, 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, stretch, 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, stretch, dl180, nfs-client, autofs, hassrvfs, postgres96-hosts, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-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
@@ -703,108 +694,112 @@ servers:
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+    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
+    hostgroups: computers, service, stretch, dl180, physical_x86_intel
   lw10:
     address: 185.17.185.182
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180
+    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, 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, 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
+    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
+    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses, physical_x86_intel
   bendel:
     address: 82.195.75.100
-    parents: ganeti3
+    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
+    parents: ganeti-manda
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload, systemd-timesyncd
   vento:
     address: 82.195.75.98
-    parents: ganeti3
+    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
+    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, systemd-timesyncd
+    parents: ganeti-manda
+    hostgroups: computers, service, bind9-hosts, kvmdomains, buster, systemd-timesyncd
   handel:
     address: 82.195.75.104
-    parents: ganeti3
+    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, systemd-timesyncd
-  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
+    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
+    parents: ganeti-manda
     hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay, systemd-timesyncd
   denis:
     address: 82.195.75.91
-    parents: ganeti3
+    parents: ganeti-manda
     hostgroups: computers, service, kvmdomains, stretch, bind9-hosts, systemd-timesyncd
   vogler:
     address: 82.195.75.92
-    parents: ganeti3
+    parents: ganeti-manda
     hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   wolkenstein:
     address: 82.195.75.65
-    parents: ganeti3
+    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
+    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
@@ -817,12 +812,22 @@ servers:
   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
@@ -830,7 +835,7 @@ servers:
   loghost-osuosl-01:
     address: 140.211.166.202
     parents: pijper
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, systemd-timesyncd
 
   pieta:
     address: 140.211.166.195
@@ -845,7 +850,7 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, stretch, dl380, nfs-client, autofs, postgres96-hosts, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-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
@@ -860,17 +865,17 @@ servers:
   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
@@ -878,129 +883,184 @@ servers:
   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
+    parents: ganeti2-ubc
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
+  x86-ubc-02:
+    address: 209.87.16.22
+    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
+    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: ubc-gateway
+    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: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd, apache2-hosts, apache-https
   trabaci:
     address: 209.87.16.49
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+
+  ganeti3-ubc:
+    address: 209.87.16.50
+    parents: ubc-gateway
+    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:
@@ -1010,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
@@ -1032,17 +1092,17 @@ servers:
   ppc64el-unicamp-01:
     address: 143.106.167.121
     parents: prokofiev
-    hostgroups: computers, hassrvfs, buildd, stretch
+    hostgroups: computers, hassrvfs, buildd, buster
   plummer:
     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
@@ -1058,7 +1118,7 @@ servers:
   smit:
     address: 130.89.148.78
     parents: gw-utwente
-    hostgroups: computers, service, stretch, r540, manyprocesses, incomingmailrelayed2025
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel
   # }}}
   # {{{ gw-ynic
   henze:
@@ -1068,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 #############################
@@ -1150,6 +1210,10 @@ hostgroups:
     alias: Dell PowerEdge R540 hosts
     private: 1
 
+  physical_x86_intel:
+    alias: Physical machines with Intel CPUs
+    private: 1
+
   jessie:
     alias: Hosts running jessie
   stretch:
@@ -1647,7 +1711,7 @@ services:
   -
     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
@@ -1907,7 +1971,7 @@ services:
     name: process - stunnel4 - puppet-ekeyd is crazy
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
     hostgroups: computers
-    excludehosts: czerny, grnet-node01, storace
+    excludehosts: manda-node04, grnet-node01, storace
   # }}}
   # {{{ anti-services
   -
@@ -1971,6 +2035,13 @@ services:
     runfrom: handel
   # }}}
   # {{{ HW health/raid
+  -
+    name: Intel - CPU microcode
+    servicegroups: raid
+    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
@@ -2922,6 +2993,18 @@ services:
     hostgroups: computers
     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