X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f55adbe426734c5f699ac56988e672dcafe063bc;hb=67d5661690b284fbd49b57abfea4f13641a94df7;hp=508e410e80e279237273419821d656cb91c5d238;hpb=d8d0ac0d55df0b109055a437e7cf69bf4ac4de3f;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 508e410..91e2d68 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -5,16 +5,9 @@
 # vim:set syntax=yaml:
 
 # TODO
-#  - spohr: hpasmd
-#  - *: mailq
 #  - *: 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
-
-# down:
-#  - sarti
-#  - leisner
 
 ---
 #############################
@@ -26,19 +19,14 @@ 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
     hostgroups: layer3-infrastructure
+  gw-bytemark:
+    address: 89.16.160.116
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-c3sl:
     address: 200.17.202.254
     parents: gw-ubcece
@@ -48,15 +36,11 @@ 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:
-    address: 128.148.34.1
+    address: 138.16.160.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-carnet:
@@ -88,11 +72,6 @@ servers:
     address: 194.177.211.193
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-helsinki:
-    address: 128.214.173.25
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: holger
   gw-isc:
     address: 149.20.20.1
     parents: gw-ubcece
@@ -105,7 +84,6 @@ servers:
     address: 82.195.75.126
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contacts: joerg, bzed
   gw-marist:
     address: 148.100.96.1
     parents: gw-ubcece
@@ -140,6 +118,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contact_groups: +alioth-admins
+    no-servicegroups: true
   gw-ubcece:
     address: 206.12.19.254
     hostgroups: layer3-infrastructure
@@ -170,69 +149,76 @@ servers:
   # {{{ gw-1und1
   powell:
     address: 87.106.64.223
-    parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, squeeze
-    contacts: joerg
+    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
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze, bacula-client
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy, bacula-client
   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
     #parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror, hasvarlogfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, security_mirror, hasvarlogfs
   # }}}
   # {{{ gw-accumu
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, squeeze, autofs
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, wheezy, autofs
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
   # }}}
   # {{{ gw-arm
   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
@@ -251,57 +237,118 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
   # {{{ gw-brainfood
-  old-master:
-    address: 97.107.116.29
-    parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze, bacula-client
   murphy:
-    address: 70.103.162.31
-    parents: gw-brainfood
+    address: 97.107.116.31
+    parents: gw-ubcece
     hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
   # }}}
   # {{{ gw-brown
   franck:
-    address: 128.148.34.3
+    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: 128.148.34.103
+    address: 138.16.160.9
     parents: gw-brown
-    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres91-hosts
+    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, wheezy, postgres91-hosts
+  # }}}
+  # {{{ gw-bytemark
+  bm-bl1:
+    address: 5.153.231.241
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl2:
+    address: 5.153.231.242
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl3:
+    address: 5.153.231.243
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl4:
+    address: 5.153.231.244
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl5:
+    address: 5.153.231.245
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl6:
+    address: 5.153.231.246
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl7:
+    address: 5.153.231.247
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl8:
+    address: 5.153.231.248
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+
+  milanollo:
+    address: 5.153.231.2
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server
+  picconi:
+    address: 5.153.231.3
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, heavy-exim, spamd
+  senfter:
+    address: 5.153.231.4
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+  adayevskaya:
+    address: 5.153.231.5
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy
+  pejacevic:
+    address: 5.153.231.6
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+    contacts: holger
+  piu-slave-bm-a:
+    address: 5.153.231.7
+    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:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, wheezy, high-RTT, security_mirror
     contacts: faw
   # }}}
   # {{{ gw-carnet
   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:
@@ -311,69 +358,49 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-csail
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-dgi
   argento:
     address: 93.94.130.160
     parents: gw-dgi
     hostgroups: computers, sw-raid, hassrvfs, wheezy
-    contacts: bzed
   # }}}
   # {{{ gw-ftcollins
   alkman:
     address: 192.25.206.63
     parents: gw-ftcollins
-    hostgroups: computers, buildd, acpid-hosts, squeeze
+    hostgroups: computers, buildd, acpid-hosts, wheezy
   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
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
   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
-    #, mptraid
   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
@@ -381,103 +408,103 @@ 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
-    hostgroups: computers, acpid-hosts, mptraid, buildd, squeeze
-  # }}}
-  # {{{ gw-helsinki
-  piatti:
-    address: 193.167.161.225
-    parents: gw-helsinki
-    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
-    contacts: holger
+    hostgroups: computers, acpid-hosts, mptraid, buildd, wheezy
   # }}}
   # {{{ gw-isc
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
     address: 129.143.160.6
     parents: gw-karlsruhe
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
+    contacts: pkern
   # }}}
   # {{{ gw-man-da
   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: czerny
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
   master:
     address: 82.195.75.110
-    parents: czerny
+    parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, bacula-client, spamd, heavy-exim, highload
   fils:
     address: 82.195.75.89
-    parents: czerny
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    parents: ganeti3
+    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
-    parents: czerny
+    parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, heavy-exim
   lully:
     address: 82.195.75.99
-    parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvarlogfs, bacula-client
+    parents: ganeti3
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs, bacula-client
   rem:
     address: 82.195.75.68
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, wheezy
   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: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, bind9-hosts
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
   draghi:
     address: 82.195.75.106
-    parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze, bacula-client
+    parents: ganeti3
+    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: unger
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
+    parents: ganeti3
+    hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
   handel:
     address: 82.195.75.104
-    parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, apache2-hosts, wheezy, apache-https
   kaufmann:
     address: 82.195.75.107
-    parents: unger
-    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
+    parents: ganeti3
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, wheezy
   ganeti3:
     address: 82.195.75.111
     parents: gw-man-da
@@ -485,12 +512,15 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, bacula-client
-
-#  lamb:
-#    address: 82.195.75.101
-#    parents: unger
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, bacula-client, rsyncd-hosts, xinetd-hosts
+  vieuxtemps:
+    address: 82.195.75.113
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, varnish-hosts
+  mailly:
+    address: 82.195.75.114
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-marist
   zappa:
@@ -502,20 +532,20 @@ 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
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, squeeze, hasvarlogfs
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs
   # malo TODO
   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
@@ -523,19 +553,15 @@ 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, squeeze, hassrvfs
-  piston:
-    address: 140.211.15.154
-    parents: gw-osuosl
-    hostgroups: computers, squeeze, hassrvfs
+    hostgroups: computers, wheezy, hassrvfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts, bind9-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, bind9-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -553,51 +579,41 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts, hasvarlogfs
+    hostgroups: computers, acpid-hosts, postgres91-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts, hasvarlogfs
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, sparc, squeeze
+    hostgroups: computers, porterbox, sw-raid, sparc, wheezy
     contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-sil
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze, bacula-client
+    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, wheezy, bacula-client
   eder:
     address: 86.59.118.151
     parents: gw-sil
-    hostgroups: computers, porterbox, squeeze, hassrvfs
-  englund:
-    address: 86.59.118.148
-    parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, hassrvfs, megactl
-    # which raid?
+    hostgroups: computers, porterbox, wheezy, hassrvfs
   eysler:
     address: 86.59.118.152
     parents: gw-sil
-    hostgroups: computers, buildd, squeeze
-  lindberg:
-    address: 86.59.118.149
-    parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
-    # which raid?
+    hostgroups: computers, buildd, wheezy
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs, apache2-hosts
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -607,13 +623,21 @@ 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:
     address: 217.196.43.132
     parents: gw-telegraaf2
     hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres91-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
+    no-servicegroups: true
+  anonscm:
+    address: 217.196.43.132
+    parents: wagner
+    contact_groups: alioth-admins
+    hostgroups: secondary-IPs
+    no-servicegroups: true
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -636,64 +660,64 @@ 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
     parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, wheezy, autofs
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   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
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
   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
     hostgroups: notacomputer
   tchaikovsky:
     address: 206.12.19.118
-    parents: luchesi
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, squeeze
+    parents: ganeti2
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
   dinis:
     address: 206.12.19.139 
     parents: ganeti2
-    hostgroups: computers, general, kvmdomains, squeeze, bacula-client
+    hostgroups: computers, general, kvmdomains, wheezy, bacula-client
   wolkenstein:
     address: 206.12.19.116
-    parents: dijkstra
+    parents: ganeti2
     hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy, bacula-client
   brahms:
     address: 206.12.19.115
-    parents: dijkstra
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, squeeze
+    parents: ganeti2
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   geo2:
     address: 206.12.19.113
-    parents: dijkstra
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
+    parents: ganeti2
+    hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
   morricone:
     address: 206.12.19.9
     parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
+    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
   stabile:
     address: 206.12.19.13
     parents: sw-ubcece-kais
@@ -716,44 +740,46 @@ servers:
     check_command: dsa_check_always_ok
   falla:
     address: 206.12.19.117
-    parents: luchesi
-    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
+    parents: ganeti2
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   fano:
     address: 206.12.19.110
-    parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    parents: ganeti2
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    contacts: christoph
   finzi:
     address: 206.12.19.111
-    parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    parents: ganeti2
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    contacts: christoph
   fischer:
     address: 206.12.19.112
-    parents: luchesi
-    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
+    parents: ganeti2
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
-    hostgroups: computers, porterbox, squeeze
+    hostgroups: computers, porterbox, wheezy
   corelli:
     address: 206.12.19.16
     parents: sw-ubcece-kais
-    hostgroups: computers, buildd, squeeze
+    hostgroups: computers, buildd, wheezy
   lucatelli:
     address: 206.12.19.15
     parents: sw-ubcece-kais
-    hostgroups: computers, buildd, squeeze, deadslow
+    hostgroups: computers, buildd, wheezy
   rossini:
     address: 206.12.19.19
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, wheezy
   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
@@ -761,119 +787,123 @@ servers:
   lotti:
     address: 206.12.19.121
     parents: sw-ubcece-kais
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+    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: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, heavy-exim
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, apache-https, heavy-exim
   danzi:
     address: 206.12.19.125
-    parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts, xinetd-hosts
+    parents: ganeti2
+    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
+    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, squeeze, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy
   berlioz:
     address: 206.12.19.131
     parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https, bacula-client
   gombert:
     address: 206.12.19.132
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim, apache2-hosts
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, apache2-hosts
   jenkins:
     address: 206.12.19.133
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+    hostgroups: computers, service, kvmdomains, wheezy
   blavet:
     address: 206.12.19.134
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, 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, squeeze, 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: dijkstra
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs
   popov:
     address: 206.12.19.119
-    parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   beach:
     address: 206.12.19.140
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, postgres91-hosts, nfs-client, apache2-hosts, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs
   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
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy
   stanley:
     address: 206.12.19.145
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
+  muffat:
+    address: 206.12.19.146
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-ugent
   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
   saens:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-utwente
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, wheezy, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -883,23 +913,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:
@@ -980,6 +1010,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
@@ -989,9 +1022,9 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
-  megactl:
-    alias: Hosts with LSI Logic MegaRAID, but not usable with megaraid check
-    private: 1
+#  megactl:
+#    alias: Hosts with LSI Logic MegaRAID, but not usable with megaraid check
+#    private: 1
   megaraid:
     alias: Hosts with LSI Logic MegaRAID
     private: 1
@@ -1028,6 +1061,9 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
+  varnish-hosts:
+    alias: hosts running varnish
+    private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -1053,9 +1089,6 @@ hostgroups:
   postgres84-hosts:
     alias: hosts running postgres84
     private: 1
-  postgres90-hosts:
-    alias: hosts running postgres90
-    private: 1
   postgres91-hosts:
     alias: hosts running postgres91
     private: 1
@@ -1155,6 +1188,8 @@ servicegroups:
     alias: buildd checks
   raid:
     alias: raid checks
+  backup:
+    alias: backup checks
   kernel:
     alias: kernel checks
   weaksshkeys:
@@ -1210,7 +1245,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -w 10% -c 5%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/srv/snapshot.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 3%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/srv/snapshot.debian.org"
     hosts: stabile
   -
     name: disk usage - all
@@ -1254,12 +1289,17 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts: stabile, beach
+    hosts:  beach
+  -
+    name: disk usage on /srv
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
+    hosts: stabile
   -
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, powell, piatti
+    hosts: saens
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1299,12 +1339,12 @@ 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
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 94 98 /srv/snapshot.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 98 99 /srv/snapshot.debian.org"
     hosts: stabile
   -
     name: disk usage on /srv/snapshot.debian.org
@@ -1359,12 +1399,12 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    excludehostgroups: wheezy
     normal_check_interval:  60
     retry_check_interval: 15
  ####
   -
     name: backup
+    servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
     normal_check_interval: 60
@@ -1372,24 +1412,38 @@ services:
     retry_check_interval: 5
   -
     name: backup server config
+    servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
     hosts: beethoven
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   -
-    name: backup - bacula
-    remotecheck: "sudo /usr/lib/nagios/plugins/dsa-check-bacula -H $HOSTNAME$"
+    name: backup - bacula - last backup
+    servicegroups: backup
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula $HOSTNAME$.debian.org"
     runfrom: dinis
     hostgroups: bacula-client
+    normal_check_interval:  60
+    retry_check_interval: 15
+  -
+    name: backup - bacula - last full backup
+    servicegroups: backup
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula -w 840 -c 1560 $HOSTNAME$.debian.org F"
+    runfrom: dinis
+    hostgroups: bacula-client
+    normal_check_interval:  60
+    retry_check_interval: 15
   -
     name: process - bacula-fd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
+    servicegroups: backup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: computers
     excludehostgroups: freebsd
     excludehosts: wagner, vasks
   -
     name: process - bacula-fd
+    servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: freebsd
 
@@ -1432,11 +1486,11 @@ services:
   #  retry_check_interval: 5
 
  ####
-  -
-    name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
-    hostgroups: computers
-    excludehosts: wagner, vasks
+  #-
+  #  name: puppet
+  #  nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
+  #  hostgroups: computers
+  #  excludehosts: wagner, vasks
 
  ####
   -
@@ -1562,6 +1616,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
@@ -1685,12 +1740,12 @@ services:
     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 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
-    excludehosts: powell, wagner
+    excludehosts: wagner, picconi
     excludehostgroups: deadslow
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: powell, wagner
+    hosts: wagner, 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'"
@@ -1933,11 +1988,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"
@@ -1978,6 +2028,14 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /var/run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
+    excludehostgroups: wheezy
+  -
+    # wheezy:
+    name: process - mdadm monitor
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
+    hostgroups: sw-raid
+    excludehostgroups: squeeze
   -
     name: RAID - sw raid
     servicegroups: raid
@@ -1995,30 +2053,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
-  -
-    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
@@ -2036,7 +2089,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
@@ -2050,9 +2103,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
  ###
   -
@@ -2080,11 +2133,11 @@ services:
     hostgroups: mptraid
 
  ###
-  -
-    name: RAID - megactl
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megactl"
-    hostgroups: megactl
+#  -
+#    name: RAID - megactl
+#    servicegroups: raid
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megactl"
+#    hostgroups: megactl
  ###
   -
     name: RAID - DRBD
@@ -2189,11 +2242,11 @@ services:
  ###
   -
     name: process - apache2 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache2 -a /usr/sbin/apache2"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
   -
     name: process - apache2 - worker
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2"
+    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
   -
@@ -2250,6 +2303,33 @@ services:
     excludehosts: ravel
     normal_check_interval: 60
 
+###
+  -
+    name: process - varnish - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+    hostgroups: varnish-hosts
+  -
+    name: process - varnish - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u nobody -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+    hostgroups: varnish-hosts
+    depends: process - varnish - master
+  -
+    name: network service - http
+    check: check_http
+    hostgroups: varnish-hosts
+    depends: process - varnish - master
+
+###
+
+# Alioth web URLs
+
+  -
+    name: network service - loggerhead
+    remotecheck: "/usr/lib/nagios/plugins/check_http -H anonscm.debian.org -u /loggerhead/"
+    hosts: anonscm
+    runfrom: tchaikovsky
+    depends: wagner:process - apache2 - master
+
  ####
   -
     name: process - named
@@ -2290,40 +2370,40 @@ services:
 
  ###
   #-
-  #  name: process - postresql81 - master
+  #  name: process - postgresql81 - master
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a '/usr/lib/postgresql/8.1/bin/postmaster -D /var/lib/postgresql/8.1/main -c config_file=/etc/postgresql/8.1/main/postgresql.conf'"
   #  hostgroups: postgres81-hosts
   #-
-  #  name: process - postresql81 - writer
+  #  name: process - postgresql81 - writer
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: writer process'"
   #  hostgroups: postgres81-hosts
-  #  depends: process - postresql81 - master
+  #  depends: process - postgresql81 - master
   #-
-  #  name: process - postresql81 - buffer
+  #  name: process - postgresql81 - buffer
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats buffer process'"
   #  hostgroups: postgres81-hosts
-  #  depends: process - postresql81 - master
+  #  depends: process - postgresql81 - master
   #-
-  #  name: process - postresql81 - collector
+  #  name: process - postgresql81 - collector
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats collector process'"
   #  hostgroups: postgres81-hosts
-  #  depends: process - postresql81 - master
+  #  depends: process - postgresql81 - master
  ####
   -
-    name: unwanted process - postresql
+    name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres91-hosts, deadslow
+    excludehostgroups: postgres84-hosts, postgres91-hosts, deadslow
+  -
+    name: unwanted process - postgresql 9.0
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
+    hostgroups: computers
   -
-    name: process - postresql91 - master
+    name: process - postgresql91 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
     hostgroups: postgres91-hosts
   -
-    name: process - postresql90 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.0/bin/postgres'"
-    hostgroups: postgres90-hosts
-  -
-    name: process - postresql84 - master
+    name: process - postgresql84 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
     hostgroups: postgres84-hosts
   -
@@ -2364,41 +2444,31 @@ 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
+    #nrpe: "/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0"
+    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
@@ -2415,10 +2485,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
   -
     name: process - statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"
@@ -2498,10 +2564,6 @@ services:
     name: DNS SOA sync - alioth.debian.org
     check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
     hosts: global
-  -
-    name: DNS SOA sync - 2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
-    check: "dsa_check_soas!2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
-    hosts: global
   -
     name: DNS SOA sync - 2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
@@ -2533,7 +2595,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7434 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7778 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini