X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b0eef2b5368b3d22ba0e8c2f472535496c765e3a;hb=e03ca59629e2ec5cd442d4a3e58c6dfb04671e14;hp=917863575d4f9af114b3868ec823bac94ea8c549;hpb=288d0b44a50b58e209e4d5ac68dfca1b174a562a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9178635..0c7916e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -70,10 +70,9 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-dgi:
-    address: 93.94.132.102
+    address: 93.94.131.13
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contacts: bzed
   gw-freenet:
     address: 62.104.23.249
     parents: gw-ubcece
@@ -161,8 +160,7 @@ servers:
     hostgroups: layer3-infrastructure
   gw-ynic:
     # really janet, because ynic is stupid about firewalling
-    #address: 146.97.42.26
-    address: 146.97.41.66
+    address: 146.97.71.46
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-zivit:
@@ -175,48 +173,48 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, acpid-hosts, wheezy
+    hostgroups: computers, service, acpid-hosts, jessie
   pkgmirror-1and1:
     address: 213.165.95.4
     parents: powell
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https
   babin:
     address: 213.165.95.6
     parents: powell
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
   piu-slave-1und1-01:
     address: 213.165.95.7
     parents: powell
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, jessie
     contacts: holger
   # }}}
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, wheezy
+    hostgroups: computers, acpid-hosts, service, jessie
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres91-hosts, wheezy
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres94-hosts, jessie
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, jessie, apache-https
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
   # }}}
   # {{{ gw-accumu
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, wheezy, autofs, sw-raid
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, jessie, autofs, sw-raid
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
-    hostgroups: computers, buildd, hassrvfs, wheezy
+    hostgroups: computers, buildd, hassrvfs, jessie
   # }}}
   # {{{ gw-aql
   mips-aql-01:
@@ -226,7 +224,15 @@ servers:
   mips-aql-02:
     address: 141.170.6.150
     parents: gw-aql
-    hostgroups: computers, buildd, wheezy, nfs-client
+    hostgroups: computers, buildd, jessie, nfs-client
+  mips-aql-04:
+    address: 141.170.6.154
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, nfs-client
+  mips-aql-05:
+    address: 141.170.6.155
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, nfs-client
   minkus:
     address: 141.170.6.151
     parents: gw-aql
@@ -244,7 +250,7 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, jessie, broken_mq
   arnold:
     address: 217.140.96.57
     parents: gw-arm
@@ -257,14 +263,18 @@ servers:
     address: 217.140.96.59
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
+  arm-arm-03:
+    address: 217.140.96.60
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, jessie, armhf, porterbox, broken_mq
   hartmann:
     address: 217.140.96.67
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, jessie, armhf, buildd, broken_mq
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
@@ -278,41 +288,41 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
   bm-bl9:
     address: 5.153.231.249
     parents: gw-bytemark
@@ -333,7 +343,7 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-server, xinetd-hosts
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
@@ -341,33 +351,33 @@ servers:
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, jessie
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https
     contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
     contacts: holger
   binet:
     address: 5.153.231.8
     parents: gw-bytemark
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, postgres91-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -375,39 +385,35 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
-  couper:
-    address: 5.153.231.14
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, no-bacula
+    hostgroups: computers, kvmdomains, jessie
   rapoport:
     address: 5.153.231.15
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, no-bacula
+    hostgroups: computers, kvmdomains, jessie
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, nfs-client, autofs
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
+    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy
+    hostgroups: computers, general, kvmdomains, jessie, hassrvfs
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -417,43 +423,43 @@ servers:
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, hassrvfs
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs
   ticharich:
     address: 5.153.231.23
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, kvmdomains, jessie, apache2-hosts
   oyens:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, openstack-controller, apache-https, broken_mq
+    hostgroups: computers, kvmdomains, jessie, openstack-controller, broken_mq #, apache2-hosts, apache-https
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, porterbox
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https
   portman:
     address: 5.153.231.29
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
   x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, acpid-hosts, no-bacula
+    hostgroups: computers, kvmdomains, jessie, acpid-hosts, no-bacula
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
   httpredir-bm-01:
     address: 5.153.231.35
     parents: ganeti-bytemark
@@ -469,12 +475,28 @@ servers:
     address: 5.153.231.38
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client
+  jerea:
+    address: 5.153.231.39
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
+  mekeel:
+    address: 5.153.231.40
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
+  pittar:
+    address: 5.153.231.41
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs #, apache2-hosts
+  pinel:
+    address: 5.153.231.42
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   # }}}
   # {{{ gw-c3sl
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, wheezy, high-RTT, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
   # {{{ gw-carnet
@@ -491,7 +513,7 @@ servers:
   gluck:
     address: 150.203.164.38
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https
   # }}}
   # {{{ gw-conova
   sompek:
@@ -512,11 +534,11 @@ servers:
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
-    hostgroups: computers, service, dl360, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, jessie, drbd-hosts
   csail-node02:
     address: 128.31.0.46
     parents: gw-csail
-    hostgroups: computers, service, dl360, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, jessie, drbd-hosts
   ganeti-csail:
     address: 128.31.0.49
     parents: gw-bytemark
@@ -525,7 +547,7 @@ servers:
   falla:
     address: 128.31.0.65
     parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
+    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie, jessie-freebsd
   fischer:
     address: 128.31.0.35
     parents: ganeti-csail
@@ -533,23 +555,31 @@ servers:
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
-    hostgroups: computers, service, hassrvfs, kvmdomains, wheezy, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+  httpredir-csail-01:
+    address: 128.31.0.66
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts
+  soriano:
+    address: 128.31.0.67
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts
   # }}}
   # {{{ gw-dgi
   storace:
     address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, acpid-hosts, wheezy, dl380, nfs-client, hassrvfs
+    hostgroups: computers, acpid-hosts, jessie, dl380, nfs-client, hassrvfs
   # }}}
   # {{{ gw-gatech
   sechter:
     address: 128.61.240.73
     parents: gw-gatech
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hassrvfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -559,15 +589,15 @@ servers:
   grnet-node01:
     address: 194.177.211.195
     parents: gw-grnet
-    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   grnet-node02:
     address: 194.177.211.196
     parents: gw-grnet
-    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, wheezy
+    hostgroups: computers, acpid-hosts, megaraid, service, jessie
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
@@ -589,48 +619,47 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
   # }}}
   # {{{ gw-leaseweb
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, wheezy, dl180, nfs-server
+    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, wheezy, dl180, nfs-server
+    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, wheezy, dl180, nfs-server
+    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, wheezy, dl180, nfs-server
+    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-client, autofs, hassrvfs, postgres91-hosts, apache2-hosts
+    hostgroups: computers,  service, acpid-hosts, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-client, autofs, hassrvfs
-  #, apache2-hosts
+    hostgroups: computers,  service, acpid-hosts, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
   # }}}
   # {{{ gw-linaro
   arm-linaro-01:
     address: 64.28.108.83
     parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
   arm-linaro-03:
     address: 64.28.108.85
     parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
   asachi:
     address: 64.28.108.84
     parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, jessie, broken_mq
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -640,10 +669,6 @@ servers:
     contacts: pkern
   # }}}
   # {{{ gw-man-da
-  ball:
-    address: 82.195.75.70
-    parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, wheezy, sw-raid
   # bartok TODO
   czerny:
     address: 82.195.75.109
@@ -660,7 +685,7 @@ servers:
   master:
     address: 82.195.75.110
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, spamd, heavy-exim, highload
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
@@ -682,11 +707,11 @@ servers:
   vento:
     address: 82.195.75.98
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, heavy-exim
   lully:
     address: 82.195.75.99
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, jessie, hasvarlogfs
   draghi:
     address: 82.195.75.106
     parents: ganeti3
@@ -694,15 +719,15 @@ servers:
   geo1:
     address: 82.195.75.105
     parents: ganeti3
-    hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
   handel:
     address: 82.195.75.104
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, apache2-hosts, wheezy, apache-https
+    hostgroups: computers, service, kvmdomains, apache2-hosts, jessie
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, wheezy
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, jessie
   stockhausen:
     address: 82.195.75.108
     parents: ganeti3
@@ -714,15 +739,15 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache-https, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, acpid-hosts, apache-https, rsyncd-hosts, xinetd-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
+    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
   denis:
     address: 82.195.75.91
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
+    hostgroups: computers, service, kvmdomains, jessie, bind9-hosts
   vogler:
     address: 82.195.75.92
     parents: ganeti3
@@ -730,7 +755,7 @@ servers:
   wolkenstein:
     address: 82.195.75.65
     parents: ganeti3
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, jessie
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
@@ -750,15 +775,27 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts, no-bacula, apache-https
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, jessie, hasvarlogfs, apache2-hosts, no-bacula, apache-https
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, acpid-hosts, wheezy
+    hostgroups: computers, service, dl380, acpid-hosts, jessie
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs, apache-https, spamd
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres94-hosts, jessie, hasvarlogfs, apache-https, spamd
+  pieta:
+    address: 140.211.166.195
+    parents: gw-osuosl
+    hostgroups: computers, jessie, service
+  ppc64el-osuosl-01:
+    address: 140.211.166.196
+    parents: pieta
+    hostgroups: computers, hassrvfs, buildd, jessie
+  powerpc-osuosl-01:
+    address: 140.211.166.197
+    parents: pieta
+    hostgroups: computers, hassrvfs, buildd, jessie
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -772,18 +809,14 @@ servers:
     address: 140.211.166.46
     parents: gw-osuosl
     hostgroups: computers, porterbox, hasusrfs, wheezy
-  parry:
-    address: 140.211.15.153
-    parents: gw-osuosl
-    hostgroups: computers, wheezy, buildd, hassrvfs, sw-raid
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
-    hostgroups: computers, wheezy, hassrvfs, porterbox, sw-raid
+    hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, jessie
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -801,7 +834,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres91-hosts, service, apache2-hosts, sw-raid, wheezy, rsyncd-hosts, xinetd-hosts, hasvarlogfs
+    hostgroups: computers, acpid-hosts, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, xinetd-hosts, hasvarlogfs
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -813,7 +846,7 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror, acpid-hosts
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
@@ -823,7 +856,7 @@ servers:
   eder:
     address: 86.59.118.151
     parents: gw-sil
-    hostgroups: computers, porterbox, wheezy, hassrvfs
+    hostgroups: computers, porterbox, jessie, hassrvfs
   eysler:
     address: 86.59.118.152
     parents: gw-sil
@@ -856,32 +889,28 @@ servers:
     parents: sw-ubcece-mcld
     hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
     contacts: lfilipoz
-  ravel:
-    address: 206.12.19.5
-    parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, hasorgfs, wheezy, autofs
-  dijkstra:
-    address: 206.12.19.218
+  ubc-bl7:
+    address: 206.12.19.217
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  pasquini:
-    address: 206.12.19.217
+  ubc-bl6:
+    address: 206.12.19.216
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  luchesi:
-    address: 206.12.19.214
+  ubc-bl2:
+    address: 206.12.19.212
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  tristano:
+  ubc-bl3:
     address: 206.12.19.213
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  boito:
-    address: 206.12.19.216
+  ubc-bl4:
+    address: 206.12.19.214
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  bertali:
-    address: 206.12.19.212
+  ubc-bl8:
+    address: 206.12.19.218
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   ganeti2:
@@ -891,15 +920,15 @@ servers:
   tchaikovsky:
     address: 206.12.19.118
     parents: ganeti2
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
+    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
   brahms:
     address: 206.12.19.115
     parents: ganeti2
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
   geo2:
     address: 206.12.19.113
     parents: ganeti2
-    hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -921,19 +950,19 @@ servers:
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
-    hostgroups: computers, porterbox, wheezy
+    hostgroups: computers, porterbox, jessie
   corelli:
     address: 206.12.19.16
     parents: sw-ubcece-kais
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
   lucatelli:
     address: 206.12.19.15
     parents: sw-ubcece-kais
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
   traetta:
     address: 206.12.19.21
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, wheezy
+    hostgroups: computers, dl585, acpid-hosts, service, jessie
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -941,19 +970,19 @@ servers:
   lotti:
     address: 206.12.19.121
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   nono:
     address: 206.12.19.123
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost
+    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs
   reger:
     address: 206.12.19.124
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim
   danzi:
     address: 206.12.19.125
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: ganeti2
@@ -965,43 +994,31 @@ servers:
   elgar:
     address: 206.12.19.130
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, jessie
   gombert:
     address: 206.12.19.132
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https
   jenkins:
     address: 206.12.19.133
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy
-  blavet:
-    address: 206.12.19.134
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie
   diabelli:
     address: 206.12.19.136
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, broken_https_default_vhost
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost
   bizet:
     address: 206.12.19.137
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, no-bacula
-  lilburn:
-    address: 206.12.19.138
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs
-  popov:
-    address: 206.12.19.119
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, no-bacula
   beach:
     address: 206.12.19.140
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula, apache-https
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
@@ -1009,11 +1026,11 @@ servers:
   menotti:
     address: 206.12.19.143
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
   muffat:
     address: 206.12.19.146
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
+    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-ugent
   # }}}
@@ -1024,10 +1041,6 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-unicamp
-  asgard:
-    address: 143.106.167.145
-    parents: gw-unicamp
-    hostgroups: layer3-infrastructure
   prokofiev:
     address: 143.106.167.147
     parents: gw-unicamp
@@ -1035,17 +1048,21 @@ servers:
   powerpc-unicamp-01:
     address: 143.106.167.149
     parents: prokofiev
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
     address: 143.106.167.135
     parents: prokofiev
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, jessie
+  plummer:
+    address: 143.106.167.146
+    parents: prokofiev
+    hostgroups: computers, porterbox, hassrvfs, jessie
   # }}}
   # {{{ gw-utwente
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, wheezy, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1063,23 +1080,23 @@ servers:
   henze:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
   hasse:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
   antheil:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
+    hostgroups: computers, buildd, sw-raid, hassrvfs, jessie
   poulenc:
     address: 144.32.168.77
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
+    hostgroups: computers, buildd, sw-raid, hassrvfs, jessie
   #antheil:
   #  address: 217.140.96.60
   #  parents: gw-arm
@@ -1097,17 +1114,17 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, wheezy
+    hostgroups: computers, buildd, hassrvfs, jessie
   zelenka:
     address: 80.245.147.40
     parents: gw-zivit
-    hostgroups: computers, porterbox, hassrvfs, wheezy
+    hostgroups: computers, porterbox, hassrvfs, jessie
   # }}}
   # {{{ gw-sakura
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, wheezy, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror, acpid-hosts
+    hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror, acpid-hosts
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1187,6 +1204,8 @@ hostgroups:
     alias: Hosts running wheezy
   jessie:
     alias: Hosts running jessie
+  jessie-freebsd:
+    alias: kFreebsd hosts running jessie
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -1228,6 +1247,9 @@ hostgroups:
   postgres91-hosts:
     alias: hosts running postgres91
     private: 1
+  postgres94-hosts:
+    alias: hosts running postgres94
+    private: 1
   no-ulogd:
     alias: hosts not running ulogd
     private: 1
@@ -1375,13 +1397,13 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount'"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -X nfs4 --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount|/proc/sys/fs/binfmt_misc'"
     hostgroups: computers
     excludehosts: sibelius
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x /srv/farm-snapshot/farm-misc 95 98"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x nfs4 -x /srv/farm-snapshot/farm-misc 95 98"
     hosts: sibelius
 
   -
@@ -1465,9 +1487,9 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
     hosts: sibelius
   -
-    name: disk usage on /var/lib/postgresql/9.1
+    name: disk usage on /var/lib/postgresql/9.4
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.1"
+    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
@@ -1556,11 +1578,16 @@ services:
     hostgroups: computers
     excludehosts: zelenka, zandonai
     excludehostgroups: jessie
+  -
+    name: process - getty
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/getty"
+    hostgroups: jessie-freebsd
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
-    hostgroups: computers
     hostgroups: jessie
+    excludehostgroups: freebsd
+
   -
     name: processes - zombies
     nrpe: "/usr/lib/nagios/plugins/check_procs 5 10 -s Z"
@@ -1709,7 +1736,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
     excludehostgroups: freebsd, jessie
-
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
@@ -1718,6 +1744,7 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -F'"
     hostgroups: jessie
+    excludehostgroups: freebsd
 
   -
     name: remote logging on lotti
@@ -1866,6 +1893,7 @@ services:
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C systemd-udevd -a '/lib/systemd/systemd-udevd'"
     hostgroups: jessie
+    excludehostgroups: freebsd
   -
     name: unexpected process - udev
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
@@ -1898,10 +1926,10 @@ services:
     excludehostgroups: freebsd, alioth
   -
     name: process - stunnel4 - puppet-ekeyd is crazy
-    nrpe: 'n="0"; if [ -e /var/run/stunnel4/stunnel-ekeyd.pid ]; then n="$(wc -l < /proc/$(cat /var/run/stunnel4/stunnel-ekeyd.pid)/net/tcp)"; fi; if [ "$n" -gt 100 ]; then echo "Crazy number of open TCP sockets ($n)."; exit 2; else echo "All seems fine."; exit 0; fi'
+    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
     hostgroups: computers
     excludehostgroups: freebsd, alioth
-    excludehosts: czerny, grnet-node01, storace
+    excludehosts: czerny, grnet-node01, storace, ubc-bl2
   # }}}
   # {{{ anti-services
   -
@@ -2106,6 +2134,12 @@ services:
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
     hostgroups: heavy-exim, heavy-postfix
+    excludehostgroups: jessie
+  -
+    name: process - clamav - freshclam
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --foreground=true'"
+    hostgroups: heavy-exim, heavy-postfix
+    excludehostgroups: wheezy
   -
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
@@ -2123,9 +2157,16 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
     excludehosts: picconi
+    excludehostgroups: jessie
+  -
+    name: process - spamd - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamassassin.pid --create-prefs --max-children 5 --helper-home-dir'"
+    hostgroups: spamd
+    excludehosts: picconi
+    excludehostgroups: wheezy
   -
     name: process - spamd - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamassassin.pid --create-prefs --max-children 20 --min-spare=5 --helper-home-dir'"
     hosts: picconi
   -
     name: process - spamd - master
@@ -2155,6 +2196,12 @@ services:
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
     hostgroups: heavy-exim
+    excludehostgroups: jessie
+  -
+    name: process - postgrey
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a 'postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
+    hostgroups: heavy-exim
+    excludehostgroups: wheezy
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
@@ -2346,8 +2393,6 @@ services:
     check: dsa_check_port_closed!443
     hostgroups: apache2-hosts
     excludehostgroups: apache-https
-    # ravel does ssh on port 443
-    excludehosts: ravel
     normal_check_interval: 60
   # }}}
   # {{{ FTP
@@ -2367,7 +2412,7 @@ services:
     name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres91-hosts
+    excludehostgroups: postgres91-hosts, postgres94-hosts
   -
     name: unwanted process - postgresql 9.0
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
@@ -2376,6 +2421,10 @@ services:
     name: process - postgresql91 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
     hostgroups: postgres91-hosts
+  -
+    name: process - postgresql94 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.4/bin/postgres'"
+    hostgroups: postgres94-hosts
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
@@ -2546,7 +2595,7 @@ services:
   -
     name: ping alive check
     remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
-    runfrom: dijkstra
+    runfrom: ubc-bl8
     hosts: giustini
     normal_check_interval: 5
     max_check_attempts: 4
@@ -2554,12 +2603,12 @@ services:
   -
     name: Overall Unit Status
     remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
-    runfrom: dijkstra
+    runfrom: ubc-bl8
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=9966 $HOSTADDRESS$ public"
-    runfrom: dijkstra
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10791 $HOSTADDRESS$ public"
+    runfrom: ubc-bl8
     hosts: giustini
   # }}}
   # {{{ porterbox
@@ -2613,13 +2662,11 @@ services:
     hostgroups: openstack-controller
   # }}}
   # {{{ misc
-#  -
-#    Disable this check until logind and binfmt_misc issues are fixed
-#    something unknown is triggering mount of binfmt_misc
-#    https://bugs.debian.org/772700
-#    name: system - all services running
-#    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
-#    hostgroups: jessie
+  -
+    name: system - all services running
+    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
+    hostgroups: jessie
+    excludehostgroups: freebsd
   ###
   -
     name: process - rngd
@@ -2662,7 +2709,7 @@ services:
   ###
   -
     name: process - icinga
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:60 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
     hosts: tchaikovsky
   ###
   -