projects / mirror / dsa-nagios.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
asachi arm64 new-install jessie
[mirror/dsa-nagios.git] / config / nagios-master.cfg
diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ebbb8df..a28799d 100644 (file)
--- 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
@@ -175,19 +174,19 @@ 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
@@ -198,7 +197,7 @@ servers:
   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
@@ -206,27 +205,27 @@ servers:
   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:
     address: 141.170.6.149
     parents: gw-aql
-    hostgroups: computers, buildd, wheezy, nfs-client
+    hostgroups: computers, buildd, jessie, nfs-client
   mips-aql-02:
     address: 141.170.6.150
     parents: gw-aql
-    hostgroups: computers, buildd, wheezy, nfs-client
+    hostgroups: computers, buildd, jessie, nfs-client
   minkus:
     address: 141.170.6.151
     parents: gw-aql
@@ -244,11 +243,11 @@ 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
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
   arm-arm-01:
     address: 217.140.96.58
     parents: gw-arm
@@ -257,18 +256,22 @@ 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
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd, broken_mq
   ia64-arm-01:
     address: 217.140.96.61
     parents: gw-arm
@@ -278,41 +281,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 +336,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,11 +344,11 @@ 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
@@ -353,21 +356,21 @@ servers:
   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,11 +378,11 @@ 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
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts
   couper:
     address: 5.153.231.14
     parents: ganeti-bytemark
@@ -399,11 +402,11 @@ servers:
   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
@@ -417,15 +420,15 @@ 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
@@ -433,7 +436,7 @@ servers:
   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
@@ -441,19 +444,19 @@ servers:
   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
@@ -461,20 +464,24 @@ servers:
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client
   fede:
     address: 5.153.231.37
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   sor:
     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
   # }}}
   # {{{ 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 +498,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:
@@ -504,10 +511,6 @@ servers:
     hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
   # }}}
   # {{{ gw-csail
-  senfl:
-    address: 128.31.0.51
-    parents: gw-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, squeeze, apache-https
   steffani:
     address: 128.31.0.36
     parents: gw-csail
@@ -516,11 +519,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
@@ -529,7 +532,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
@@ -537,23 +540,27 @@ 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
   # }}}
   # {{{ 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:
@@ -563,15 +570,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
@@ -583,54 +590,57 @@ servers:
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+  x86-grnet-01:
+    address: 194.177.211.203
+    parents: ganeti-grnet
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
   # }}}
   # {{{ gw-isc
   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, postgres91-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:
@@ -682,11 +692,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,7 +704,7 @@ 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
@@ -702,7 +712,7 @@ servers:
   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
@@ -718,11 +728,11 @@ servers:
   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
@@ -744,17 +754,17 @@ servers:
   zani:
     address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, buildd, hassrvfs, wheezy, incomingmailrelayed, ping-suckers
+    hostgroups: computers, buildd, hassrvfs, jessie, incomingmailrelayed
   # }}}
   # {{{ gw-osuosl
   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
@@ -775,15 +785,15 @@ servers:
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
-    hostgroups: computers, wheezy, buildd, hassrvfs, sw-raid
+    hostgroups: computers, jessie, 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
@@ -813,7 +823,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 +833,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 +866,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 +897,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, hasbootfs, 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,15 +927,15 @@ 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
@@ -941,7 +947,7 @@ servers:
   lotti:
     address: 206.12.19.121
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, jessie, hassrvfs
   nono:
     address: 206.12.19.123
     parents: ganeti2
@@ -965,7 +971,7 @@ 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
@@ -974,10 +980,6 @@ servers:
     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
   diabelli:
     address: 206.12.19.136
     parents: ganeti2
@@ -985,11 +987,7 @@ servers:
   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
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, no-bacula
   popov:
     address: 206.12.19.119
     parents: ganeti2
@@ -997,7 +995,7 @@ servers:
   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
@@ -1024,10 +1022,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 +1029,21 @@ servers:
   powerpc-unicamp-01:
     address: 143.106.167.149
     parents: prokofiev
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
     address: 143.106.167.135
     parents: prokofiev
     hostgroups: computers, hasbootfs, 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 +1061,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
@@ -1101,13 +1099,13 @@ servers:
   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 #############################
@@ -1183,12 +1181,12 @@ hostgroups:
     alias: Hosts with LSI Logic MegaRAID
     private: 1
 
-  squeeze:
-    alias: Hosts running squeeze
   wheezy:
     alias: Hosts running wheezy
   jessie:
     alias: Hosts running jessie
+  jessie-freebsd:
+    alias: kFreebsd hosts running jessie
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -1230,6 +1228,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
@@ -1305,9 +1306,6 @@ hostgroups:
   high-RTT:
     alias: machines with high round trip times
     private: 1
-  ping-suckers:
-    alias: machines that just suck at icmp
-    private: 1
   alioth:
     alias: machines that just are just awkward
     private: 1
@@ -1357,7 +1355,7 @@ services:
     name: PING
     check: "check_ping!350.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: layer3-infrastructure, high-RTT, ping-suckers
+    excludehostgroups: layer3-infrastructure, high-RTT
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
@@ -1368,13 +1366,6 @@ services:
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
-  -
-    name: PING
-    check: "check_ping!600.0,90%!900.0,95%"
-    hostgroups: ping-suckers
-    normal_check_interval: 5
-    max_check_attempts: 4
-    retry_check_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
@@ -1568,11 +1559,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"
@@ -1721,7 +1717,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'"
@@ -1730,6 +1725,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
@@ -1822,21 +1818,17 @@ services:
     name: process - ud-replicated
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C ud-replicated -a '/usr/bin/python /usr/bin/ud-replicated'"
     hostgroups: computers
-    excludehostgroups: squeeze, freebsd, alioth
+    excludehostgroups: freebsd, alioth
   -
     name: process - ud-replicated
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C python2.7 -a '/usr/bin/python /usr/bin/ud-replicated'"
     hostgroups: freebsd
   ###
-  -
-    name: process - monit
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
-    hostgroups: squeeze
   -
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
-    excludehostgroups: squeeze, alioth, jessie
+    excludehostgroups: alioth, jessie
   ###
   -
     name: MQ connection on rainier
@@ -1882,6 +1874,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"
@@ -1910,8 +1903,14 @@ services:
   -
     name: process - stunnel4 - puppet-ekeyd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
-    hostgroups: squeeze, wheezy, jessie
+    hostgroups: wheezy, jessie
     excludehostgroups: freebsd, alioth
+  -
+    name: process - stunnel4 - puppet-ekeyd is crazy
+    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
+    hostgroups: computers
+    excludehostgroups: freebsd, alioth
+    excludehosts: czerny, grnet-node01, storace, ubc-bl2
   # }}}
   # {{{ anti-services
   -
@@ -1951,6 +1950,14 @@ services:
     name: "host SSL cert"
     nrpe: "if [ -e /etc/ssl/certs/thishost.pem ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/thishost.pem; else echo 'No thishost.pem on this host.'; fi"
     hostgroups: computers
+  -
+    name: "host SSL cert - debian server"
+    nrpe: "if [ -e /etc/ssl/debian/certs/thishost-server.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost-server.crt; else echo 'No thishost-server.crt on this host.'; fi"
+    hostgroups: computers
+  -
+    name: "host SSL cert - debian client"
+    nrpe: "if [ -e /etc/ssl/debian/certs/thishost.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost.crt; else echo 'No thishost.crt on this host.'; fi"
+    hostgroups: computers
   # }}}
   # {{{ HW health/raid
   -
@@ -2014,13 +2021,13 @@ services:
 #    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
 #    normal_check_interval: 120
     #hostgroups: computers
-    #excludehosts: villa, lobos, senfl, schein
+    #excludehosts: villa, lobos, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
-    excludehosts: villa, lobos, senfl, schein, storace
+    excludehosts: villa, lobos, schein, storace
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
@@ -2035,7 +2042,7 @@ services:
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
     normal_check_interval: 120
-    hosts: senfl, schein
+    hosts: schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
@@ -2108,6 +2115,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"
@@ -2125,9 +2138,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
@@ -2157,6 +2177,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'"
@@ -2348,8 +2374,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
@@ -2369,7 +2393,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'"
@@ -2378,6 +2402,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"
@@ -2548,7 +2576,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
@@ -2556,12 +2584,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
+    runfrom: ubc-bl8
     hosts: giustini
   # }}}
   # {{{ porterbox
Unnamed repository; edit this file 'description' to name the repository.