X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b8d381fe7d1287ff48332abaab7cd9da085684db;hb=7855bde56cab1942eb17c4105569cca38de54d37;hp=d19e4a3dd5a32f4429e0af226bbffa341b7792af;hpb=2abdc50c8e5dfd388c7ef0e2fcd9d829e2438dc7;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d19e4a3..b8d381f 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -271,65 +271,65 @@ servers:
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-systemd-hosts, jessie, hassrvfs, postgres94-hosts
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-systemd-hosts, stretch, hassrvfs, postgres96-hosts, manyprocesses
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl9:
     address: 5.153.231.249
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl10:
     address: 5.153.231.250
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl11:
     address: 5.153.231.251
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl12:
     address: 5.153.231.252
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl13:
     address: 5.153.231.253
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
   bm-bl14:
     address: 5.153.231.254
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
 
   milanollo:
     address: 5.153.231.2
@@ -368,7 +368,7 @@ servers:
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -376,7 +376,7 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, apache-https, apache2-hosts, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, autofs, nfs-client, uploadqueue, apache-https, apache2-hosts, systemd-timesyncd
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
@@ -396,7 +396,7 @@ servers:
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
@@ -430,7 +430,7 @@ servers:
   olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
@@ -442,7 +442,7 @@ servers:
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
@@ -503,13 +503,13 @@ servers:
   casulana:
     address: 5.153.231.41
     parents: gw-bytemark
-    hostgroups: computers, service, stretch, hassrvfs, dl380
+    hostgroups: computers, service, stretch, hassrvfs, dl380, manyprocesses
   # }}}
   # {{{ gw-c3sl
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, hassrvfs, stretch, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
   # {{{ gw-cecsit
@@ -531,18 +531,22 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
-  aagaard:
+  conova-node01:
     address: 217.196.149.227
     parents: gw-conova
     hostgroups: computers, stretch, service, sw-raid
-  acker:
+  conova-node02:
     address: 217.196.149.228
     parents: gw-conova
     hostgroups: computers, stretch, service, sw-raid
+  ganeti-conova:
+    address: 217.196.149.235
+    parents: gw-conova
+    hostgroups: notacomputer
   mirror-conova:
     address: 217.196.149.229
     parents: gw-conova
-    hostgroups: computers, stretch, service, apache2-hosts
+    hostgroups: computers, stretch, service, apache2-hosts, apache-https
   mirror-conova-debian:
     address: 217.196.149.232
     hostgroups: secondary-IPs
@@ -551,21 +555,37 @@ servers:
     address: 217.196.149.233
     hostgroups: secondary-IPs
     parents: mirror-conova
+  mirror-conova-archive:
+    address: 217.196.149.234
+    hostgroups: secondary-IPs
+    parents: mirror-conova
+  mirror-conova-syncproxy4-eu:
+    address: 217.196.149.237
+    hostgroups: secondary-IPs
+    parents: mirror-conova
 
   arm-conova-01:
     address: 217.196.149.230
-    parents: aagaard
+    parents: ganeti-conova
     hostgroups: computers, hassrvfs, buildd, stretch
+  arm-conova-02:
+    address: 217.196.149.231
+    parents: ganeti-conova
+    hostgroups: computers, hassrvfs, buildd, stretch
+  amdahl:
+    address: 217.196.149.236
+    parents: ganeti-conova
+    hostgroups: computers, hassrvfs, porterbox, stretch
   # }}}
   # {{{ gw-csail
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
-    hostgroups: computers, service, dl360, jessie, drbd-hosts
+    hostgroups: computers, service, dl360, stretch, drbd-hosts
   csail-node02:
     address: 128.31.0.46
     parents: gw-csail
-    hostgroups: computers, service, dl360, jessie, drbd-hosts
+    hostgroups: computers, service, dl360, stretch, drbd-hosts
   ganeti-csail:
     address: 128.31.0.49
     parents: gw-bytemark
@@ -582,7 +602,7 @@ servers:
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-systemd-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, apache2-hosts, rsyncd-systemd-hosts, apache-https, systemd-timesyncd
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
@@ -594,7 +614,7 @@ servers:
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, hassrvfs, stretch, apache2-hosts, apache-https, systemd-timesyncd
   pkgmirror-csail:
     address: 128.31.0.51
     parents: ganeti-csail
@@ -602,7 +622,7 @@ servers:
   usper:
     address: 128.31.0.69
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, queued, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, uploadqueue, queued, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
@@ -614,7 +634,7 @@ servers:
   sechter:
     address: 128.61.240.73
     parents: gw-gatech
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, sw-raid, hasbootfs, hassrvfs, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -624,11 +644,11 @@ servers:
   grnet-node01:
     address: 194.177.211.195
     parents: gw-grnet
-    hostgroups: computers, service, dl380, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, stretch, drbd-hosts
   grnet-node02:
     address: 194.177.211.196
     parents: gw-grnet
-    hostgroups: computers, service, dl380, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, stretch, drbd-hosts
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
@@ -660,13 +680,17 @@ servers:
   melartin:
     address: 194.177.211.208
     parents: ganeti-grnet
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, postgres96-hosts
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, postgres96-hosts, hassrvfs
+  static-master-grnet-01:
+    address: 194.177.211.209
+    parents: ganeti-grnet
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, hassrvfs
   # }}}
   # {{{ gw-isc
   mirror-isc:
     address: 149.20.4.13
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch, security_mirror
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
@@ -743,7 +767,7 @@ servers:
   master:
     address: 82.195.75.110
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, spamd, heavy-exim, highload
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, spamd, heavy-exim, highload
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -801,7 +825,7 @@ servers:
   wolkenstein:
     address: 82.195.75.65
     parents: ganeti3
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, stretch, apache-https
   mips-manda-01:
     address: 82.195.75.66
     parents: gw-manda
@@ -842,7 +866,7 @@ servers:
   byrd:
     address: 140.211.166.200
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, jessie
+    hostgroups: computers, service, dl380, stretch
   beach:
     address: 140.211.166.201
     parents: byrd
@@ -851,7 +875,7 @@ servers:
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
-    hostgroups: computers, stretch, service
+    hostgroups: computers, stretch, service, manyprocesses
   ppc64el-osuosl-01:
     address: 140.211.166.196
     parents: pieta
@@ -893,7 +917,7 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl360, hassrvfs, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl360, hassrvfs, stretch, security_mirror
   # }}}
   # {{{ gw-sil
   eberlin:
@@ -979,24 +1003,24 @@ servers:
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
   ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
   ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
 
   rachmaninoff:
     address: 209.87.16.20
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   x86-ubc-01:
     address: 209.87.16.21
     parents: ubc-gateway
@@ -1018,7 +1042,7 @@ servers:
   gombert:
     address: 209.87.16.25
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   nono:
     address: 209.87.16.26
     parents: ubc-gateway
@@ -1034,11 +1058,11 @@ servers:
   menotti:
     address: 209.87.16.29
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   danzi:
     address: 209.87.16.30
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd
   geo2:
     address: 209.87.16.31
     parents: ubc-gateway
@@ -1062,7 +1086,7 @@ servers:
   gretchaninov:
     address: 209.87.16.36
     parents: ubc-gateway
-    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   tye:
     address: 209.87.16.37
     parents: ubc-gateway
@@ -1083,11 +1107,15 @@ servers:
   hier:
     address: 209.87.16.43
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   godard:
     address: 209.87.16.44
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts
+  debussy:
+    address: 209.87.16.46
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1097,7 +1125,7 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch, security_mirror
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
@@ -1115,7 +1143,7 @@ servers:
   prokofiev:
     address: 177.220.10.140
     parents: gw-unicamp
-    hostgroups: computers, stretch, service
+    hostgroups: computers, stretch, service, manyprocesses
   powerpc-unicamp-01:
     address: 177.220.10.141
     parents: prokofiev
@@ -1133,7 +1161,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-systemd-hosts, dl380, jessie, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-systemd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1151,27 +1179,15 @@ servers:
   henze:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
   hasse:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
   antheil:
     address: 144.32.168.76
     parents: gw-ynic
     hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
-  #antheil:
-  #  address: 217.140.96.60
-  #  parents: gw-arm
-  #  hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
-  #hasse:
-  #  address: 217.140.96.68
-  #  parents: gw-arm
-  #  hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
-  #henze:
-  #  address: 217.140.96.70
-  #  parents: gw-arm
-  #  hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
   # }}}
   # {{{ gw-zivit
   zandonai:
@@ -1187,7 +1203,7 @@ servers:
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-systemd-hosts, security_mirror
+    hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-systemd-hosts, security_mirror
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1337,6 +1353,8 @@ hostgroups:
   broken_https_default_vhost:
     alias: https default vhost does not say 200 OK
     private: 1
+  manyprocesses:
+    alias: hosts with lots and lots of (kernel) processes
 
   no-bacula:
     alias: hosts which are not being backed up with bacula
@@ -1609,11 +1627,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo, casulana
+    excludehostgroups: manyprocesses
   -
     name: processes - total
+    hostgroups: manyprocesses
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-    hosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo, casulana
   -
     name: swap usage - percent
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
@@ -2058,6 +2076,7 @@ services:
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
     hostgroups: stretch
+    excludehosts: storace
   -
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
@@ -2093,7 +2112,7 @@ services:
   -
     name: SSL certs - LE
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /etc/puppet/modules/ssl/files/from-letsencrypt"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /srv/puppet.debian.org/from-letsencrypt"
     runfrom: handel
   # }}}
   # {{{ HW health/raid
@@ -2360,16 +2379,39 @@ services:
     name: process - postfix - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/master'"
     hostgroups: postfix-hosts
+    excludehostgroups: stretch
+  -
+    name: process - postfix - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/sbin/master'"
+    hostgroups: postfix-hosts
+    excludehostgroups: jessie
+
   -
     name: process - postfix - qmgr
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t fifo -u'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
+    excludehostgroups: stretch
+  -
+    name: process - postfix - qmgr
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t unix -u'"
+    hostgroups: postfix-hosts
+    depends: process - postfix - master
+    excludehostgroups: jessie
+
   -
     name: process - postfix - pickup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t fifo -u -c'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
+    excludehostgroups: stretch
+  -
+    name: process - postfix - pickup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t unix -u -c'"
+    hostgroups: postfix-hosts
+    depends: process - postfix - master
+    excludehostgroups: jessie
+
   -
     name: process - postfix - anvil
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:1 -c 0: -u postfix -C anvil -a 'anvil -l -t unix -u'"
@@ -2399,7 +2441,7 @@ services:
 
   -
     name: network service local - smtps cert
-    nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
+    nrpe: "/usr/lib/nagios/plugins/check_smtp -H localhost -S -D 14"
     hostgroups: postfix-hosts
     depends: process - postfix - master
     check_interval: 120
@@ -2635,6 +2677,14 @@ services:
     max_check_attempts: 5
     retry_interval: 5
     servicegroups: mirror
+  -
+    name: mirror sync - debian archive backend
+    check: "dsa_check_mirrorsync!debian.backend.mirrors.debian.org!debian/project/trace/master"
+    hosts: global
+    check_interval: 15
+    max_check_attempts: 5
+    retry_interval: 5
+    servicegroups: mirror
 
   -
     name: mirror static sync - bits