X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=4b8829eb87e7458ca54f09702307fc513ee3835b;hb=4a852fa5bb7ab22cc84dab25095c661143b0752f;hp=1cb4417ae355010879aefcacaa0a94c60dfcee21;hpb=b65dd7e82e5dbc6ab533c76a5f792ff296ef4484;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 1cb4417..4b8829e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -174,7 +174,7 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, service, jessie
+    hostgroups: computers, service, stretch
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
@@ -185,14 +185,11 @@ servers:
     address: 130.239.18.123
     parents: gw-accumu
     hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, jessie, autofs, sw-raid
-  praetorius:
-    address: 130.239.18.121
-    parents: gw-accumu
-    hostgroups: computers, buildd, hassrvfs, jessie
+    ## No need to update to Stretch, casulana replaces it. It should eventually die.
   mirror-accumu:
     address: 130.242.6.199
     parents: gw-accumu2
-    hostgroups: computers, service, jessie, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, xinetd-hosts
   # }}}
   # {{{ gw-aql
   eller:
@@ -260,7 +257,7 @@ servers:
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, jessie, armhf, porterbox, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, stretch, armhf, porterbox, broken_mq
   hartmann:
     address: 217.140.96.67
     parents: gw-arm
@@ -271,14 +268,10 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd, broken_mq
   # }}}
   # {{{ gw-brown
-  franck:
-    address: 138.16.160.12
-    parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-systemd-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, apache-https, dl380, hpnewraid, rsyncd-systemd-hosts, jessie, hassrvfs, postgres94-hosts
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-systemd-hosts, jessie, hassrvfs, postgres94-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -341,7 +334,7 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, nfs-server, systemd-timesyncd
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
@@ -361,12 +354,12 @@ servers:
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
+    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, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   binet:
     address: 5.153.231.8
@@ -387,7 +380,7 @@ servers:
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
@@ -395,11 +388,11 @@ servers:
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   rapoport:
     address: 5.153.231.15
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
@@ -407,7 +400,7 @@ servers:
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
@@ -437,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
@@ -453,7 +446,7 @@ servers:
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
@@ -510,7 +503,7 @@ servers:
   casulana:
     address: 5.153.231.41
     parents: gw-bytemark
-    hostgroups: computers, service, stretch, hpnewraid, hassrvfs, dl380
+    hostgroups: computers, service, stretch, hassrvfs, dl380
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -523,7 +516,7 @@ servers:
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, jessie, apache-https
+    hostgroups: computers, service, apache2-hosts, dl360, hassrvfs, stretch, apache-https
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -541,15 +534,19 @@ servers:
   aagaard:
     address: 217.196.149.227
     parents: gw-conova
-    hostgroups: computers, jessie, service, sw-raid
+    hostgroups: computers, stretch, service, sw-raid
   acker:
     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, jessie, service, apache2-hosts
+    hostgroups: computers, stretch, service, apache2-hosts
   mirror-conova-debian:
     address: 217.196.149.232
     hostgroups: secondary-IPs
@@ -558,11 +555,27 @@ 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:
@@ -589,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
@@ -609,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:
@@ -621,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:
@@ -639,11 +652,11 @@ servers:
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   geo3:
     address: 194.177.211.201
     parents: gw-grnet
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch, systemd-timesyncd
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
@@ -652,22 +665,18 @@ servers:
     address: 194.177.211.203
     parents: ganeti-grnet
     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
-  gigault:
-    address: 194.177.211.204
-    parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   vittoria:
     address: 194.177.211.205
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, postgres96-hosts, apache2-hosts, apache-https, systemd-timesyncd
   boott:
     address: 194.177.211.206
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-systemd-hosts, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, rsyncd-systemd-hosts, systemd-timesyncd
   melartin:
     address: 194.177.211.208
     parents: ganeti-grnet
@@ -677,7 +686,7 @@ servers:
   mirror-isc:
     address: 149.20.4.13
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
@@ -768,19 +777,19 @@ servers:
   vento:
     address: 82.195.75.98
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, heavy-exim
   lully:
     address: 82.195.75.99
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, jessie, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, stretch, hasvarlogfs
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, jessie
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, stretch
   geo1:
     address: 82.195.75.105
     parents: ganeti3
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch
   handel:
     address: 82.195.75.104
     parents: ganeti3
@@ -788,11 +797,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, jessie, apache-https
-  stockhausen:
-    address: 82.195.75.108
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, stretch, apache-https
   ganeti3:
     address: 82.195.75.111
     parents: gw-manda
@@ -861,12 +866,12 @@ servers:
   beach:
     address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
 
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
-    hostgroups: computers, jessie, service
+    hostgroups: computers, stretch, service
   ppc64el-osuosl-01:
     address: 140.211.166.196
     parents: pieta
@@ -888,7 +893,7 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, stretch, dl380, hpnewraid, nfs-client, autofs
+    hostgroups: computers, service, stretch, dl380, nfs-client, autofs
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -904,11 +909,11 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hassrvfs, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, dl380, hassrvfs, stretch, security_mirror
   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:
@@ -994,19 +999,19 @@ servers:
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
   ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
   ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
 
   rachmaninoff:
     address: 209.87.16.20
@@ -1041,11 +1046,11 @@ servers:
   reger:
     address: 209.87.16.27
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd
+    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, jessie, apache2-hosts, apache-https, broken_https_default_vhost, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, broken_https_default_vhost, systemd-timesyncd
   menotti:
     address: 209.87.16.29
     parents: ubc-gateway
@@ -1057,15 +1062,15 @@ servers:
   geo2:
     address: 209.87.16.31
     parents: ubc-gateway
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch, systemd-timesyncd
   lotti:
     address: 209.87.16.32
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   muffat:
     address: 209.87.16.33
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay, systemd-timesyncd
   sonntag:
     address: 209.87.16.34
     parents: ubc-gateway
@@ -1085,20 +1090,24 @@ servers:
   ullmann:
     address: 209.87.16.38
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https, systemd-timesyncd
+    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, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
+    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, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   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
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1108,7 +1117,7 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, 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
@@ -1126,7 +1135,7 @@ servers:
   prokofiev:
     address: 177.220.10.140
     parents: gw-unicamp
-    hostgroups: computers, jessie, service
+    hostgroups: computers, stretch, service
   powerpc-unicamp-01:
     address: 177.220.10.141
     parents: prokofiev
@@ -1170,11 +1179,7 @@ servers:
   antheil:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
-  porpora:
-    address: 144.32.168.78
-    parents: gw-ynic
-    hostgroups: computers, sw-raid, jessie, no-bacula
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
   #antheil:
   #  address: 217.140.96.60
   #  parents: gw-arm
@@ -1244,9 +1249,6 @@ hostgroups:
   general:
     alias: general purpose developer accessible machines
 
-  hpnewraid:
-    alias: new (2015+) machines where we need hpssacli instead of hpacucli
-    private: 1
   dl380:
     alias: HP DL380 hosts
     private: 1
@@ -1549,16 +1551,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
     hosts: sibelius
-  -
-    name: disk usage on /var/lib/postgresql/9.4
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.4"
-    hosts: franck
   -
     name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /srv/ftp-master.debian.org"
-    hosts: franck, fasolo
+    hosts: fasolo
   -
     name: disk usage on /storage/snapshot-farm-1
     servicegroups: diskspace
@@ -2145,13 +2142,11 @@ services:
     excludehostgroups: sw-raid
   ###
   -
-    name: HW - hpacucli status
+    name: HW - HP raid status
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
+    nrpe: "if [ -e /var/cache/dsa/nagios/dsa-check-hpssacli ] ; then /usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/dsa-check-hpssacli ; else /usr/lib/nagios/plugins/dsa-check-hpacucli; fi"
     check_interval: 120
     hostgroups: dl380, dl360, bl460, bl460g8, dl180
-    excludehosts: busoni
-    excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -2164,18 +2159,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
     hosts: busoni
-  -
-    name: HW - hpacucli enclosure status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure 1 1E:1"
-    check_interval: 120
-    hosts: franck
-  -
-    name: HW - hpssacli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
-    check_interval: 120
-    hostgroups: hpnewraid
   ###
 #  -
 #    name: HW - edac status
@@ -2397,16 +2380,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'"
@@ -2436,7 +2442,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
@@ -2588,30 +2594,6 @@ services:
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
     hosts: storace, backuphost
   # }}}
-  # {{{ power
-#  -
-#    name: process - UPS - nut usbhid-ups - ups1
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C usbhid-ups  -a '/lib/nut/usbhid-ups -a ups1'"
-#    hosts: franck
-#  -
-#    name: process - UPS - nut upsd
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsd  -a '/sbin/upsd'"
-#    hosts: franck
-#  -
-#    name: process - UPS - nut upsmon master
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C upsmon  -a '/sbin/upsmon'"
-#    hosts: franck
-#  -
-#    name: process - UPS - nut upsmon worker
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsmon  -a '/sbin/upsmon'"
-#    hosts: franck
-#    depends: process - UPS - nut upsmon master
-#  -
-#    name: UPS - on line power
-#    nrpe: "/usr/lib/nagios/plugins/dsa-check-ups"
-#    hosts: franck
-#    depends: process - UPS - nut upsd
-  # }}}
   # {{{ buildd
   -
     name: process - buildd