X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=78d7ec4a6c17563d15a79faa70e771e87fb9639c;hb=6d983466e56e6dab6777938982bfcf8986fca9d2;hp=69adfc5f0756fae62304c9d6ed517c3c81a49b17;hpb=957911d767d5a3223ae69514e73303cec0b20b04;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 69adfc5..c148ce6 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -106,7 +106,7 @@ servers:
     parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-sanger:
-    address: 193.62.202.20
+    address: 193.62.202.25
     parents: ubc-gateway
     hostgroups: layer3-infrastructure
     contacts: tjrc1, dave
@@ -161,7 +161,7 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hassrvfs, pe1950, physical_x86_intel
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, buster, security_mirror, hassrvfs, pe1950, physical_x86_intel
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
@@ -171,7 +171,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, stretch, autofs, sw-raid, physical_x86_intel
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, buster, autofs, sw-raid, physical_x86_intel
     contacts: zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32, dsa-nsa
     contact_groups: ""
   mirror-accumu:
@@ -183,31 +183,31 @@ servers:
   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
@@ -215,17 +215,17 @@ 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
@@ -233,11 +233,11 @@ servers:
   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
@@ -245,7 +245,7 @@ servers:
   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
@@ -253,7 +253,7 @@ servers:
   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:
@@ -335,24 +335,11 @@ servers:
     address: 5.153.231.4
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd
-  adayevskaya:
-    address: 5.153.231.5
-    parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, 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
-    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
@@ -368,55 +355,11 @@ servers:
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, systemd-timesyncd
-  philp:
-    address: 5.153.231.13
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd, broken_https_default_vhost
-  rainier:
-    address: 5.153.231.16
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
-  rapoport:
-    address: 5.153.231.15
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
-  delfin:
-    address: 5.153.231.17
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
-  wuiet:
-    address: 5.153.231.18
-    parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
-  dinis:
-    address: 5.153.231.19
-    parents: ganeti-bytemark
-    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
+    hostgroups: computers, hassrvfs, kvmdomains, buster, systemd-timesyncd
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, hassrvfs, systemd-timesyncd
-  ticharich:
-    address: 5.153.231.23
-    parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
-  petrova:
-    address: 5.153.231.25
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, 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
@@ -424,56 +367,20 @@ servers:
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
-  paradis:
-    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
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, nfs-client, autofs, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
-  gideon:
-    address: 5.153.231.34
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
-  lindsay:
-    address: 5.153.231.36
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, autofs, nfs-client, systemd-timesyncd
-  jerea:
-    address: 5.153.231.39
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
-  mekeel:
-    address: 5.153.231.40
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
-  pinel:
-    address: 5.153.231.42
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd
-  rusca:
-    address: 5.153.231.43
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
-  manziarly:
-    address: 5.153.231.44
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
 
   casulana:
     address: 5.153.231.41
     parents: gw-bytemark
-    hostgroups: computers, service, stretch, hassrvfs, dl380, manyprocesses, apache2-hosts, physical_x86_intel
+    hostgroups: computers, service, buster, hassrvfs, dl380, manyprocesses, apache2-hosts, physical_x86_intel
     contacts: zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32, dsa-nsa
     contact_groups: ""
   # }}}
@@ -519,15 +426,15 @@ 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
@@ -575,7 +482,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
@@ -588,12 +495,20 @@ 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, physical_x86_intel
+    hostgroups: computers, buster, dl380, nfs-client, hassrvfs, physical_x86_intel
   # }}}
   # {{{ gw-gatech
   sechter:
@@ -617,7 +532,7 @@ servers:
   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
@@ -629,7 +544,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
@@ -637,7 +556,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
@@ -673,23 +592,23 @@ servers:
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-server, physical_x86_intel
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-server, physical_x86_intel
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-server, physical_x86_intel
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-server, 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, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-hosts, physical_x86_intel
   lw07-2:
     address: 185.17.185.185
     parents: lw07
@@ -712,7 +631,7 @@ servers:
   czerny:
     address: 82.195.75.109
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, stretch, manyprocesses, physical_x86_intel
+    hostgroups: computers, service, dl380, acpid-hosts, buster, manyprocesses, physical_x86_intel
   clementi:
     address: 82.195.75.103
     parents: gw-manda
@@ -748,11 +667,11 @@ servers:
   handel:
     address: 82.195.75.104
     parents: ganeti-manda
-    hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, apache2-hosts, buster, postgres11-hosts, hassrvfs, systemd-timesyncd
   kaufmann:
     address: 82.195.75.107
     parents: ganeti-manda
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, stretch, apache-https, systemd-timesyncd
+    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
@@ -780,11 +699,11 @@ servers:
   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
@@ -792,11 +711,11 @@ servers:
   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: ganeti-manda
@@ -804,13 +723,41 @@ servers:
   suchon:
     address: 82.195.75.68
     parents: ganeti-manda
-    hostgroups: computers, service, kvmdomains, stretch, uploadqueue, queued, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, hassrvfs, stretch, uploadqueue, queued, systemd-timesyncd
+  adayevskaya:
+    address: 82.195.75.75
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
+  postgresql-manda-01:
+    address: 82.195.75.76
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, hassrvfs, buster, systemd-timesyncd, postgres11-hosts
+  dinis:
+    address: 82.195.75.77
+    parents: ganeti-manda
+    hostgroups: computers, general, kvmdomains, buster, hassrvfs, systemd-timesyncd
+  gideon:
+    address: 82.195.75.78
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+  rainier:
+    address: 82.195.75.94
+    parents: ganeti-manda
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
+  rapoport:
+    address: 82.195.75.95
+    parents: ganeti-manda
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
+  petrova:
+    address: 82.195.75.96
+    parents: ganeti-manda
+    hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
     address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed
+    hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed587
   # }}}
   # {{{ gw-osuosl
   byrd:
@@ -820,7 +767,17 @@ servers:
   beach:
     address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, buster, 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
@@ -829,12 +786,12 @@ 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
     parents: gw-osuosl
-    hostgroups: computers, stretch, service, manyprocesses
+    hostgroups: computers, buster, service, manyprocesses
   ppc64el-osuosl-01:
     address: 140.211.166.196
     parents: pijper
@@ -852,7 +809,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server, varnish-hosts
+    hostgroups: computers, service, apache2-hosts, sw-raid, buster, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server
     contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
@@ -869,7 +826,7 @@ servers:
   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
@@ -877,7 +834,7 @@ 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:
@@ -902,91 +859,103 @@ servers:
     address: 209.87.16.10
     parents: ubc-gateway
     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
+  manziarly:
+    address: 209.87.16.23
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd, hassrvfs
   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
-    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, 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
-    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, stretch, 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
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, heavy-exim, postgres96-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, heavy-exim, postgres11-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
@@ -994,16 +963,69 @@ servers:
     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
+  static-master-ubc-01:
+    address: 209.87.16.47
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd, hassrvfs
   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
+  wuiet:
+    address: 209.87.16.60
+    parents: ganeti2-ubc
+    hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
+  philp:
+    address: 209.87.16.61
+    parents: ganeti2-ubc
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd, broken_https_default_vhost
+  lindsay:
+    address: 209.87.16.62
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd
+  pinel:
+    address: 209.87.16.63
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd
+  ticharich:
+    address: 209.87.16.64
+    parents: ganeti2-ubc
+    hostgroups: computers, general, kvmdomains, buster, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
+  donizetti:
+    address: 209.87.16.65
+    parents: ganeti2-ubc
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
+  jerea:
+    address: 209.87.16.66
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+  paradis:
+    address: 209.87.16.67
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+  paradis2:
+    address: 209.87.16.68
+    parents: paradis
+    hostgroups: secondary-IPs
+  mekeel:
+    address: 209.87.16.69
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, nfs-client, autofs, systemd-timesyncd
+  pejacevic:
+    address: 209.87.16.70
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
+    contacts: holger
+  delfin:
+    address: 209.87.16.71
+    parents: ganeti2-ubc
+    hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1012,15 +1034,15 @@ servers:
   ubc-node-arm01:
     address: 209.87.16.51
     parents: ubc-gateway
-    hostgroups: computers, stretch, service, sw-raid, drbd-hosts
+    hostgroups: computers, buster, service, sw-raid, drbd-hosts
   ubc-node-arm02:
     address: 209.87.16.52
     parents: ubc-gateway
-    hostgroups: computers, stretch, service, sw-raid, drbd-hosts
+    hostgroups: computers, buster, service, sw-raid, drbd-hosts
   ubc-node-arm03:
     address: 209.87.16.53
     parents: ubc-gateway
-    hostgroups: computers, stretch, service, sw-raid, drbd-hosts
+    hostgroups: computers, buster, service, sw-raid, drbd-hosts
 
   arm-ubc-01:
     address: 209.87.16.54
@@ -1038,6 +1060,14 @@ servers:
     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
@@ -1070,57 +1100,61 @@ 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, physical_x86_intel
+    hostgroups: computers, service, dl380, stretch, incomingmailrelayed2025, hassrvfs, physical_x86_intel
   klecker-ftp:
     address: 130.89.148.12
-    parents: klecker
+    parents: new-klecker
     hostgroups: secondary-IPs
   klecker-archive:
     address: 130.89.148.13
-    parents: klecker
-    hostgroups: secondary-IPs
-  klecker-static:
-    address: 130.89.148.14
-    parents: klecker
+    parents: new-klecker
     hostgroups: secondary-IPs
+  new-klecker:
+    address: 130.89.148.77
+    parents: gw-utwente
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, hassrvfs, apache2-hosts, apache-https
   smit:
     address: 130.89.148.78
     parents: gw-utwente
-    hostgroups: computers, service, stretch, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, apache2-hosts, apache-https, hassrvfs, rsyncd-hosts
+  mikrotik-utwente:
+    address: 130.89.148.79
+    parents: gw-utwente
+    hostgroups: notacomputer
   # }}}
   # {{{ gw-ynic
   henze:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, buster, buildd
   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:
@@ -1192,8 +1226,6 @@ hostgroups:
     alias: Physical machines with Intel CPUs
     private: 1
 
-  jessie:
-    alias: Hosts running jessie
   stretch:
     alias: Hosts running stretch
   buster:
@@ -1237,6 +1269,9 @@ hostgroups:
   xinetd-hosts:
     alias: hosts providing services via xinetd
     private: 1
+  postgres11-hosts:
+    alias: hosts running postgres11
+    private: 1
   postgres96-hosts:
     alias: hosts running postgres96
     private: 1
@@ -1313,7 +1348,7 @@ hostgroups:
     alias: hosts with a /var/log filesystem
     private: 1
 
-  incomingmailrelayed:
+  incomingmailrelayed587:
     alias: incoming mail needs to go through a mail relay
     # i.e. no port 25
     private: 1
@@ -1432,7 +1467,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, buxtehude, lw07, fasolo
+    hosts: sibelius, buxtehude, fasolo
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1519,7 +1554,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-4"
     hosts: lw04
   -
-    name: disk usage on /storage/snapshot-farm-90
+    name: disk usage on /storage/snapshot-farm-09
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-09"
     hosts: lw09
@@ -1696,6 +1731,7 @@ services:
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: computers
+    excludehostgroups: buildd, pybuildd, porterbox, no-bacula
 
   -
     name: network backup status - draghi
@@ -1812,13 +1848,6 @@ services:
     hostgroups: computers
     max_check_attempts: -2
     notification_interval: 1440
-  -
-    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, 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'"
@@ -1832,7 +1861,7 @@ services:
     hostgroups: computers
   -
     name: network service - munin-node
-    check: check_tcp!4949
+    nrpe: "/usr/lib/nagios/plugins/check_tcp -H localhost -p 4949"
     hostgroups: computers
     depends: process - munin-node
   ###
@@ -1869,8 +1898,12 @@ 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: stretch
+  -
+    name: unexpected process - irqbalance
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
     hostgroups: computers
-    excludehosts: harris
+    excludehostgroups: stretch
   ###
   -
     name: process - cron
@@ -1949,7 +1982,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
   -
@@ -2315,7 +2348,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: computers
-    excludehostgroups: postfix-hosts, incomingmailrelayed, incomingmailrelayed2025
+    excludehostgroups: postfix-hosts, incomingmailrelayed587, incomingmailrelayed2025
     depends: process - exim
 
   -
@@ -2326,7 +2359,7 @@ services:
   -
     name: network service - submission
     check: dsa_check_smtp_port!587
-    hostgroups: incomingmailrelayed
+    hostgroups: incomingmailrelayed587
     depends: process - exim
   -
     name: network service - smtp 2025
@@ -2346,11 +2379,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
-    excludehosts: klecker
+    excludehosts: new-klecker
   -
     name: process - apache2 - worker
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:80 -c 1:150 -u www-data -a /usr/sbin/apache2"
-    hosts: klecker
+    hosts: new-klecker
     depends: process - apache2 - master
   -
     name: unwanted process - apache2
@@ -2362,12 +2395,17 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: klecker, casulana
+    excludehosts: casulana
     depends: process - apache2 - master
   -
     name: network service - http
     check: check_http
-    depends: klecker:process - apache2 - master
+    depends: new-klecker:process - apache2 - master
+    hosts: klecker-archive
+  -
+    name: network service - http
+    check: check_http
+    depends: new-klecker:process - apache2 - master
     hosts: klecker-ftp
 
   # keyserver on kaufmann
@@ -2445,7 +2483,6 @@ services:
     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"
@@ -2465,11 +2502,15 @@ services:
     name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres96-hosts
+    excludehostgroups: postgres96-hosts, postgres11-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 - postgresql11 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/11/bin/postgres'"
+    hostgroups: postgres11-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'"
@@ -2502,11 +2543,6 @@ services:
     retry_interval: 5
   # }}}
   # {{{ 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, buster
   -
     name: process - nfsd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C nfsd -a '[nfsd]'"
@@ -2770,8 +2806,18 @@ services:
     hostgroups: bind9-hosts
   -
     name: network service - dns
-    check: check_dns
-    hostgroups: bind9-hosts
+    check: check_dig!www.debian.org!
+    hosts: geo1, geo2, geo3
+    depends: process - named
+  -
+    name: network service - dns
+    check: check_dig!_openpgpkey.debian.org!-A -t SOA
+    hosts: kaufmann
+    depends: process - named
+  -
+    name: network service - dns
+    check: check_dig!debian.org!-A -t SOA
+    hosts: denis
     depends: process - named
   -
     name: unwanted process - named
@@ -2971,6 +3017,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