sonntag on jessie
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index 81492f8..dbc8e0a 100644 (file)
@@ -151,7 +151,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-unicamp:
-    address: 143.106.167.234
+    address: 177.220.10.129
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-utwente:
@@ -164,16 +164,17 @@ servers:
     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, jessie
+    hostgroups: computers, service, jessie
   pkgmirror-1and1:
     address: 213.165.95.4
     parents: powell
@@ -192,31 +193,27 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, jessie
-  chopin:
-    address: 195.20.242.124
-    parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres94-hosts, jessie
-  soler:
-    address: 195.20.242.126
-    parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, jessie, 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, 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
@@ -288,41 +285,41 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
+    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, jessie
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie
   bm-bl9:
     address: 5.153.231.249
     parents: gw-bytemark
@@ -386,6 +383,10 @@ servers:
     address: 5.153.231.11
     parents: ganeti-bytemark
     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
@@ -455,11 +456,11 @@ servers:
   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
@@ -478,7 +479,7 @@ 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
@@ -491,6 +492,10 @@ servers:
     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:
@@ -513,7 +518,23 @@ 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, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror, apache-https
+  mirror-anu2:
+    address: 150.203.164.60
+    parents: mirror-anu
+    hostgroups: secondary-IPs
+  mirror-anu3:
+    address: 150.203.164.61
+    parents: mirror-anu
+    hostgroups: secondary-IPs
+  mirror-anu4:
+    address: 150.203.164.62
+    parents: mirror-anu
+    hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
   sompek:
@@ -534,11 +555,11 @@ servers:
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
-    hostgroups: computers, service, dl360, acpid-hosts, jessie, 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, jessie, drbd-hosts
+    hostgroups: computers, service, dl360, jessie, drbd-hosts
   ganeti-csail:
     address: 128.31.0.49
     parents: gw-bytemark
@@ -551,7 +572,7 @@ servers:
   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
@@ -560,6 +581,10 @@ 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
@@ -567,19 +592,19 @@ servers:
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts
+    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, jessie, 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:
@@ -589,15 +614,15 @@ servers:
   grnet-node01:
     address: 194.177.211.195
     parents: gw-grnet
-    hostgroups: computers, service, dl380, acpid-hosts, jessie, 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, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, jessie, drbd-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, jessie
+    hostgroups: computers, megaraid, service, jessie
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
@@ -609,43 +634,67 @@ 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, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
+  mirror-isc2:
+    address: 149.20.20.19
+    parents: mirror-isc
+    hostgroups: secondary-IPs
+  mirror-isc3:
+    address: 149.20.20.19
+    parents: mirror-isc
+    hostgroups: secondary-IPs
+  mirror-isc-syncproxy:
+    address: 149.20.20.21
+    parents: mirror-isc
+    hostgroups: secondary-IPs
   # }}}
   # {{{ 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, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-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:
@@ -665,11 +714,10 @@ servers:
   zemlinsky:
     address: 129.143.160.6
     parents: gw-karlsruhe
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
     contacts: pkern
   # }}}
   # {{{ gw-man-da
-  # bartok TODO
   czerny:
     address: 82.195.75.109
     parents: gw-man-da
@@ -681,28 +729,20 @@ servers:
   bendel:
     address: 82.195.75.100
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, jessie, 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, jessie, 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
   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
@@ -715,7 +755,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
@@ -731,7 +771,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
@@ -739,7 +779,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, 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
@@ -751,7 +791,7 @@ servers:
   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
@@ -759,11 +799,15 @@ servers:
   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:
@@ -775,15 +819,17 @@ 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
+    address: 140.211.166.200
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, acpid-hosts, jessie
-  buxtehude:
-    address: 140.211.166.26
+    hostgroups: computers, service, dl380, jessie
+  beach:
+    address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres94-hosts, jessie, hasvarlogfs, apache-https, spamd
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, rsyncd-hosts, apache-https
+
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
@@ -796,15 +842,10 @@ servers:
     address: 140.211.166.197
     parents: pieta
     hostgroups: computers, hassrvfs, buildd, jessie
-  # malo TODO
-  mayer:
-    address: 140.211.166.78
-    parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, wheezy
-#  mayr:
-#    address: 140.211.166.58
-#    parents: gw-osuosl
-#    hostgroups: computers, buildd, hasbootfs
+  pizzetti:
+    address: 140.211.166.198
+    parents: pieta
+    hostgroups: computers, jessie, hassrvfs, porterbox
   merulo:
     address: 140.211.166.46
     parents: gw-osuosl
@@ -816,13 +857,12 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, jessie
+    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:
@@ -834,7 +874,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, 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
@@ -846,25 +886,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:
@@ -892,27 +924,27 @@ servers:
   ubc-bl7:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    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
+    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, wheezy, drbd-hosts
+    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
+    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
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
   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
@@ -921,10 +953,6 @@ servers:
     address: 206.12.19.118
     parents: ganeti2
     hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
-  brahms:
-    address: 206.12.19.115
-    parents: ganeti2
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
   geo2:
     address: 206.12.19.113
     parents: ganeti2
@@ -940,21 +968,13 @@ 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, jessie
   lucatelli:
     address: 206.12.19.15
     parents: sw-ubcece-kais
@@ -962,7 +982,7 @@ servers:
   traetta:
     address: 206.12.19.21
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, jessie
+    hostgroups: computers, dl585, service, jessie
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -999,7 +1019,7 @@ servers:
     address: 206.12.19.132
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https
-  jenkins:
+  jenko:
     address: 206.12.19.133
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie
@@ -1007,14 +1027,6 @@ servers:
     address: 206.12.19.136
     parents: ganeti2
     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
-  beach:
-    address: 206.12.19.140
-    parents: ganeti2
-    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
@@ -1022,7 +1034,7 @@ servers:
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
   menotti:
     address: 206.12.19.143
     parents: ganeti2
@@ -1031,30 +1043,50 @@ servers:
     address: 206.12.19.146
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
+  buxtehude:
+    address: 206.12.19.147
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server
   # }}}
   # {{{ 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, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
+  mirror-umn2:
+    address: 128.101.240.215
+    parents: mirror-umn
+    hostgroups: secondary-IPs
+  mirror-umn3:
+    address: 128.101.240.216
+    parents: mirror-umn
+    hostgroups: secondary-IPs
+  mirror-umn4:
+    address: 128.101.240.217
+    parents: mirror-umn
+    hostgroups: secondary-IPs
   # }}}
   # {{{ gw-unicamp
   prokofiev:
-    address: 143.106.167.147
+    address: 177.220.10.140
     parents: gw-unicamp
     hostgroups: computers, jessie, service
   powerpc-unicamp-01:
-    address: 143.106.167.149
+    address: 177.220.10.141
     parents: prokofiev
     hostgroups: computers, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
-    address: 143.106.167.135
+    address: 177.220.10.142
     parents: prokofiev
     hostgroups: computers, hassrvfs, buildd, jessie
   plummer:
-    address: 143.106.167.146
+    address: 177.220.10.143
     parents: prokofiev
     hostgroups: computers, porterbox, hassrvfs, jessie
   # }}}
@@ -1062,7 +1094,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1124,7 +1156,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 #############################
@@ -1166,6 +1198,9 @@ hostgroups:
   general:
     alias: general purpose developer accessible machines
 
+  hpnewraid:
+    alias: new (2015+) machines where we need hpssacli instead of hpacucli
+    private: 1
   dl380:
     alias: HP DL380 hosts
     private: 1
@@ -1300,9 +1335,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
@@ -1375,21 +1407,21 @@ services:
     check: "check_ping!350.0,20%!600.0,40%"
     hostgroups: pingable
     excludehostgroups: layer3-infrastructure, high-RTT
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!600.0,20%!900.0,40%"
     hostgroups: high-RTT
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
     hostgroups: layer3-infrastructure
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   # }}}
@@ -1416,11 +1448,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
@@ -1431,11 +1458,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
@@ -1494,7 +1516,7 @@ services:
   -
     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
@@ -1528,13 +1550,13 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
     excludehostgroups: alioth
   -
     name: setup - local hostname etc-hosts
     nrpe: 'if getent ahosts `hostname` | grep -q 127.0; then echo "Warning: local hostname resolves to 127/8 address"; exit 1; else echo "OK: Hostname resolves to non-127/8 address."; exit 0; fi'
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
   # }}}
   # {{{ os health
   ####
@@ -1601,7 +1623,7 @@ services:
   -
     name: system - filesystem check
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     hostgroups: computers
   # }}}
@@ -1611,8 +1633,8 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: storace
-    normal_check_interval: 60
+    excludehosts: backuphost, storace, backuphost
+    check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   -
@@ -1620,7 +1642,7 @@ services:
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
     hosts: storace
-    normal_check_interval: 60
+    check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   -
@@ -1630,7 +1652,7 @@ services:
     runfrom: dinis
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
   -
     name: backup - bacula - last full backup
@@ -1639,7 +1661,7 @@ services:
     runfrom: dinis
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
   -
     name: process - bacula-fd
@@ -1665,15 +1687,20 @@ services:
     servicegroups: kernel
     nrpe: "/usr/lib/nagios/plugins/dsa-check-running-kernel"
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
     retry_check_interval: 5
   -
     name: apt - security updates
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    normal_check_interval:  60
+    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
@@ -1681,7 +1708,7 @@ services:
     #nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
     hostgroups: computers
     excludehostgroups: freebsd
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     notification_interval: 10080
   -
@@ -1720,7 +1747,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
     depends: process - samhain
-    normal_check_interval: 60
+    check_interval: 60
     retry_check_interval: 5
     excludehostgroups: brokensamhain
   -
@@ -1775,7 +1802,7 @@ services:
     check: dsa_check_ssh
     hostgroups: computers
     depends: process - sshd
-    normal_check_interval:  60
+    check_interval:  60
     notification_interval: 1440
   ####
   -
@@ -1793,18 +1820,13 @@ services:
   ###
   -
     name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
     hostgroups: computers
-    excludehostgroups: freebsd, armhf
+    excludehostgroups: freebsd
   -
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
     hostgroups: freebsd
-  -
-    name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
-    hostgroups: wheezy, jessie
-    excludehostgroups: freebsd
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1855,7 +1877,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
     runfrom: rainier
     hostgroups: computers
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     excludehostgroups: alioth, broken_mq
   -
@@ -1864,7 +1886,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
     runfrom: rapoport
     hostgroups: computers
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     excludehostgroups: alioth, broken_mq
   ###
@@ -1872,7 +1894,7 @@ services:
     name: local resolver
     nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
   -
     name: process - unbound
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
@@ -1903,6 +1925,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"
@@ -1944,7 +1967,7 @@ services:
     name: unwanted process - openvpn
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C openvpn"
     hostgroups: computers
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: unwanted process - gkrellmd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
@@ -1977,6 +2000,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
   -
@@ -2007,66 +2034,78 @@ services:
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
-    normal_check_interval: 120
+    check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl180
     excludehosts: schein, rietz
+    excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
-    normal_check_interval: 120
+    check_interval: 120
     hostgroups: bm-bl
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: schein, rietz
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure 1 1E:1"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: franck
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
-    normal_check_interval: 120
+    check_interval: 120
     hostgroups: dl585
+  -
+    name: HW - hpssacli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
+    check_interval: 120
+    hostgroups: hpnewraid
   ###
 #  -
 #    name: HW - edac status
 #    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
-#    normal_check_interval: 120
+#    check_interval: 120
     #hostgroups: computers
     #excludehosts: villa, lobos, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
-    normal_check_interval: 120
+    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"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: villa
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant  --ignore-failed='PS2'"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: lobos
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
-    normal_check_interval: 120
+    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'"
+    check_interval: 120
+    hosts: mirror-anu
   ###
   -
     name: RAID - 3ware
@@ -2091,6 +2130,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
+    excludehosts: ubc-bl8
+  -
+    name: RAID - DRBD
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All --ok-no-devices"
+    hosts: ubc-bl8
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2170,7 +2215,7 @@ services:
     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
@@ -2204,7 +2249,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
   #
   -
@@ -2298,7 +2343,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
     hostgroups: postfix-hosts
     depends: process - postfix - master
-    normal_check_interval: 120
+    check_interval: 120
   # }}}
   # {{{ mail - network service
   -
@@ -2336,6 +2381,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"
@@ -2369,31 +2420,31 @@ services:
     excludehosts: menotti
     excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
     hosts: menotti
     depends: "process - apache2 - master"
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_any_status
     hostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
     hostgroups: apache-https
     depends: network service - https
-    normal_check_interval: 60
+    check_interval: 60
   -
     name: unwanted network service - https
     check: dsa_check_port_closed!443
     hostgroups: apache2-hosts
     excludehostgroups: apache-https
-    normal_check_interval: 60
+    check_interval: 60
   # }}}
   # {{{ FTP
   -
@@ -2428,7 +2479,7 @@ services:
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: storace
+    hosts: storace, backuphost
   # }}}
   # {{{ power
 #  -
@@ -2473,7 +2524,7 @@ services:
     nrpe: "(/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0 > /dev/null || /usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0) && /usr/lib/nagios/plugins/check_procs -a schroot -s ZNs -c 0"
     hostgroups: buildd
     contact_groups: +buildd
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 24
     retry_check_interval: 5
   -
@@ -2523,14 +2574,14 @@ services:
     name: mirror sync - packages
     check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
     hosts: global
-    normal_check_interval: 15
+    check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
   -
     name: mirror sync - snapshot
     check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!3600:28800"
     hosts: global
-    normal_check_interval: 15
+    check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
   # }}}
@@ -2570,6 +2621,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
@@ -2597,7 +2664,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
     runfrom: ubc-bl8
     hosts: giustini
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
@@ -2607,7 +2674,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10791 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=11298 $HOSTADDRESS$ public"
     runfrom: ubc-bl8
     hosts: giustini
   # }}}
@@ -2616,7 +2683,7 @@ services:
     name: current chroots
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dchroots-current"
     hostgroups: porterbox
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
   # }}}
   # {{{ openstack
@@ -2681,7 +2748,7 @@ services:
     name: network service - ldaps cert
     check: dsa_check_cert!636
     depends: process - slapd
-    normal_check_interval: 60
+    check_interval: 60
     hosts: draghi
   ###
   -
@@ -2706,6 +2773,21 @@ services:
     check: check_tcp!873
     hosts: milanollo2
     depends: milanollo:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: mirror-isc2, mirror-isc-syncproxy
+    depends: mirror-isc:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: mirror-umn2, mirror-umn3
+    depends: mirror-umn:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: mirror-anu2, mirror-anu3
+    depends: mirror-anu:process - xinetd
   ###
   -
     name: process - icinga
@@ -2726,19 +2808,19 @@ services:
   -
     name: network service - sip-tls cert - 443
     check: dsa_check_cert!443
-    normal_check_interval: 60
+    check_interval: 60
     hosts: vogler
   -
     name: network service - sip-tls cert - 5061
     check: dsa_check_cert!5061
-    normal_check_interval: 60
+    check_interval: 60
     hosts: vogler
   ####
   -
     name: puppetmaster cert
     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
+    check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   # }}}