X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f4a90cdcc97db266a6d4db0d18e99a0f46286168;hb=1897b5458c1246320725e41dc5c43a3b7d362d1b;hp=bf5af53c05c46ae696ea42851578f27d817e7036;hpb=8516305ab4aea7fe322de6a30f88fc1961d01df0;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index bf5af53..f4a90cd 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -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,7 @@ 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
   # }}}
   # {{{ gw-conova
   sompek:
@@ -534,11 +539,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
@@ -560,6 +565,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 +576,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 +598,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 +618,51 @@ 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
   # }}}
   # {{{ 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 +682,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 +697,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, jessie
-  mipsel-manda-02:
-    address: 82.195.75.74
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
   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
@@ -731,7 +739,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 +747,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 +759,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 +767,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 +787,15 @@ 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, jessie
+    hostgroups: computers, service, dl380, jessie
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres94-hosts, jessie, hasvarlogfs, apache-https, spamd
+    hostgroups: computers, service, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, jessie, hasvarlogfs, apache-https, spamd
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
@@ -800,15 +812,6 @@ servers:
     address: 140.211.166.198
     parents: pieta
     hostgroups: computers, jessie, hassrvfs, porterbox
-  # 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
   merulo:
     address: 140.211.166.46
     parents: gw-osuosl
@@ -820,13 +823,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:
@@ -838,7 +840,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
@@ -850,21 +852,13 @@ 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
@@ -925,10 +919,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
@@ -944,21 +934,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
@@ -966,7 +948,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
@@ -1003,7 +985,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
@@ -1066,7 +1048,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
@@ -1128,7 +1110,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 #############################
@@ -1498,7 +1480,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
@@ -1615,7 +1597,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
@@ -1678,6 +1660,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
@@ -1907,6 +1894,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"
@@ -1981,6 +1969,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
   -
@@ -2340,6 +2332,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"
@@ -2432,7 +2430,7 @@ services:
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: storace
+    hosts: storace, backuphost
   # }}}
   # {{{ power
 #  -
@@ -2574,6 +2572,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
@@ -2611,7 +2625,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=10867 $HOSTADDRESS$ public"
     runfrom: ubc-bl8
     hosts: giustini
   # }}}