bendel is now wheezy

[mirror/dsa-nagios.git] / config / nagios-master.cfg
diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg

index c06363d..a4c557b 100644 (file)
--- 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.120.29
-    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,12 +84,6 @@ servers:
      address: 82.195.75.126
      parents: gw-ubcece
      hostgroups: layer3-infrastructure
-    contacts: joerg, bzed
-  gw-man-da2:
-    address: 82.195.75.46
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: joerg, bzed
    gw-marist:
      address: 148.100.96.1
      parents: gw-ubcece
@@ -140,11 +113,6 @@ servers:
      address: 86.59.118.145
      parents: gw-ubcece
      hostgroups: layer3-infrastructure
-  gw-telegraaf2:
-    address: 217.196.40.15
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contact_groups: +alioth-admins
    gw-ubcece:
      address: 206.12.19.254
      hostgroups: layer3-infrastructure
@@ -163,7 +131,8 @@ servers:
      hostgroups: layer3-infrastructure
    gw-ynic:
      # really janet, because ynic is stupid about firewalling
-    address: 146.97.42.26
+    #address: 146.97.42.26
+    address: 146.97.41.66
      parents: gw-ubcece
      hostgroups: layer3-infrastructure
    gw-zivit:
@@ -175,144 +144,252 @@ 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, no-bacula
+  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-1und1-sec
-    hostgroups: computers, acpid-hosts, service, squeeze
+    parents: gw-ubcece
+    #parents: gw-1und1-sec
+    hostgroups: computers, acpid-hosts, service, wheezy
    chopin:
      address: 195.20.242.124
      parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres90-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
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
    soler:
      address: 195.20.242.126
      parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https
    wieck:
      address: 195.20.242.89
-    parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
+    parents: gw-ubcece
+    #parents: gw-1und1-sec
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, 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, 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
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, deadslow
    alain:
      address: 217.140.96.58
      parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
    alwyn:
      address: 217.140.96.59
      parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
    antheil:
      address: 217.140.96.60
      parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
    arne:
      address: 217.140.96.61
      parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
    arnold:
      address: 217.140.96.57
      parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
    harris:
      address: 217.140.96.66
      parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox
-  hartmann:
-    address: 217.140.96.67
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, deadslow
    hasse:
      address: 217.140.96.68
      parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
-  hebden:
-    address: 217.140.96.69
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
    henze:
      address: 217.140.96.70
      parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
    hoiby:
      address: 217.140.96.71
      parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
-  # }}}
-  # {{{ gw-brainfood
-  master:
-    address: 70.103.162.29
-    parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
-  murphy:
-    address: 70.103.162.31
-    parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
    # }}}
    # {{{ gw-brown
    franck:
-    address: 128.148.34.3
-    parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres90-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, squeeze
-  ries:
-    address: 128.148.34.103
+    address: 138.16.160.12
      parents: gw-brown
-    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
+  # }}}
+  # {{{ 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, xinetd-hosts
+  milanollo2:
+    address: 5.153.231.9
+    parents: milanollo
+    hostgroups: secondary-IPs
+  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, no-bacula
+  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, apache-https
+    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
+  bmdb1:
+    address: 5.153.231.10
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, postgres91-hosts
+  coccia:
+    address: 5.153.231.11
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client
+  backuphost:
+    address: 5.153.231.12
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy
+  philp:
+    address: 5.153.231.13
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
+  couper:
+    address: 5.153.231.14
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+  rainier:
+    address: 5.153.231.15
+    parents: gw-bytemark
+    hostgroups: computers, kvmdomains, wheezy, no-bacula
+  rapoport:
+    address: 5.153.231.16
+    parents: gw-bytemark
+    hostgroups: computers, kvmdomains, wheezy, no-bacula
+  delfin:
+    address: 5.153.231.17
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
+  wuiet:
+    address: 5.153.231.18
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
+  dinis:
+    address: 5.153.231.19
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy
+  donizetti:
+    address: 5.153.231.20
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs
+  dillon:
+    address: 5.153.231.22
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy
+  ticharich:
+    address: 5.153.231.23
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service
    # }}}
    # {{{ gw-c3sl
    santoro:
      address: 200.17.202.197
      parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, wheezy, high-RTT, security_mirror, no-bacula
      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, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, security_mirror, no-bacula
    # }}}
    # {{{ 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:
@@ -322,97 +399,45 @@ servers:
    steffani:
      address: 128.31.0.36
      parents: gw-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
    # }}}
    # {{{ gw-dgi
    argento:
      address: 93.94.130.160
      parents: gw-dgi
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
-    contacts: bzed
-  widor:
-    address: 93.94.130.161
-    parents: gw-dgi
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, squeeze
-    contacts: bzed
+    hostgroups: computers, sw-raid, hassrvfs, wheezy
    # }}}
    # {{{ 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
-  penalosa:
-    address: 192.25.206.68
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, hasbootfs, lenny
-    contacts: dannf
-  paer:
-    address: 192.25.206.11
-    parents: gw-ftcollins
-    hostgroups: computers, porterbox, hasbootfs, hashomefs, lenny
-  peri:
-    address: 192.25.206.15
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
-    contacts: dannf
-  samosa:
-    address: 192.25.206.57
-    parents: gw-ftcollins
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-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
+    hostgroups: computers, service, dl380, apache2-hosts, wheezy, no-bacula
    # }}}
    # {{{ 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
+    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
-  field:
-    address: 194.177.211.210
-    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
@@ -420,114 +445,109 @@ servers:
    rautavaara:
      address: 194.177.211.199
      parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, squeeze
-  scelsi:
-    address: 194.177.211.208
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, 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, no-bacula, wheezy
    # }}}
    # {{{ gw-isc
    schein:
      address: 149.20.20.6
      parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
    # }}}
    # {{{ 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
-    contacts: bzed
-  arcadelt:
-    address: 82.195.75.87
-    parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
-    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
+    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, wheezy, drbd-hosts
    bendel:
      address: 82.195.75.100
-    parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts
-  new-master:
+    parents: ganeti3
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, wheezy, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
+  master:
      address: 82.195.75.110
-    parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
-  kokkonen:
-    address: 82.195.75.97
-    parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
-  liszt:
-    address: 82.195.75.101
-    parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385, acpid-hosts, apache-https, lenny
-    contacts: bzed
-  heininen:
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
+  fils:
+    address: 82.195.75.89
+    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: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, heavy-exim
+  lully:
+    address: 82.195.75.99
+    parents: ganeti3
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs
    rem:
      address: 82.195.75.68
      parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, squeeze
-  sperger:
-    address: 82.195.75.34
-    parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, squeeze
-    contacts: bzed
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, wheezy
    unger:
      address: 82.195.75.102
      parents: gw-man-da
-    hostgroups: computers, service, dl360, acpid-hosts, squeeze
-  # byrd TODO
+    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, no-bacula
    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
+    parents: ganeti3
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy
    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
-#  lamb:
-#    address: 82.195.75.101
-#    parents: unger
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+    parents: ganeti3
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, wheezy
+  ganeti3:
+    address: 82.195.75.111
+    parents: gw-man-da
+    hostgroups: notacomputer
+  wilder:
+    address: 82.195.75.112
+    parents: ganeti3
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, 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:
@@ -539,12 +559,20 @@ servers:
    busoni:
      address: 140.211.15.34
      parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts, no-bacula
+  byrd:
+    address: 140.211.166.20
+    parents: gw-osuosl
+    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, 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
@@ -552,19 +580,15 @@ servers:
    parry:
      address: 140.211.15.153
      parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze, buildd, hassrvfs
+    hostgroups: computers, wheezy, buildd, hassrvfs
    partch:
      address: 140.211.15.152
      parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze, hassrvfs
-  piston:
-    address: 140.211.15.154
-    parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze, hassrvfs
+    hostgroups: computers, wheezy, hassrvfs, porterbox
    rietz:
      address: 140.211.166.43
      parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, bind9-hosts
      #, bosserver
    rietz2:
      address: 140.211.166.44
@@ -582,67 +606,37 @@ 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
+    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, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
    villa:
      address: 212.211.132.32
      parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
    # }}}
    # {{{ gw-sil
    beethoven:
      address: 86.59.118.146
      parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze
+    hostgroups: computers, hasbootfs, aacraid, service, acpid-hosts, wheezy
    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, apache2-hosts, squeeze, megactl
-    # which raid?
-  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
-  merikanto2:
-    address: 86.59.118.150
-    parents: merikanto
-    hostgroups: secondary-IPs
-  # }}}
-  # {{{ gw-telegraaf2
-  vasks:
-    address: 217.196.43.140
-    parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
-    contact_groups: alioth-admins
-  wagner:
-    address: 217.196.43.132
-    parents: gw-telegraaf2
-    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
-    contact_groups: alioth-admins
+    hostgroups: computers, buildd, wheezy
    # }}}
    # {{{ gw-ubcece
    sw-ubcece:
@@ -665,60 +659,60 @@ 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
+    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
+    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, wheezy, drbd-hosts
+  bertali:
+    address: 206.12.19.212
+    parents: sw-ubcece-kais
+    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
    wolkenstein:
      address: 206.12.19.116
-    parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, squeeze
+    parents: ganeti2
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
    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
-  duarte:
-    address: 206.12.19.114
-    parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze, nfs-server
-  bellini:
-    address: 206.12.19.7
-    parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, squeeze, autofs
-  morricone:
-    address: 206.12.19.9
-    parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
+    parents: ganeti2
+    hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
    stabile:
      address: 206.12.19.13
      parents: sw-ubcece-kais
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
    paganini:
      address: 206.12.19.10
      parents: sw-ubcece-kais
@@ -727,10 +721,6 @@ servers:
      address: 206.12.19.11
      parents: sw-ubcece-kais
      hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
-  vivaldi:
-    address: 206.12.19.12
-    parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
    # MSA 2000 (2012i)
    giustini:
      address: 192.168.2.6
@@ -739,38 +729,48 @@ servers:
      # unless we implement runfrom for host alive checks
      pingable: false
      check_command: dsa_check_always_ok
+  falla:
+    address: 206.12.19.117
+    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: 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
+    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
@@ -778,110 +778,110 @@ 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
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts, autofs
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, 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, 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, xinetd-hosts, autofs
-#  dukas:
-#    address: 206.12.19.128
-#    parents: traetta
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
-#  tye:
-#    address: 206.12.19.129
-#    parents: traetta
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, xinetd-hosts
+  tye:
+    address: 206.12.19.129
+    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
-  berlioz:
-    address: 206.12.19.131
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https
+    hostgroups: computers, service, kvmdomains, wheezy
    gombert:
      address: 206.12.19.132
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim
+    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, porterbox
    diabelli:
      address: 206.12.19.136
      parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https
    bizet:
      address: 206.12.19.137
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, no-bacula
    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, wheezy, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula
+  ullmann:
+    address: 206.12.19.141
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs
+  sonntag:
+    address: 206.12.19.142
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
+  menotti:
+    address: 206.12.19.143
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
+  stanley:
+    address: 206.12.19.145
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, no-bacula
+  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, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
    # }}}
    # {{{ gw-utwente
-  kassia:
-    address: 130.89.149.224
-    parents: gw-utwente
-    hostgroups: computers, service, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
-  kassia-sec:
-    address: 130.89.149.225
-    parents: kassia
-    hostgroups: secondary-IPs
-  kassia-ftp:
-    address: 130.89.149.226
-    parents: kassia
-    hostgroups: secondary-IPs
-  kassia-volatile:
-    address: 130.89.149.227
-    parents: kassia
-    hostgroups: secondary-IPs
    klecker:
      address: 130.89.148.10
      parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-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
@@ -891,33 +891,33 @@ servers:
    hildegard:
      address: 144.32.168.74
      parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
    howells:
      address: 144.32.168.75
      parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
    hummel:
      address: 144.32.168.76
      parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+    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:
      address: 80.245.147.46
      parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
    zelenka:
      address: 80.245.147.40
      parents: gw-zivit
-    hostgroups: computers, porterbox, hassrvfs, squeeze
+    hostgroups: computers, porterbox, hassrvfs, wheezy
    # }}}
    # }}}
  
@@ -943,6 +943,8 @@ hostgroups:
    notacomputer:
      alias: Systems that are not really systems.  Yeah :)
      private: 1
+  deadslow:
+    alias: Systems too slow to run any real checks
    freebsd:
      alias: freebsd
      private: 1
@@ -986,6 +988,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
@@ -995,9 +1000,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
@@ -1010,13 +1015,12 @@ hostgroups:
    wheezy:
      alias: Hosts running wheezy
  
-  lenny:
-    alias: Hosts running lenny
-
    kvmdomains:
      alias: Hosts that are KVM domains
      private: 1
  
+  drbd-hosts:
+    alias: hosts running drbd
    postfix-hosts:
      alias: hosts running postfix instead of exim
      private: 1
@@ -1035,6 +1039,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
@@ -1045,9 +1052,6 @@ hostgroups:
    amavis-hosts:
      alias: hosts running amavis
      private: 1
-  ftpd-hosts:
-    alias: hosts running vsftpd
-    private: 1
    #tftpd-hosts:
    #  alias: hosts running a tftpd (tftpd-hpa as a daemon)
    #  private: 1
@@ -1060,11 +1064,8 @@ hostgroups:
    #postgres81-hosts:
    #  alias: hosts running postgres81
    #  private: 1
-  postgres84-hosts:
-    alias: hosts running postgres84
-    private: 1
-  postgres90-hosts:
-    alias: hosts running postgres90
+  postgres91-hosts:
+    alias: hosts running postgres91
      private: 1
    no-ulogd:
      alias: hosts not running ulogd
@@ -1082,6 +1083,10 @@ hostgroups:
      alias: hosts with https services
      private: 1
  
+  no-bacula:
+    alias: hosts which are not being backed up with bacula
+    private: 1
+
    nfs-client:
      alias: hosts mounting filesystems using NFS
      private: 1
@@ -1115,6 +1120,9 @@ hostgroups:
    hasvarfs:
      alias: hosts with a /var filesystem
      private: 1
+  hasvarlogfs:
+    alias: hosts with a /var/log filesystem
+    private: 1
    hasusrfs:
      alias: hosts with a /usr filesystem
      private: 1
@@ -1142,6 +1150,9 @@ hostgroups:
      alias: machines with hight round trip times
      private: 1
  
+  security_mirror:
+    alias: hosts that are security mirrors
+    private: 1
  #############################
  # servicegroups
  #############################
@@ -1152,6 +1163,8 @@ servicegroups:
      alias: buildd checks
    raid:
      alias: raid checks
+  backup:
+    alias: backup checks
    kernel:
      alias: kernel checks
    weaksshkeys:
@@ -1172,7 +1185,7 @@ servicegroups:
  services:
    -
      name: PING
-    check: "check_ping!300.0,20%!600.0,40%"
+    check: "check_ping!350.0,20%!600.0,40%"
      hostgroups: pingable
      excludehostgroups: layer3-infrastructure, high-RTT
      normal_check_interval: 5
@@ -1201,9 +1214,14 @@ services:
    -
      name: disk usage - all
      servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 90 95"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount'"
      hostgroups: computers
-    excludehosts: sibelius
+    excludehosts: sibelius,stabile
+  -
+    name: disk usage - all
+    servicegroups: diskspace
+    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
      servicegroups: diskspace
@@ -1213,14 +1231,14 @@ services:
    -
      name: disk usage on /
      servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
      hostgroups: computers
-    excludehosts: kassia, spohr, liszt
+    excludehosts: spohr
    -
      name: disk usage on /
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: kassia, spohr, liszt
+    hosts: spohr
    -
      name: disk usage on /boot
      servicegroups: diskspace
@@ -1239,19 +1257,13 @@ services:
    -
      name: disk usage on /srv
      servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
      hostgroups: hassrvfs
-    excludehosts: ries
-  -
-    name: disk usage on /srv
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts: ries
    -
      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
@@ -1271,58 +1283,41 @@ services:
      name: disk usage on /var/lib/postgresql
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: samosa, stabile, sibelius, busoni
-
-  -
-    name: disk usage on /var/log
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 50 80 /var/log"
-    hosts: bendel
+    hosts: sibelius, busoni, buxtehude
    -
      name: disk usage on /var/log
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck, heininen
+    hostgroups: hasvarlogfs
    -
      name: disk usage on /var/spool/postfix
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/spool/postfix"
      hosts: bendel
-
-  #-
-  #  name: disk usage on /srv/morgue.debian.org
-  #  servicegroups: diskspace
-  #  nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
-  #  hosts: stabile
    -
      name: disk usage on /srv/mirrors
      servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /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 98 99 /srv/snapshot.debian.org"
+    hosts: stabile
    -
      name: disk usage on /srv/snapshot.debian.org
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
-    hosts: stabile,sibelius
+    hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-misc
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
      hosts: sibelius
    -
-    name: disk usage on /srv/fossology.debian.net
+    name: disk usage on /var/lib/postgresql/9.1/dak
      servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
-    hosts: vivaldi
-#  -
-#    name: disk usage on /vicepa
-#    servicegroups: diskspace
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
-#    hostgroups: hasvicepa
-  -
-    name: disk usage on /var/lib/postgresql/9.0/dak
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.0/dak"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.1/dak"
      hosts: franck
    -
      name: disk usage on /srv/ftp-master.debian.org
@@ -1334,6 +1329,26 @@ services:
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /srv/pgbackup"
      hosts: franck
+  -
+    name: disk usage on /srv/pgbackup
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/pgbackup"
+    hosts: beethoven
+  -
+    name: disk usage on /srv/git-backup
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/git-backup"
+    hosts: beethoven
+  -
+    name: disk usage on /srv/da-backup
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/da-backup"
+    hosts: beethoven
+  -
+    name: disk usage on /srv/bacula
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/bacula"
+    hosts: beethoven
  
   ############ All Computers ############
   ####
@@ -1342,24 +1357,55 @@ 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
+    excludehosts: backuphost
      normal_check_interval: 60
      max_check_attempts: 2
      retry_check_interval: 5
    -
      name: backup server config
+    servicegroups: backup
      nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: beethoven
+    hosts: beethoven, backuphost
      normal_check_interval: 60
      max_check_attempts: 2
      retry_check_interval: 5
+  -
+    name: backup - bacula - last backup
+    servicegroups: backup
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula $HOSTNAME$.debian.org"
+    runfrom: dinis
+    hostgroups: computers
+    excludehostgroups: buildd, porterbox, no-bacula
+    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 1080 -c 1560 $HOSTNAME$.debian.org F"
+    runfrom: dinis
+    hostgroups: computers
+    excludehostgroups: buildd, porterbox, no-bacula
+    normal_check_interval:  60
+    retry_check_interval: 15
+  -
+    name: process - bacula-fd
+    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
+  -
+    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
  
   ####
    -
@@ -1400,11 +1446,10 @@ 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
  
   ####
    -
@@ -1412,14 +1457,15 @@ services:
      nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
      hostgroups: computers
      excludehostgroups: freebsd
-    excludehosts: vasks, wagner
    -
      name: puppetized firewall
      nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
      hostgroups: computers
      excludehostgroups: freebsd
-    excludehosts: vasks, wagner
-
+ ####
+  - name: ganeti - job watcher paused
+    nrpe: "/usr/lib/nagios/plugins/negate /usr/lib/nagios/plugins/dsa-check-file -f /var/lib/ganeti/watcher.pause"
+    hostgroups: computers
   ####
    -
      name: process - samhain
@@ -1466,11 +1512,6 @@ services:
      name: processes - total
      nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
      hostgroups: computers
-    excludehosts: liszt
-  -
-    name: processes - total
-    nrpe: "/usr/lib/nagios/plugins/check_procs 800 1000"
-    hosts: liszt
   ####
    -
      name: swap usage - percent
@@ -1505,7 +1546,6 @@ services:
      servicegroups: weaksshkeys
      nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
      hostgroups: computers
-    excludehosts: wagner, vasks
      normal_check_interval:  60
   ####
    -
@@ -1526,21 +1566,20 @@ services:
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
      hostgroups: computers
      excludehostgroups: freebsd, armhf
-    excludehosts: vasks, wagner
    -
      name: process - munin-node
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
      hostgroups: freebsd
    -
      name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin -a '/usr/sbin/munin-node'"
-    hostgroups: armhf
+    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
      hostgroups: computers
      depends: process - munin-node
-    excludehosts: vasks, wagner
   ###
    -
      name: process - ntpd
@@ -1553,7 +1592,7 @@ services:
      hostgroups: computers
      depends: process - ntpd
      excludehosts: ancina
-    excludehostgroups: ntpsuckers
+    excludehostgroups: ntpsuckers, deadslow
      servicegroups: time
    #
    -
@@ -1571,7 +1610,7 @@ services:
   ###
    -
      name: process - cron
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C cron -a /usr/sbin/cron"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C cron -a /usr/sbin/cron"
      hostgroups: computers
  
   ###
@@ -1580,7 +1619,6 @@ services:
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
      hostgroups: computers
      excludehostgroups: freebsd
-    excludehosts: vasks, wagner
  
    -
      name: process - syslog-ng
@@ -1588,11 +1626,15 @@ services:
      hostgroups: freebsd
  
    -
-    name: remote logging
+    name: remote logging on lotti
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: lotti
+    hostgroups: computers
+  -
+    name: remote logging on lully
      remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-    runfrom: heininen
+    runfrom: lully
      hostgroups: computers
-    excludehosts: vasks, wagner
   ### MAIL STUFF
   ###
    -
@@ -1600,7 +1642,7 @@ services:
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
      hostgroups: computers
      excludehostgroups: postfix-hosts, mail-relay
-    excludehosts: master, busoni, quantz
+    excludehosts: master, busoni, quantz, buxtehude
    -
      name: process - exim
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
@@ -1610,11 +1652,11 @@ services:
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
      hostgroups: computers
      excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, quantz
+    excludehosts: master, busoni, quantz, buxtehude
    -
      name: process - exim
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, busoni, quantz
+    hosts: master, busoni, quantz, buxtehude
    -
      name: mail queue
      nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
@@ -1624,65 +1666,62 @@ services:
      name: process - clamav - clamd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u clamav -C clamd -a '/usr/sbin/clamd'"
      hostgroups: heavy-exim, heavy-postfix
-    hosts: wagner
    -
      name: service - clamav
      nrpe: "/usr/lib/nagios/plugins/check_clamd -H /var/run/clamav/clamd.ctl"
      hostgroups: heavy-exim, heavy-postfix
-    hosts: wagner
      depends: process - clamav - clamd
    -
      name: process - clamav - freshclam
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
-    hosts: wagner
      hostgroups: heavy-exim, heavy-postfix
    -
      name: unwanted process - clamav
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
      hostgroups: computers
-    excludehostgroups: heavy-exim, heavy-postfix
-    excludehosts: wagner
+    excludehostgroups: heavy-exim, heavy-postfix, deadslow
    -
      name: unwanted process - freshclam
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
      hostgroups: computers
-    excludehostgroups: heavy-exim, heavy-postfix
-    excludehosts: wagner
+    excludehostgroups: heavy-exim, heavy-postfix, 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 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
      hostgroups: spamd
-    excludehosts: powell, wagner
+    excludehosts: 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: 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'"
-    hosts: liszt, bendel
+    hosts: bendel
    -
      name: process - spamd - child
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
-    hosts: liszt, wagner, bendel
+    hosts: bendel
      hostgroups: spamd
      depends: process - spamd - master
    #
    -
      name: process - spamd - master
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
-    hosts: busoni
+    hosts: buxtehude
    -
      name: process - spamd - child
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
-    hosts: busoni
+    hosts: buxtehude
    #
    -
      name: unwanted process - spamd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
      hostgroups: computers
-    excludehostgroups: spamd
-    excludehosts: liszt, bendel, busoni, wagner
+    excludehostgroups: spamd, deadslow
+    excludehosts: bendel, busoni, buxtehude
  
   ###
    #-
@@ -1694,11 +1733,12 @@ services:
      name: unwanted process - greylistd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
      hostgroups: computers
+    excludehostgroups: deadslow
  
   ###
    -
      name: process - postgrey
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
      hostgroups: heavy-exim
    -
      name: process - postgrey
@@ -1709,17 +1749,8 @@ services:
      name: unwanted process - postgrey
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
      hostgroups: computers
-    excludehostgroups: heavy-postfix, heavy-exim
+    excludehostgroups: heavy-postfix, heavy-exim, deadslow
   ###
-  -
-    name: process - amavis - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd (master)'"
-    hosts: liszt
-  -
-    name: process - amavis - all
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd '"
-    hosts: liszt
-    depends: process - amavis - master
    -
      name: process - amavis - master
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd-new (master)'"
@@ -1734,8 +1765,7 @@ services:
      name: unwanted process - amavis
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C amavisd-new"
      hostgroups: computers
-    excludehostgroups: amavis-hosts
-    excludehosts: liszt
+    excludehostgroups: amavis-hosts, deadslow
   ###
    -
      name: process - weightd - master
@@ -1751,13 +1781,12 @@ services:
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u polw -a 'policyd-weight (child)'"
      hostgroups: heavy-postfix
      depends: process - weightd - master
-  #
+ ###
    -
      name: unwanted process - policyd-weight
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight"
      hostgroups: computers
-    excludehostgroups: heavy-postfix
-
+    excludehostgroups: heavy-postfix, deadslow
  
  
   ###
@@ -1806,17 +1835,12 @@ services:
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:30 -c 0:50 -u postfix -C local -a 'local -t unix'"
      hostgroups: postfix-hosts
      depends: process - postfix - master
-
-  -
-    name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:150 -c 0:200 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
-    hosts: liszt
-    depends: process - postfix - master
    -
-    name: process - postfix - smtp
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:350 -c 0:500 -u postfix -C smtp -a 'smtp -t unix -u -c'"
-    hosts: liszt
-    depends: process - postfix - master
+    name: unwanted process - openvpn
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C openvpn"
+    hostgroups: computers
+    normal_check_interval: 120
+
  
   ###
    -
@@ -1852,43 +1876,49 @@ services:
      name: setup - dsa config
      nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
      hostgroups: computers
-    excludehosts: wagner, vasks
+    normal_check_interval: 60
+  -
+    name: setup - local hostname etc-hosts
+    nrpe: 'if getent ahosts `hostname` | grep -q 127.0; then echo "Warning: local hostname resolves to 127/8 address"; exit 1; else echo "OK: Hostname resolves to non-127/8 address."; exit 0; fi'
+    hostgroups: computers
      normal_check_interval: 60
    -
      name: setup - ud-ldap freshness
      nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
-    excludehosts: wagner, vasks
      hostgroups: computers
    -
      name: system - available entropy
      nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy"
      event_handler: dsa_event_handler_restart_ekey
      hostgroups: computers
-    excludehosts: vasks, wagner
      excludehostgroups: freebsd
+  -
+    name: system - filesystem check
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
+    normal_check_interval:  60
+    retry_check_interval: 15
+    hostgroups: computers
   ###
    -
      name: local resolver
      nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
      hostgroups: computers
-    excludehosts: vasks, wagner
      normal_check_interval: 60
    -
      name: process - unbound
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
-    excludehosts: vasks, wagner
      hostgroups: unbound-hosts, squeeze, wheezy
   ###
    -
      name: process - uptimed
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
      hostgroups: computers
-    excludehosts: vasks, wagner
   ###
    -
      name: unwanted process - irqbalance
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
      hostgroups: computers
+    excludehostgroups: deadslow
  
   ####
   ###
@@ -1904,25 +1934,23 @@ services:
      name: unwanted process - gkrellmd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
      hostgroups: computers
-  -
-    name: unwanted process - portmap
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C portmap"
-    hostgroups: computers
-    excludehostgroups: nfs-client, nfs-server
+    excludehostgroups: deadslow
    -
      name: unwanted process - rpc.statd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
      hostgroups: computers
-    excludehostgroups: nfs-client, nfs-server
+    excludehostgroups: nfs-client, nfs-server, deadslow
    -
      name: unwanted process - inetd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
      hostgroups: computers
-    excludehosts: grieg, abel, alwyn, vasks
+    excludehosts: abel, alwyn
+    excludehostgroups: deadslow
    -
      name: unwanted process - snmpd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
      hostgroups: computers
+    excludehostgroups: deadslow
  
   ####
    -
@@ -1947,6 +1975,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
@@ -1958,30 +1994,31 @@ services:
      name: process - monit
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
      hostgroups: computers
-    excludehosts: vasks, wagner
+    excludehosts: quantz
      excludehostgroups: armhf
    -
      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: armhf
+    hostgroups: wheezy
    -
-    name: RAID - arrayprobe
+    name: HW - hpacucli status
      servicegroups: raid
-    nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehosts: franck
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
+    normal_check_interval: 120
+    hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: schein, rietz
    -
-    name: RAID - arrayprobe
+    name: HW - hpacucli status
      servicegroups: raid
-    nrpe: "sudo /usr/bin/arrayprobe -f /dev/cciss/c1d0"
-    hosts: franck
+    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"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
      normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460
-    excludehosts: kassia
+    hosts: schein, rietz
    -
      name: HW - hpacucli enclosure status
      servicegroups: raid
@@ -1994,24 +2031,18 @@ services:
      nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
      normal_check_interval: 120
      hostgroups: dl585
-  -
-    name: HW - hpacucli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:2 --ignore-transfer-speed=1I:1:3 --ignore-transfer-speed=1I:1:4 --ignore-transfer-speed=2I:1:5 --ignore-transfer-speed=2I:1:6"
-    normal_check_interval: 120
-    hosts: kassia
   ###
    -
      name: HW - hpasmcli status
      nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
      normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehosts: villa, lobos, liszt, senfl, schein
+    hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
+    excludehosts: villa, lobos, senfl, schein
    -
      name: HW - hpasmcli status
      nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
      normal_check_interval: 120
-    hosts: villa, lobos, liszt
+    hosts: villa, lobos
    -
      name: HW - hpasmcli status
      nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
@@ -2019,9 +2050,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
   ###
    -
@@ -2048,12 +2079,18 @@ services:
      nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-mpt"
      hostgroups: mptraid
  
+ ###
+#  -
+#    name: RAID - megactl
+#    servicegroups: raid
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megactl"
+#    hostgroups: megactl
   ###
    -
-    name: RAID - megactl
+    name: RAID - DRBD
      servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megactl"
-    hostgroups: megactl
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
+    hostgroups: drbd-hosts
   ###
    -
      name: process - slapd
@@ -2071,7 +2108,6 @@ services:
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
      hostgroups: computers
      excludehostgroups: freebsd, sparc
-    excludehosts: vasks, wagner
    -
      name: unexpected process - ulogd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
@@ -2103,11 +2139,6 @@ services:
  #    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
  #    hostgroups: bosserver
  #
- ###
-  -
-    name: process - inetd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C inetd -a '/usr/sbin/inetd'"
-    hosts: grieg, vasks
   ###
    -
      name: process - xinetd
@@ -2117,7 +2148,7 @@ services:
      name: unwanted process - xinetd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
      hostgroups: computers
-    excludehostgroups: xinetd-hosts
+    excludehostgroups: xinetd-hosts, deadslow
   ###
    -
      name: network service - finger
@@ -2130,7 +2161,7 @@ services:
      check: check_tcp!873
      hostgroups: rsyncd-hosts
      depends: process - xinetd
-    excludehosts: merikanto, rietz
+    excludehosts: rietz
    -
      name: network service - rsync
      check: check_tcp!873
@@ -2139,41 +2170,31 @@ services:
    -
      name: network service - rsync
      check: check_tcp!873
-    hosts: merikanto2
-    depends: merikanto:process - xinetd
-  #-
-  #  name: network service - rsync
-  #  check: check_tcp!873
-  #  hosts: kassia-sec
-  #  depends: kassia:process - xinetd
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: merikanto2
-    depends: merikanto:process - xinetd
+    hosts: milanollo2
+    depends: milanollo:process - xinetd
  
   ###
    -
-    name: process - nagios3
+    name: process - icinga
      # there is always one extra process per check currently running..
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C nagios3 -a '/usr/sbin/nagios3 -d /etc/nagios3/nagios.cfg'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
      hosts: tchaikovsky
  
   ###
    -
      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
    -
      name: unwanted process - apache2
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"
      hostgroups: computers
-    excludehostgroups: apache2-hosts
+    excludehostgroups: apache2-hosts, deadslow
  
    -
      name: network service - http
@@ -2199,13 +2220,13 @@ services:
      name: network service - https
      check: check_https
      hostgroups: apache-https
-    excludehosts: handel
+    excludehosts: handel,menotti
      depends: "process - apache2 - master"
      normal_check_interval: 120
    -
      name: network service - https
      check: dsa_check_https_want_auth
-    hosts: handel
+    hosts: handel,menotti
      depends: "process - apache2 - master"
      normal_check_interval: 120
    -
@@ -2218,11 +2239,29 @@ services:
      name: unwanted network service - https
      check: dsa_check_port_closed!443
      hostgroups: apache2-hosts
-    excludehostgroups: apache-https
+    excludehostgroups: apache-https, deadslow
      # ravel does ssh on port 443
      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
+
+###
+
   ####
    -
      name: process - named
@@ -2237,25 +2276,14 @@ services:
      name: unwanted process - named
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C named"
      hostgroups: computers
-    excludehostgroups: bind9-hosts
+    excludehostgroups: bind9-hosts, deadslow
  
   ####
-  -
-    name: process - vsftp - listener
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C vsftpd -a 'vsftpd: LISTENER'"
-    hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: klecker
-  -
-    name: process - vsftp - instance
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '"
-    hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: klecker
    -
      name: network service - ftp
      check: check_ftp
-    hostgroups: ftpd-hosts, uploadqueue
+    hostgroups: uploadqueue, security_mirror
      excludehosts: klecker
-    depends: process - vsftp - listener
    -
      name: network service - ftp
      check: check_ftp
@@ -2263,82 +2291,61 @@ services:
      depends: klecker:process - xinetd
  
   ####
+  #-
+  #  name: process - debianqueued
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
    -
      name: process - debianqueued
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak-unpriv -C debianqueued"
      hostgroups: uploadqueue
  
+
   ###
    #-
-  #  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
+    excludehostgroups: postgres91-hosts, deadslow
    -
-    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: 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 - postresql84 - 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
-  #-
-  #  name: process - postresql83 - master udd
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
-  #  hosts: piatti
-  #-
-  #  name: process - postresql83 - dak master
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
-  #  hosts: chopin
-  #-
-  #  name: process - postresql84 - dak master
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-  #  hosts: franck, chopin
-  #-
-  #  name: process - postresql84 - dak-dev master
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
-  #  hosts: franck
- # backups
+    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: postgresql backups
      nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: beethoven
- ####
-  -
-    name: process - stunnel4 - postgres-udd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
-    hosts: samosa
-  -
-    name: udd stunnel - master cert
-    nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 8080 -S -C 14 -t 45"
-    hosts: samosa
+    #hosts: beethoven
+    hosts: backuphost
   ####
   ####
    -
      name: process - stunnel4 - puppet-ekeyd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
      hostgroups: squeeze, wheezy
-    excludehosts: fano, fasch, field, finzi
+    excludehostgroups: freebsd
   ####
    -
      name: process - UPS - nut usbhid-ups - ups1
@@ -2362,70 +2369,49 @@ services:
      nrpe: "/usr/lib/nagios/plugins/dsa-check-ups"
      hosts: franck
      depends: process - UPS - nut upsd
-  -
-    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, field, finzi
+    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, field, finzi
+    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
+    normal_check_interval: 5
+    max_check_attempts: 24
+    retry_check_interval: 5
+  -
+    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
      check: check_tcp!6523
      hosts: gombert
      contact_groups: gobby
-
- ###
+ ####
    #-
    #  name: process - tftpd
    #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
    #  hostgroups: tftpd-hosts
   ###
-#  -
-#    name: process - dhcpd
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
-#    hosts: paer
- ###
  
   ############ 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'"
@@ -2442,16 +2428,9 @@ services:
      name: process - mountd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rpc.mountd -a '/sbin/rpc.mountd'"
      hostgroups: nfs-server
- # see if the nfs stuff works and doesn't hang.
-  # the df check all script will also hang, but we don't appear to pay attention to that
-  -
-    name: nfs mount ftp archive
-    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
-    hosts: bellini
-
    -
-    name: nfs server stabile reachable
-    nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.13 -w 50,10% -c 200,30%"
+    name: nfs server glinka reachable
+    nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.76 -w 50,10% -c 200,30%"
      hosts: quantz
    #
    -
@@ -2462,7 +2441,7 @@ services:
      name: unwanted process - automount
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C automount"
      hostgroups: computers
-    excludehostgroups: autofs
+    excludehostgroups: autofs, deadslow
  
   ############ MISC OTHER Stuff ############
   #####
@@ -2512,14 +2491,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"
-    hosts: global
    -
      name: DNS SEC - signature expiry
      hosts: global
@@ -2547,7 +2518,7 @@ services:
      hosts: giustini
    -
      name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=2041 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7778 $HOSTADDRESS$ public"
      runfrom: dijkstra
      hosts: giustini