X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=be41f216864f63191b06ce8329283fa58b080ad4;hb=007020798d32704df9caad71422f3c33c0a0fb69;hp=febd081b48596110d3cecfb199bad1d02ed42c6e;hpb=76b7fc171591c66da4baf6af2eaad2c77fa6c73a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index febd081..c25da7d 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
@@ -152,7 +151,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-unicamp:
-    address: 143.106.167.234
+    address: 177.220.10.65
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-utwente:
@@ -161,21 +160,21 @@ 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:
-    address: 80.245.144.3
     parents: gw-ubcece
-    hostgroups: layer3-infrastructure
+    hostgroups: notacomputer
+    pingable: false
+    check_command: dsa_check_always_ok
   # }}}
   # {{{ servers
   # {{{ gw-1und1
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, acpid-hosts, wheezy
+    hostgroups: computers, service, jessie
   pkgmirror-1and1:
     address: 213.165.95.4
     parents: powell
@@ -194,31 +193,27 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, wheezy
-  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
-  soler:
-    address: 195.20.242.126
-    parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https
+    hostgroups: computers, service, jessie
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-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, jessie, autofs, sw-raid
+    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, wheezy
+    hostgroups: computers, buildd, hassrvfs, jessie
   # }}}
   # {{{ gw-aql
+  etler:
+    address: 141.170.6.156
+    parents: gw-aql
+    hostgroups: computers, porterbox, jessie, hassrvfs, hasbootfs, sw-raid
   mips-aql-01:
     address: 141.170.6.149
     parents: gw-aql
@@ -226,7 +221,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
@@ -282,41 +285,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, 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, service, jessie
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl9:
     address: 5.153.231.249
     parents: gw-bytemark
@@ -345,7 +348,7 @@ 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
@@ -353,7 +356,7 @@ servers:
   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
@@ -371,7 +374,7 @@ servers:
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres91-hosts, postgres94-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -379,39 +382,39 @@ 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
+  backuphost:
+    address: 5.153.231.12
+    parents: ganeti-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, jessie
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts
-  couper:
-    address: 5.153.231.14
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
   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, hassrvfs
+    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
@@ -429,11 +432,11 @@ servers:
   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
@@ -441,23 +444,23 @@ servers:
   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, jessie, acpid-hosts, no-bacula
+    hostgroups: computers, kvmdomains, jessie, no-bacula
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   httpredir-bm-01:
     address: 5.153.231.35
     parents: ganeti-bytemark
@@ -476,7 +479,23 @@ servers:
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+  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
+  rusca:
+    address: 5.153.231.43
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -499,7 +518,11 @@ servers:
   gluck:
     address: 150.203.164.38
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https
+  mirror-anu:
+    address: 150.203.164.39
+    parents: gw-cecsit
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https
   # }}}
   # {{{ gw-conova
   sompek:
@@ -520,11 +543,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, 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, jessie, drbd-hosts
   ganeti-csail:
     address: 128.31.0.49
     parents: gw-bytemark
@@ -533,11 +556,11 @@ 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
-    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
+    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
@@ -546,22 +569,30 @@ servers:
     address: 128.31.0.50
     parents: ganeti-csail
     hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+  x86-csail-02:
+    address: 128.31.0.68
+    parents: ganeti-csail
+    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, apache-https
   # }}}
   # {{{ gw-dgi
   storace:
     address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, acpid-hosts, wheezy, dl380, nfs-client, hassrvfs
+    hostgroups: computers, 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, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -571,15 +602,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, 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, jessie, drbd-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, wheezy
+    hostgroups: computers, megaraid, service, jessie
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
@@ -591,43 +622,55 @@ servers:
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
     hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+  gigault:
+    address: 194.177.211.204
+    parents: ganeti-grnet
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+  vittoria:
+    address: 194.177.211.205
+    parents: ganeti-grnet
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https
   # }}}
   # {{{ gw-isc
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
+  mirror-isc:
+    address: 149.20.20.7
+    parents: gw-isc
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula
   # }}}
   # {{{ gw-leaseweb
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
   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, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+    hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
   # }}}
   # {{{ gw-linaro
   arm-linaro-01:
@@ -641,21 +684,16 @@ servers:
   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:
     address: 129.143.160.6
     parents: gw-karlsruhe
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
     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
     parents: gw-man-da
@@ -667,33 +705,25 @@ servers:
   bendel:
     address: 82.195.75.100
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, wheezy, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, jessie, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs
   master:
     address: 82.195.75.110
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
-  mipsel-manda-01:
-    address: 82.195.75.72
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
-  mipsel-manda-02:
-    address: 82.195.75.74
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, spamd, heavy-exim, highload
   fils:
     address: 82.195.75.89
     parents: ganeti3
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
   fayrfax:
     address: 82.195.75.82
     parents: ganeti3
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
   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
@@ -701,7 +731,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, jessie
   geo1:
     address: 82.195.75.105
     parents: ganeti3
@@ -709,7 +739,7 @@ servers:
   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
@@ -717,7 +747,7 @@ servers:
   stockhausen:
     address: 82.195.75.108
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, acpid-hosts
+    hostgroups: computers, service, kvmdomains, jessie
   ganeti3:
     address: 82.195.75.111
     parents: gw-man-da
@@ -725,7 +755,7 @@ 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, apache-https, rsyncd-hosts, xinetd-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
@@ -733,23 +763,27 @@ servers:
   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
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, jessie
   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
-    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
+    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-02:
     address: 82.195.75.74
     parents: gw-man-da
-    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
+    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
+  seger:
+    address: 82.195.75.93
+    parents: ganeti3
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres94-hosts, jessie
   # }}}
   # {{{ gw-marist
   zani:
@@ -761,32 +795,35 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, jessie, hasvarlogfs, apache2-hosts, no-bacula, apache-https
+    hostgroups: computers, service, dl360, hassrvfs, 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, 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
-  # malo TODO
-  mayer:
-    address: 140.211.166.78
+    hostgroups: computers, service, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, jessie, hasvarlogfs, apache-https, spamd
+  pieta:
+    address: 140.211.166.195
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, wheezy
-#  mayr:
-#    address: 140.211.166.58
-#    parents: gw-osuosl
-#    hostgroups: computers, buildd, hasbootfs
+    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
+  pizzetti:
+    address: 140.211.166.198
+    parents: pieta
+    hostgroups: computers, jessie, hassrvfs, porterbox
   merulo:
     address: 140.211.166.46
     parents: gw-osuosl
     hostgroups: computers, porterbox, hasusrfs, wheezy
-  parry:
-    address: 140.211.15.153
-    parents: gw-osuosl
-    hostgroups: computers, jessie, buildd, hassrvfs, sw-raid
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
@@ -794,13 +831,12 @@ servers:
   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, xinetd-hosts, jessie
     #, bosserver
   rietz2:
     address: 140.211.166.44
     parents: rietz
     hostgroups: secondary-IPs
-  # zee TODO
   # }}}
   # {{{ gs-rapidswitch
   caballero:
@@ -812,7 +848,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, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, xinetd-hosts, hasvarlogfs
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -824,25 +860,17 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-sil
-  eder:
-    address: 86.59.118.151
-    parents: gw-sil
-    hostgroups: computers, porterbox, jessie, hassrvfs
-  eysler:
-    address: 86.59.118.152
-    parents: gw-sil
-    hostgroups: computers, buildd, wheezy
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
-    hostgroups: computers, buildd, wheezy, sw-raid
+    hostgroups: computers, buildd, jessie, sw-raid
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -867,34 +895,30 @@ 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
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  pasquini:
+  ubc-bl7:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  luchesi:
-    address: 206.12.19.214
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+  ubc-bl6:
+    address: 206.12.19.216
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
-  tristano:
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+  ubc-bl2:
+    address: 206.12.19.212
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+  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
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
+  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
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
   ganeti2:
     address: 206.12.19.23
     parents: sw-ubcece-kais
@@ -902,11 +926,7 @@ servers:
   tchaikovsky:
     address: 206.12.19.118
     parents: ganeti2
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
-  brahms:
-    address: 206.12.19.115
-    parents: ganeti2
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
   geo2:
     address: 206.12.19.113
     parents: ganeti2
@@ -922,29 +942,21 @@ servers:
   fano:
     address: 206.12.19.110
     parents: ganeti2
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
   finzi:
     address: 206.12.19.111
     parents: ganeti2
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
-  gabrielli:
-    address: 206.12.19.17
-    parents: sw-ubcece-kais
-    hostgroups: computers, porterbox, jessie
-  corelli:
-    address: 206.12.19.16
-    parents: sw-ubcece-kais
-    hostgroups: computers, buildd, wheezy
   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, service, jessie
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -952,19 +964,19 @@ servers:
   lotti:
     address: 206.12.19.121
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, jessie, 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
@@ -976,39 +988,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
-  jenkins:
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https
+  jenko:
     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, jessie, hassrvfs, no-bacula
-  popov:
-    address: 206.12.19.119
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   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
@@ -1016,39 +1020,39 @@ 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
   # }}}
   # {{{ gw-umn
-  saens:
+  #saens:
+  #  address: 128.101.240.212
+  #  parents: gw-umn
+  #  hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+  mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    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, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-unicamp
-  asgard:
-    address: 143.106.167.145
-    parents: gw-unicamp
-    hostgroups: layer3-infrastructure
   prokofiev:
-    address: 143.106.167.147
+    address: 177.220.10.78
     parents: gw-unicamp
     hostgroups: computers, jessie, service
   powerpc-unicamp-01:
-    address: 143.106.167.149
+    address: 177.220.10.79
     parents: prokofiev
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
-    address: 143.106.167.135
+    address: 177.220.10.80
     parents: prokofiev
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, jessie
   plummer:
-    address: 143.106.167.146
+    address: 177.220.10.81
     parents: prokofiev
     hostgroups: computers, porterbox, hassrvfs, jessie
   # }}}
@@ -1056,7 +1060,7 @@ servers:
   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, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1108,7 +1112,7 @@ 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
@@ -1118,7 +1122,7 @@ servers:
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, jessie, 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
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1198,6 +1202,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
@@ -1292,9 +1298,6 @@ hostgroups:
   hasorgfs:
     alias: hosts with a /org filesystem
     private: 1
-  hasvarfs:
-    alias: hosts with a /var filesystem
-    private: 1
   hasvarlogfs:
     alias: hosts with a /var/log filesystem
     private: 1
@@ -1389,13 +1392,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
 
   -
@@ -1408,11 +1411,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
     hostgroups: hasbootfs
-  -
-    name: disk usage on /var
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hostgroups: hasvarfs
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -1423,11 +1421,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
     hostgroups: hassrvfs
-  -
-    name: disk usage on /tmp
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1479,14 +1472,14 @@ 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
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /srv/ftp-master.debian.org"
     hosts: franck
   -
     name: disk usage on /storage/snapshot-farm-1
@@ -1551,11 +1544,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: prokofiev
+    excludehosts: prokofiev, pieta
   -
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-    hosts: prokofiev
+    hosts: prokofiev, pieta
   -
     name: swap usage - percent
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
@@ -1570,11 +1563,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"
@@ -1598,7 +1596,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: storace
+    excludehosts: backuphost, storace, backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1661,6 +1659,11 @@ services:
     hostgroups: computers
     normal_check_interval:  60
     retry_check_interval: 15
+  -
+    name: unexpected file - apt sources.list
+    servicegroups: apt
+    nrpe: "/usr/lib/nagios/plugins/negate /usr/lib/nagios/plugins/dsa-check-file -f /etc/apt/sources.list"
+    hostgroups: computers
   -
     name: upgraded libraries
     servicegroups: security
@@ -1723,7 +1726,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'"
@@ -1732,6 +1734,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
@@ -1880,6 +1883,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"
@@ -1889,6 +1893,7 @@ services:
     name: process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid'"
     hostgroups: acpid-hosts
+    excludehostgroups: jessie
   -
     name: unexpected process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
@@ -1915,7 +1920,7 @@ services:
     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
   -
@@ -1963,6 +1968,10 @@ services:
     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
+  -
+    name: "sso CRL"
+    nrpe: "if [ -e /var/lib/dsa/sso/ca.crl ]; then /usr/lib/nagios/plugins/dsa-check-crl-expire -w 129600 -c 86400 /var/lib/dsa/sso/ca.crl; else echo 'No sso/ca.crl on this host.'; fi"
+    hostgroups: computers
   # }}}
   # {{{ HW health/raid
   -
@@ -1995,7 +2004,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl180
-    excludehosts: schein, rietz
+    excludehosts: schein, rietz, mirror-anu, mirror-isc, mirror-umn
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -2020,6 +2029,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
     normal_check_interval: 120
     hostgroups: dl585
+  -
+    name: HW - hpssacli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
+    normal_check_interval: 120
+    hosts: mirror-anu, mirror-isc, mirror-umn
   ###
 #  -
 #    name: HW - edac status
@@ -2032,7 +2047,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
-    excludehosts: villa, lobos, schein, storace
+    excludehosts: villa, lobos, schein, storace, mirror-anu
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
@@ -2053,6 +2068,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
     normal_check_interval: 120
     hosts: storace
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present --ps-no-redundant --ignore-failed='PS1'"
+    normal_check_interval: 120
+    hosts: mirror-anu
   ###
   -
     name: RAID - 3ware
@@ -2152,11 +2172,11 @@ services:
     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
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --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 10 --helper-home-dir'"
     hosts: bendel
   -
     name: process - spamd - child
@@ -2190,7 +2210,7 @@ services:
     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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a 'postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
     hostgroups: heavy-postfix
   #
   -
@@ -2322,6 +2342,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+    excludehosts: klecker
+  -
+    name: process - apache2 - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:80 -c 1:150 -u www-data -a /usr/sbin/apache2"
+    hosts: klecker
+    depends: process - apache2 - master
   -
     name: unwanted process - apache2
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"
@@ -2332,7 +2358,7 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: klecker
+    excludehosts: klecker, oyens
     depends: process - apache2 - master
   -
     name: network service - http
@@ -2352,14 +2378,14 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
-    excludehosts: handel,menotti
+    excludehosts: menotti
     excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
-    hosts: handel,menotti
+    hosts: menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2379,8 +2405,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
@@ -2416,7 +2440,7 @@ services:
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: storace
+    hosts: storace, backuphost
   # }}}
   # {{{ power
 #  -
@@ -2558,6 +2582,22 @@ services:
     name: DNS SOA sync - alioth.debian.org
     check: "dsa_check_soas_add!denis.debian.org!alioth.debian.org"
     hosts: global
+  -
+    name: DNS SOA sync - debconf.net
+    check: "dsa_check_soas_add!denis.debian.org!debconf.net"
+    hosts: global
+  -
+    name: DNS SOA sync - debconf.org
+    check: "dsa_check_soas_add!denis.debian.org!debconf.org"
+    hosts: global
+  -
+    name: DNS SOA sync - debianday.org
+    check: "dsa_check_soas_add!denis.debian.org!debianday.org"
+    hosts: global
+  -
+    name: DNS SOA sync - dpkg.org
+    check: "dsa_check_soas_add!denis.debian.org!dpkg.org"
+    hosts: global
   -
     name: DNS - delegation and signature expiry
     hosts: global
@@ -2583,7 +2623,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
@@ -2591,12 +2631,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=11298 $HOSTADDRESS$ public"
+    runfrom: ubc-bl8
     hosts: giustini
   # }}}
   # {{{ porterbox
@@ -2608,55 +2648,53 @@ services:
     retry_check_interval: 15
   # }}}
   # {{{ openstack
-  -
-    name: process - openstack - memcached
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nobody -C memcached -a '/usr/bin/memcached -m 128 -p 11211 -u nobody -l 0.0.0.0'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - glance-registry
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u glance -C glance-registry -a '/usr/bin/python /usr/bin/glance-registry'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-api
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-api -a '/usr/bin/python /usr/bin/nova-api --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-api.log'"
-    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - memcached
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nobody -C memcached -a '/usr/bin/memcached -m 128 -p 11211 -u nobody -l 0.0.0.0'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - glance-registry
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u glance -C glance-registry -a '/usr/bin/python /usr/bin/glance-registry'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-api
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-api -a '/usr/bin/python /usr/bin/nova-api --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-api.log'"
+#    hostgroups: openstack-controller
   -
     name: process - openstack - nova-compute
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-compute -a '/usr/bin/python /usr/bin/nova-compute --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-compute.log --config-file=/etc/nova/nova-compute.conf'"
     hostgroups: openstack-compute
-  -
-    name: process - openstack - nova-cert
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-cert -a '/usr/bin/python /usr/bin/nova-cert --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-cert.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-conductor
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-conductor -a '/usr/bin/python /usr/bin/nova-conductor --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-conductor.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-consoleauth
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-consoleauth --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-consoleauth.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-scheduler
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-scheduler --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-scheduler.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-spicehtml5proxy
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-spicehtml5proxy --log-file /var/log/nova/nova-consoleproxy.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - neutron-server
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u neutron -C neutron-server -a '/usr/bin/python2.7 /usr/bin/neutron-server --config-file=/etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/neutron-server.log'"
-    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-cert
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-cert -a '/usr/bin/python /usr/bin/nova-cert --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-cert.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-conductor
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-conductor -a '/usr/bin/python /usr/bin/nova-conductor --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-conductor.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-consoleauth
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-consoleauth --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-consoleauth.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-scheduler
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-scheduler --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-scheduler.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-spicehtml5proxy
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-spicehtml5proxy --log-file /var/log/nova/nova-consoleproxy.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - neutron-server
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u neutron -C neutron-server -a '/usr/bin/python2.7 /usr/bin/neutron-server --config-file=/etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/neutron-server.log'"
+#    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
@@ -2699,7 +2737,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
   ###
   -
@@ -2726,7 +2764,7 @@ services:
   ####
   -
     name: puppetmaster cert
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"
+    nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"
     hosts: handel
     normal_check_interval: 60
     max_check_attempts: 2