Decommission pergolesi.d.o
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index d513ae4..5b36238 100644 (file)
@@ -8,7 +8,6 @@
 #  - *: check munin stats collection works
 #  - *: check backups are successful
 #  - *: unwanted: network: auth, discard, daytime, time (on some), cvs-pserver, rsync (on some), ftp (on some), http (on some)
-#  - mundy: salinfo_decode
 
 ---
 #############################
@@ -20,15 +19,6 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
-  gw-1und1:
-    address: 195.20.247.54
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: joerg
-#  gw-1und1-sec:
-#    address: 212.227.126.33
-#    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-accumu:
     address: 130.239.18.97
     parents: gw-ubcece
@@ -46,11 +36,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-arm:
-    address: 82.44.141.46
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-brainfood:
-    address: 70.103.162.1
+    address: 213.104.121.213
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-brown:
@@ -168,23 +154,27 @@ servers:
   # {{{ gw-1und1
   powell:
     address: 87.106.64.223
-    parents: gw-1und1
+    parents: gw-ubcece
     hostgroups: computers, service, acpid-hosts, wheezy
   pkgmirror-1and1:
     address: 213.165.95.4
     parents: powell
     hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+  babin:
+    address: 213.165.95.6
+    parents: powell
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   # }}}
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
     parents: gw-ubcece
     #parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, squeeze, bacula-client
+    hostgroups: computers, acpid-hosts, service, wheezy, bacula-client
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres91-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres91-hosts, wheezy
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -192,7 +182,7 @@ servers:
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze, apache-https, bacula-client
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https, bacula-client
   wieck:
     address: 195.20.242.89
     parents: gw-ubcece
@@ -213,27 +203,27 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, deadslow
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, deadslow
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   harris:
     address: 217.140.96.66
     parents: gw-arm
@@ -254,14 +244,14 @@ servers:
   # {{{ gw-brainfood
   murphy:
     address: 97.107.116.31
-    parents: gw-brainfood
+    parents: gw-ubcece
     hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
   # }}}
   # {{{ gw-brown
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, squeeze
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
   ries:
     address: 138.16.160.9
     parents: gw-brown
@@ -271,35 +261,35 @@ servers:
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
 
   milanollo:
     address: 5.153.231.2
@@ -327,6 +317,10 @@ servers:
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
     contacts: holger
+  binet:
+    address: 5.153.231.8
+    parents: gw-bytemark
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -339,27 +333,27 @@ servers:
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, squeeze
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, wheezy
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, wheezy
   # }}}
   # {{{ gw-cecsit
   gluck:
     address: 150.203.164.38
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-conova
   sompek:
     address: 217.196.149.225
     parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
   stadler:
     address: 217.196.149.226
     parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
   # }}}
   # {{{ gw-csail
   senfl:
@@ -385,22 +379,16 @@ servers:
   merulo:
     address: 192.25.206.58
     parents: gw-ftcollins
-    hostgroups: computers, porterbox, hasusrfs, squeeze
+    hostgroups: computers, porterbox, hasusrfs, wheezy
   mundy:
     address: 192.25.206.62
     parents: gw-ftcollins
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, wheezy
   spohr:
     address: 192.25.206.33
     parents: gw-ftcollins
     hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
   # }}}
-  # {{{ gw-freenet
-  pergolesi:
-    address: 62.104.23.252
-    parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
-  # }}}
   # {{{ gw-grnet
   barber:
     address: 194.177.211.203
@@ -409,28 +397,15 @@ servers:
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze, bacula-client
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
-  fasch:
-    address: 194.177.211.201
-    parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-    contacts: christoph
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
     hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https, squeeze
-  holter:
-    address: 194.177.211.202
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service, squeeze
-  krenek:
-    address: 194.177.211.207
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd, squeeze
   orff:
     address: 194.177.211.209
     parents: gw-grnet
@@ -438,7 +413,7 @@ servers:
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, squeeze
+    hostgroups: computers, acpid-hosts, megaraid, service, squeeze, nfs-server
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
@@ -468,26 +443,26 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, porterbox, sw-raid, hassrvfs, wheezy
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
     contacts: bzed
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, squeeze
+    hostgroups: computers, buildd, hasbootfs, wheezy
   # bartok TODO
   czerny:
     address: 82.195.75.109
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
   clementi:
     address: 82.195.75.103
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
   bendel:
     address: 82.195.75.100
     parents: ganeti3
@@ -499,7 +474,12 @@ servers:
   fils:
     address: 82.195.75.89
     parents: ganeti3
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    contacts: christoph
+  fayrfax:
+    address: 82.195.75.82
+    parents: ganeti3
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
   vento:
     address: 82.195.75.98
@@ -516,27 +496,27 @@ servers:
   unger:
     address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, service, dl360, acpid-hosts, squeeze
+    hostgroups: computers, service, dl360, acpid-hosts, wheezy
   diamond:
     address: 82.195.75.108
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, bind9-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze, bacula-client
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy, bacula-client
   geo1:
     address: 82.195.75.105
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
+    hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
   handel:
     address: 82.195.75.104
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
+    hostgroups: computers, service, kvmdomains, apache2-hosts, wheezy, apache-https
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, wheezy
   ganeti3:
     address: 82.195.75.111
     parents: gw-man-da
@@ -564,7 +544,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, heavy-exim, squeeze, hasvarlogfs
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -577,7 +557,7 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, squeeze
+    hostgroups: computers, buildd, hasbootfs, wheezy
 #  mayr:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
@@ -585,15 +565,11 @@ servers:
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
-    hostgroups: computers, squeeze, buildd, hassrvfs
+    hostgroups: computers, wheezy, buildd, hassrvfs
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
     hostgroups: computers, wheezy, hassrvfs
-  piston:
-    address: 140.211.15.154
-    parents: gw-osuosl
-    hostgroups: computers, wheezy, hassrvfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -645,7 +621,7 @@ servers:
   eysler:
     address: 86.59.118.152
     parents: gw-sil
-    hostgroups: computers, buildd, squeeze
+    hostgroups: computers, buildd, wheezy
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
@@ -659,7 +635,7 @@ servers:
   vasks:
     address: 217.196.43.140
     parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
+    hostgroups: computers, nfs-server, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
     contact_groups: alioth-admins
     no-servicegroups: true
   wagner:
@@ -696,7 +672,7 @@ servers:
   spontini:
     address: 206.12.19.14
     parents: sw-ubcece-mcld
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
@@ -709,7 +685,7 @@ servers:
   pasquini:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   luchesi:
     address: 206.12.19.214
     parents: sw-ubcece-kais
@@ -717,15 +693,15 @@ servers:
   tristano:
     address: 206.12.19.213
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   boito:
     address: 206.12.19.216
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   bertali:
     address: 206.12.19.212
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   ganeti2:
     address: 206.12.19.23
     parents: sw-ubcece-kais
@@ -745,7 +721,7 @@ servers:
   brahms:
     address: 206.12.19.115
     parents: ganeti2
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   geo2:
     address: 206.12.19.113
     parents: ganeti2
@@ -777,21 +753,21 @@ servers:
   falla:
     address: 206.12.19.117
     parents: ganeti2
-    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   fano:
     address: 206.12.19.110
     parents: ganeti2
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
   finzi:
     address: 206.12.19.111
     parents: ganeti2
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
   fischer:
     address: 206.12.19.112
     parents: ganeti2
-    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
@@ -811,11 +787,11 @@ servers:
   salieri:
     address: 206.12.19.20
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, wheezy
   traetta:
     address: 206.12.19.21
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, wheezy
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -826,36 +802,36 @@ servers:
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   quantz:
     address: 206.12.19.122
-    parents: salieri
+    parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts, autofs
   nono:
     address: 206.12.19.123
-    parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, xinetd-hosts, apache2-hosts, apache-https
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https
   reger:
     address: 206.12.19.124
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, apache-https, heavy-exim
   danzi:
     address: 206.12.19.125
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, postgres91-hosts, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, xinetd-hosts
   dukas:
     address: 206.12.19.128
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs, apache-https
   tye:
     address: 206.12.19.129
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
   elgar:
     address: 206.12.19.130
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy
   berlioz:
     address: 206.12.19.131
     parents: traetta
@@ -863,35 +839,35 @@ servers:
   gombert:
     address: 206.12.19.132
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, heavy-exim, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, apache2-hosts
   jenkins:
     address: 206.12.19.133
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, wheezy
   blavet:
     address: 206.12.19.134
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
   barriere:
     address: 206.12.19.135
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
   diabelli:
     address: 206.12.19.136
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, bacula-client
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, bacula-client
   bizet:
     address: 206.12.19.137
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
   lilburn:
     address: 206.12.19.138
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs
   popov:
     address: 206.12.19.119
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   beach:
     address: 206.12.19.140
     parents: ganeti2
@@ -903,11 +879,11 @@ servers:
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs, hassrvfs
   menotti:
     address: 206.12.19.143
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
     #, apache-https
   coincy:
     address: 206.12.19.144
@@ -926,7 +902,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ugent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, wheezy
     contacts: luk
   # }}}
   # {{{ gw-umn
@@ -949,23 +925,23 @@ servers:
   hildegard:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   howells:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   hummel:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
   poulenc:
     address: 144.32.168.77
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
   # }}}
   # {{{ gw-zivit
   zandonai:
@@ -1046,6 +1022,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  bm-bl:
+    alias: HP blades at bytemark
+    private: 1
   dl585:
     alias: HP DL385 hosts
     private: 1
@@ -1372,7 +1351,7 @@ services:
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/mirrors"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/mirrors"
     hosts: beethoven, sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
@@ -1649,6 +1628,7 @@ services:
     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
+    excludehostgroups: freebsd
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -2020,11 +2000,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
     hostgroups: computers
     excludehostgroups: deadslow
-  -
-    name: unwanted process - portmap
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C portmap"
-    hostgroups: computers
-    excludehostgroups: nfs-client, nfs-server, deadslow
   -
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
@@ -2090,31 +2065,25 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: wheezy
-  -
-    name: RAID - arrayprobe
-    servicegroups: raid
-    nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehosts: franck
-    excludehostgroups: wheezy
-  -
-    name: RAID - arrayprobe
-    servicegroups: raid
-    nrpe: "sudo /usr/bin/arrayprobe -f /dev/cciss/c1d0"
-    hosts: franck
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
-    excludehosts: schein
+    excludehosts: schein, rietz
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
+    normal_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
-    hosts: schein
+    hosts: schein, rietz
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2132,7 +2101,7 @@ services:
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl585
+    hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
     excludehosts: villa, lobos, senfl, schein
   -
     name: HW - hpasmcli status
@@ -2146,9 +2115,9 @@ services:
     hosts: senfl, schein
  ###
   -
-    name: RAID - areca
+    name: RAID - 3ware
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-areca"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
     hosts: powell
  ###
   -
@@ -2487,40 +2456,19 @@ services:
     name: process - pglistener
     nrpe: "/usr/lib/nagios/plugins/check_procs -u pglisten -C python -a '/usr/bin/python /usr/share/pglistener/starter.py /etc/pglistener/pglistener.cfg /etc/pglistener/conf.d' -w 1: -c 1:"
     hosts: wagner, vasks
-
- ####
-  #-
-  #  name: process - xenconsoled
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenconsoled -a 'xenconsoled'"
-  #  hosts: piatti
-  #-
-  #  name: process - xenstored
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenstored -a '/usr/lib/xen-3.0.3-1/bin/xenstored --pid-file /var/run/xenstore.pid'"
-  #  hosts: piatti
-  #-
-  #  name: process - xend
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C python -a 'python /usr/lib/xen-3.0.3-1/bin/xend start'"
-  #  hosts: piatti
-#
- ####
-  -
-    name: process - libvirtd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C libvirtd -a '/usr/sbin/libvirtd -d'"
-    hosts: unger
-
  ###
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
-    hosts: fano, fasch, finzi, fils
+    hosts: fano, finzi, fils, fayrfax
     contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: fano, fasch, finzi, fils
+    excludehosts: fano, finzi, fils, fayrfax
     contact_groups: buildd
   -
     name: processes - zombie schroot
@@ -2528,6 +2476,11 @@ 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
+  -
+    name: processes - lvcreate
+    nrpe: "/usr/lib/nagios/plugins/check_procs -m 'ELAPSED' -c 500 -C lvcreate -u root -a 'lvcreate'"
+    hostgroups: buildd
+    contact_groups: +buildd
  ####
   -
     name: network service - gobby
@@ -2544,11 +2497,6 @@ services:
 
  ############ NFS Stuff ############
  ####
-  -
-    name: process - portmap
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C portmap -a '/sbin/portmap'"
-    hostgroups: nfs-client, nfs-server
-    excludehostgroups: wheezy
   -
     name: process - statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"