X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-nagios.git;a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0b8c442080f0aec0bd97b56514d7ea5f29f65115;hp=a21db87c4d882e6344acdd00974619c9ec7e827d;hb=b86fe19226b2779117a5f441e7737663e1075509;hpb=2f5c5d80bb347daaa8557e6b23b3cc49c05e9152

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a21db87..0b8c442 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, buster, 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:
@@ -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,19 +335,15 @@ 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
+    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
   bmdb1:
     address: 5.153.231.10
@@ -364,55 +360,19 @@ 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
+    hostgroups: computers, hassrvfs, kvmdomains, buster, 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, apache2-hosts, apache-https, nfs-client, autofs, 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, buster, hassrvfs, porterbox, systemd-timesyncd
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
@@ -433,10 +393,6 @@ servers:
     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
@@ -444,23 +400,11 @@ 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
     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
@@ -580,12 +524,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:
@@ -609,7 +561,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
@@ -633,7 +585,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
@@ -669,19 +621,19 @@ 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
@@ -708,7 +660,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
@@ -744,7 +696,7 @@ 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
@@ -800,13 +752,33 @@ 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
+  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
   # }}}
   # {{{ 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:
@@ -816,7 +788,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
@@ -825,12 +807,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
@@ -848,7 +830,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
@@ -906,7 +888,7 @@ servers:
   rachmaninoff:
     address: 209.87.16.20
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
   x86-ubc-01:
     address: 209.87.16.21
     parents: ganeti2-ubc
@@ -915,14 +897,18 @@ servers:
     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: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
   gombert:
     address: 209.87.16.25
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, apache2-hosts, apache-https, systemd-timesyncd
   nono:
     address: 209.87.16.26
     parents: ganeti2-ubc
@@ -950,7 +936,7 @@ servers:
   lotti:
     address: 209.87.16.32
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, systemd-timesyncd
   muffat:
     address: 209.87.16.33
     parents: ganeti2-ubc
@@ -966,11 +952,11 @@ servers:
   gretchaninov:
     address: 209.87.16.36
     parents: ganeti2-ubc
-    hostgroups: computers, general, kvmdomains, stretch, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, buster, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   tye:
     address: 209.87.16.37
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ullmann:
     address: 209.87.16.38
     parents: ganeti2-ubc
@@ -978,16 +964,16 @@ servers:
   buxtehude:
     address: 209.87.16.39
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, heavy-exim, postgres96-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
+    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: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   hier:
     address: 209.87.16.43
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   godard:
     address: 209.87.16.44
     parents: ganeti2-ubc
@@ -1000,14 +986,42 @@ servers:
     address: 209.87.16.46
     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: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
+    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
+  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
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1095,34 +1109,38 @@ servers:
     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
+    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
-    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, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, apache2-hosts, apache-https, hassrvfs
+  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:
@@ -1204,8 +1222,6 @@ hostgroups:
     alias: Physical machines with Intel CPUs
     private: 1
 
-  jessie:
-    alias: Hosts running jessie
   stretch:
     alias: Hosts running stretch
   buster:
@@ -1249,6 +1265,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
@@ -1325,7 +1344,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
@@ -1531,7 +1550,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
@@ -1708,6 +1727,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
@@ -1824,13 +1844,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'"
@@ -1844,7 +1857,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
   ###
@@ -1881,8 +1894,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
@@ -2327,7 +2344,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
 
   -
@@ -2338,7 +2355,7 @@ services:
   -
     name: network service - submission
     check: dsa_check_smtp_port!587
-    hostgroups: incomingmailrelayed
+    hostgroups: incomingmailrelayed587
     depends: process - exim
   -
     name: network service - smtp 2025
@@ -2457,7 +2474,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"
@@ -2477,11 +2493,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'"
@@ -2514,11 +2534,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]'"
@@ -2782,8 +2797,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
@@ -2983,6 +3008,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