Replace heininen with lully
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index 8eccb49..1adfa97 100644 (file)
 # hosts
 #############################
 servers:
-  gw-man-da:
-    address: 82.195.75.126
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-    contacts: joerg, bzed
-  gw-man-da2:
-    address: 82.195.75.46
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-    contacts: joerg, bzed
-  gw-HP-ftc:
-    address: 192.25.206.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+  # {{{ gateways
+  global:
+    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-c3sl:
+    address: 200.17.202.254
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-cecsit:
+    address: 150.203.164.38
+    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
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-brown.edu:
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-brown:
     address: 128.148.34.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-osuosl:
-    address: 140.211.166.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-scanplus-villa:
-    address: 212.211.132.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-scanplus-lobos:
-    address: 212.211.132.249
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-mit-csail:
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-carnet:
+    address: 161.53.160.1
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-conova:
+    address: 217.196.149.238
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-csail:
     address: 128.31.0.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-umn.edu:
-    address: 128.101.240.222
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-dg-i.net:
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-dgi:
     address: 93.94.132.102
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: bzed
   gw-freenet:
     address: 62.104.23.249
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-sanger:
-    address: 193.62.202.20
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-    contacts: tjrc1, dave
-  gw-1und1:
-    address: 195.20.247.54
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-    contacts: joerg
-  gw-1und1-karlsruhe:
-    address: 212.227.120.29
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-blackcat:
-    address: 193.201.200.129
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-ftcollins:
+    address: 192.25.206.1
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-grnet:
     address: 194.177.211.193
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-utwente:
-    address: 130.89.149.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  #gw-ughent:
-  #  address: 157.193.39.254
-  #  parents: gw-ubc
-  #  hostgroups: routing-infrastructure
-  gw-agnesi:
-    address: 65.173.90.22
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-ubc:
-    address: 206.12.19.254
-    parents: tchaikovsky
-    hostgroups: routing-infrastructure
-    contacts: lfilipoz
-  gw-carnet:
-    address: 161.53.160.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-telegraaf:
-    address: 82.94.249.153
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-telegraaf2:
-    address: 217.196.40.15
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-    contact_groups: +alioth-admins
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-helsinki:
     address: 128.214.173.25
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: holger
-  gw-cst:
-    address: 213.157.2.23
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-isc:
     address: 149.20.20.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-aca:
-    address: 130.239.18.97
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-#  gw-esiee:
-#    address: 195.220.83.13
-#    parents: gw-ubc
-#    hostgroups: routing-infrastructure
-  gw-ghent:
-    address: 193.191.17.50
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-anu:
-    address: 150.203.164.38
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-karlsruhe:
+    address: 129.143.166.229
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-man-da:
+    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
+    hostgroups: layer3-infrastructure
+  gw-osuosl:
+    address: 140.211.166.1
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-rapidswitch:
+    address: 193.201.200.129
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-sanger:
+    address: 193.62.202.20
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+    contacts: tjrc1, dave
+  gw-scanplus-lobos:
+    address: 212.211.132.249
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-scanplus-villa:
+    address: 212.211.132.1
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-sil:
     address: 86.59.118.145
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-arm:
-    address: 82.44.141.46
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    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
+    contacts: lfilipoz
+  gw-ugent:
+    address: 193.191.17.50
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-umn:
+    address: 128.101.240.222
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-utwente:
+    address: 130.89.149.1
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-ynic:
     # really janet, because ynic is stupid about firewalling
     address: 146.97.42.26
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-c3sl:
-    address: 200.17.202.254
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-zivit:
     address: 80.245.144.3
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-karlsruhe:
-    address: 129.143.166.229
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-marist:
-    address: 148.100.96.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-conova:
-    address: 217.196.146.254
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-
-  global:
-    hostgroups: notacomputer
-    pingable: false
-    check_command: dsa_check_always_ok
-
-  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
-
-  samosa:
-    address: 192.25.206.57
-    parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
-  raff:
-    address: 192.25.206.59
-    parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
-  spohr:
-    address: 192.25.206.33
-    parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze
-  peri:
-    address: 192.25.206.15
-    parents: gw-HP-ftc
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
-    contacts: dannf
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  # }}}
+  # {{{ 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
+  # }}}
+  # {{{ gw-1und1-sec
+  schumann:
+    address: 212.227.126.54
+    parents: gw-1und1-sec
+    hostgroups: computers, acpid-hosts, service, squeeze
+  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
+  geo3:
+    address: 195.20.242.125
+    parents: schumann
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
+  soler:
+    address: 195.20.242.126
+    parents: schumann
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze
+  wieck:
+    address: 195.20.242.89
+    parents: gw-1und1-sec
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror
+  # }}}
+  # {{{ gw-accumu
+  pettersson:
+    address: 130.239.18.123
+    parents: gw-accumu
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, squeeze, autofs
+  praetorius:
+    address: 130.239.18.121
+    parents: gw-accumu
+    hostgroups: computers, buildd, hassrvfs, squeeze
+  # }}}
+  # {{{ gw-arm
+  abel:
+    address: 217.140.96.56
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze
+  alain:
+    address: 217.140.96.58
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+  alwyn:
+    address: 217.140.96.59
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+  antheil:
+    address: 217.140.96.60
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+  arne:
+    address: 217.140.96.61
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+  arnold:
+    address: 217.140.96.57
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+  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
+  hasse:
+    address: 217.140.96.68
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+  henze:
+    address: 217.140.96.70
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+  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
+  # }}}
+  # {{{ 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
+    parents: gw-brown
+    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
+  # }}}
+  # {{{ 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
+    contacts: faw
+  # }}}
+  # {{{ gw-carnet
+  lebrun:
+    address: 193.198.184.10
+    parents: gw-carnet
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, squeeze
+  schroeder:
+    address: 193.198.184.11
+    parents: gw-carnet
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
+  # }}}
+  # {{{ 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
+  # }}}
+  # {{{ gw-conova
+  sompek:
+    address: 217.196.149.225
+    parents: gw-conova
+    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+  stadler:
+    address: 217.196.149.226
+    parents: gw-conova
+    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+  # }}}
+  # {{{ gw-csail
+  senfl:
+    address: 128.31.0.51
+    parents: gw-csail
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts, squeeze
+  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
+  # }}}
+  # {{{ 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
+  # }}}
+  # {{{ gw-ftcollins
+  alkman:
+    address: 192.25.206.63
+    parents: gw-ftcollins
+    hostgroups: computers, buildd, acpid-hosts, squeeze
+  merulo:
+    address: 192.25.206.58
+    parents: gw-ftcollins
+    hostgroups: computers, porterbox, hasusrfs, squeeze
+  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-HP-ftc
+    parents: gw-ftcollins
     hostgroups: computers, buildd, hasbootfs, lenny
     contacts: dannf
-  mundy:
-    address: 192.25.206.62
-    parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
   paer:
     address: 192.25.206.11
-    parents: gw-HP-ftc
+    parents: gw-ftcollins
     hostgroups: computers, porterbox, hasbootfs, hashomefs, lenny
-  merulo:
-    address: 192.25.206.58
-    parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasusrfs, squeeze
-  alkman:
-    address: 192.25.206.63
-    parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts, squeeze
-
-  sperger:
-    address: 82.195.75.34
-    parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, squeeze
-    contacts: bzed
+  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
+  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
+  biber:
+    address: 194.177.211.204
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze
+  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
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs, apache2-hosts, squeeze
+  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
+  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
+  # }}}
+  # {{{ 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
+  # }}}
+  # {{{ gw-karlsruhe
+  zemlinsky:
+    address: 129.143.160.6
+    parents: gw-karlsruhe
+    hostgroups: computers, buildd, hassrvfs, squeeze
+  # }}}
+  # {{{ gw-man-da
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
@@ -258,117 +456,99 @@ servers:
     parents: gw-man-da
     hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
     contacts: bzed
-  liszt:
-    address: 82.195.75.100
+  ball:
+    address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https, lenny
-    contacts: bzed
+    hostgroups: computers, buildd, hasbootfs, squeeze
+  # bartok TODO
+  czerny:
+    address: 82.195.75.109
+    parents: gw-man-da
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze
   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:
+    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, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385, acpid-hosts, apache-https, lenny
+    contacts: bzed
+  lully:
+    address: 82.195.75.99
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
     hostgroups: computers, acpid-hosts, service, squeeze, megactl
-  nielsen:
-    address: 82.195.75.99
+  rem:
+    address: 82.195.75.68
     parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
+    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
   unger:
     address: 82.195.75.102
     parents: gw-man-da
     hostgroups: computers, service, dl360, acpid-hosts, squeeze
-  handel:
-    address: 82.195.75.104
+  # byrd TODO
+  diamond:
+    address: 82.195.75.108
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, 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
   geo1:
     address: 82.195.75.105
     parents: unger
     hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
-  draghi:
-    address: 82.195.75.106
+  handel:
+    address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
   kaufmann:
     address: 82.195.75.107
     parents: unger
     hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
-  diamond:
-    address: 82.195.75.108
-    parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, bind9-hosts
-  ball:
-    address: 82.195.75.70
-    parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, squeeze
-  kokkonen:
-    address: 82.195.75.97
-    parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
-  byrd:
-    address: 82.195.75.92
-    parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 #  lamb:
 #    address: 82.195.75.101
 #    parents: unger
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
-  czerny:
-    address: 82.195.75.109
-    parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze
-  new-master:
-    address: 82.195.75.110
-    parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
-
-  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
-
-
-  ries:
-    address: 128.148.34.103
-    parents: gw-brown.edu
-    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
-
-  franck:
-    address: 128.148.34.3
-    parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres90-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, squeeze
-
+  # }}}
+  # {{{ gw-marist
+  zappa:
+    address: 148.100.96.103
+    parents: gw-marist
+    hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
+  # }}}
+  # {{{ gw-osuosl
+  busoni:
+    address: 140.211.15.34
+    parents: gw-osuosl
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
+  # malo TODO
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, squeeze
 #  mayr:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
 #    hostgroups: computers, buildd, hasbootfs
-  rietz:
-    address: 140.211.166.43
-    parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
-    #, bosserver
-  rietz2:
-    address: 140.211.166.44
-    parents: rietz
-    hostgroups: secondary-IPs
-  busoni:
-    address: 140.211.15.34
-    parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
-  zee:
-    address: 140.211.166.16
-    parents: gw-osuosl
-    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
@@ -380,76 +560,25 @@ servers:
   piston:
     address: 140.211.15.154
     parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze
-
-  villa:
-    address: 212.211.132.32
-    parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
-  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
-  gluck:
-    address: 150.203.164.38
-    parents: gw-anu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
-
-  steffani:
-    address: 128.31.0.36
-    parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze
-  #mahler:
-  #  address: 128.31.0.46
-  #  parents: gw-mit-csail
-  #  hostgroups: computers, porterbox, hasorgfs
-  rore:
-    address: 128.31.0.49
-    parents: gw-mit-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, squeeze
-  senfl:
-    address: 128.31.0.51
-    parents: gw-mit-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts, squeeze
-  #carver:
-  #  address: 128.31.0.50
-  #  parents: gw-mit-csail
-  #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs
-
-  saens:
-    address: 128.101.240.212
-    parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
-
-  argento:
-    address: 93.94.130.160
-    parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
-    contacts: bzed
-
-  widor:
-    address: 93.94.130.161
-    parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, squeeze
-    contacts: bzed
-
-  pergolesi:
-    address: 62.104.23.252
-    parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
-
-  albeniz:
-    address: 193.62.202.27
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers, lenny
-    contacts: tjrc1, dave
-  goetz:
-    address: 193.62.202.26
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, lenny
-    contacts: tjrc1, dave
+    hostgroups: computers, hassrvfs, squeeze, hassrvfs
+  rietz:
+    address: 140.211.166.43
+    parents: gw-osuosl
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
+    #, bosserver
+  rietz2:
+    address: 140.211.166.44
+    parents: rietz
+    hostgroups: secondary-IPs
+  # zee TODO
+  # }}}
+  # {{{ gs-rapidswitch
+  caballero:
+    address: 193.201.200.200
+    parents: gw-rapidswitch
+    hostgroups: computers, buildd, sw-raid, squeeze
+  # }}}
+  # {{{ gw-sanger
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -460,95 +589,107 @@ servers:
     parents: gw-sanger
     hostgroups: computers, porterbox, sw-raid, sparc, squeeze
     contacts: tjrc1, dave
-
-  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
-
-  schumann:
-    address: 212.227.126.54
-    parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, service, squeeze
-  wieck:
-    address: 195.20.242.89
-    parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
-  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
-  geo3:
-    address: 195.20.242.125
-    parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
-  soler:
-    address: 195.20.242.126
-    parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze
-
-  caballero:
-    address: 193.201.200.200
-    parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid, squeeze
-
-  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
-  klecker-ftp:
-    address: 130.89.148.12
-    parents: klecker
+  # }}}
+  # {{{ 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
+  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
+  # }}}
+  # {{{ gw-sil
+  beethoven:
+    address: 86.59.118.146
+    parents: gw-sil
+    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze
+  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?
+  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
-
-
-  ancina:
-    address: 157.193.39.13
-    parents: gw-ghent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, lenny
-    contacts: luk
-
-  agnesi:
-    address: 67.233.102.241
-    parents: gw-agnesi
-    hostgroups: deadslow, porterbox, lenny
-
+  # }}}
+  # {{{ 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
+  # }}}
+  # {{{ gw-ubcece
+  sw-ubcece:
+    hostgroups: layer2-infrastructure
+    contacts: lfilipoz
+    pingable: false
+    check_command: dsa_check_always_ok
+  sw-ubcece-mcld:
+    hostgroups: layer2-infrastructure
+    parents: sw-ubcece
+    contacts: lfilipoz
+    pingable: false
+    check_command: dsa_check_always_ok
+  sw-ubcece-kais:
+    hostgroups: layer2-infrastructure
+    parents: sw-ubcece
+    contacts: lfilipoz
+    pingable: false
+    check_command: dsa_check_always_ok
   spontini:
     address: 206.12.19.14
-    parents: gw-ubc
+    parents: sw-ubcece-mcld
     hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
-    parents: tchaikovsky
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze
+    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, uploadqueue
   dijkstra:
     address: 206.12.19.218
-    parents: tchaikovsky
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  pasquini:
+    address: 206.12.19.217
+    parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   luchesi:
     address: 206.12.19.214
-    parents: tchaikovsky
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  tristano:
+    address: 206.12.19.213
+    parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   tchaikovsky:
     address: 206.12.19.118
+    parents: luchesi
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, squeeze
   wolkenstein:
     address: 206.12.19.116
@@ -566,33 +707,29 @@ servers:
     address: 206.12.19.114
     parents: dijkstra
     hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze, nfs-server
-  valente:
-    address: 206.12.19.112
-    parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts, service, lenny
   bellini:
     address: 206.12.19.7
-    parents: gw-ubc
+    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: tchaikovsky
-    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
+    parents: sw-ubcece-kais
+    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
   stabile:
     address: 206.12.19.13
-    parents: gw-ubc
+    parents: sw-ubcece-kais
     hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
   paganini:
     address: 206.12.19.10
-    parents: tchaikovsky
+    parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
   respighi:
     address: 206.12.19.11
-    parents: gw-ubc
+    parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
   vivaldi:
     address: 206.12.19.12
-    parents: tchaikovsky
+    parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
   # MSA 2000 (2012i)
   giustini:
@@ -612,39 +749,35 @@ servers:
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   gabrielli:
     address: 206.12.19.17
-    parents: tchaikovsky
+    parents: sw-ubcece-kais
     hostgroups: computers, porterbox, squeeze
   corelli:
     address: 206.12.19.16
-    parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    parents: sw-ubcece-kais
+    hostgroups: computers, buildd, squeeze
   lucatelli:
     address: 206.12.19.15
-    parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    parents: sw-ubcece-kais
+    hostgroups: computers, buildd, squeeze
   rossini:
     address: 206.12.19.19
-    parents: tchaikovsky
+    parents: sw-ubcece-kais
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   salieri:
     address: 206.12.19.20
-    parents: tchaikovsky
+    parents: sw-ubcece-kais
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   traetta:
     address: 206.12.19.21
-    parents: tchaikovsky
+    parents: sw-ubcece-kais
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
-  schuetz:
-    address: 206.12.19.119
-    parents: tchaikovsky
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 #  locke:
 #    address: 206.12.19.120
-#    parents: tchaikovsky
+#    parents: sw-ubcece-kais
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
   lotti:
     address: 206.12.19.121
-    parents: tchaikovsky
+    parents: sw-ubcece-kais
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
   quantz:
     address: 206.12.19.122
@@ -658,240 +791,103 @@ servers:
     address: 206.12.19.124
     parents: salieri
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, heavy-exim
-  danzi:
-    address: 206.12.19.125
-    parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-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
-  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
-  gombert:
-    address: 206.12.19.132
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim
-  jenkins:
-    address: 206.12.19.133
-    parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
-  blavet:
-    address: 206.12.19.134
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts, nfs-client, autofs
-
-  lebrun:
-    address: 193.198.184.10
-    parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, squeeze
-  schroeder:
-    address: 193.198.184.11
-    parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
-
-  tartini:
-    address: 82.94.249.158
-    parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, hasvarfs, hasusrfs, service, lenny
-
-  piatti:
-    address: 193.167.161.225
-    parents: gw-helsinki
-    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
-    contacts: holger
-
-  rem:
-    address: 82.195.75.68
-    parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, hashomefs, squeeze
-
-  zelenka:
-    address: 80.245.147.40
-    parents: gw-zivit
-    hostgroups: computers, porterbox, hassrvfs, squeeze
-  zandonai:
-    address: 80.245.147.46
-    parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, squeeze
-
-  goedel:
-    address: 213.188.99.214
-    parents: gw-cst
-    hostgroups: computers, hasbootfs, ntpsuckers, buildd, lenny
-
-  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
-
-  praetorius:
-    address: 130.239.18.121
-    parents: gw-aca
-    hostgroups: computers, buildd, hassrvfs, squeeze
-  pettersson:
-    address: 130.239.18.123
-    parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, squeeze, autofs
-
-#  lafayette:
-#    address: 147.215.7.160
-#    parents: gw-esiee
-#    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
-
-  grieg:
-    address: 194.177.211.200
-    parents: gw-grnet
-    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https, squeeze
-  rautavaara:
-    address: 194.177.211.199
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, squeeze
-  fasch:
-    address: 194.177.211.201
-    parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-    #, mptraid
-  holter:
-    address: 194.177.211.202
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service, squeeze
-  barber:
-    address: 194.177.211.203
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze
-  biber:
-    address: 194.177.211.204
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze
-  cilea:
-    address: 194.177.211.205
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
-  vitry:
-    address: 194.177.211.206
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd, squeeze
-  krenek:
-    address: 194.177.211.207
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd, squeeze
-  scelsi:
-    address: 194.177.211.208
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, service, squeeze
-  orff:
-    address: 194.177.211.209
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs, apache2-hosts, squeeze
-  field:
-    address: 194.177.211.210
-    parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-    #, mptraid
-
-  beethoven:
-    address: 86.59.118.146
-    parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze
-  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
+  danzi:
+    address: 206.12.19.125
+    parents: luchesi
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-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
+  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
+  gombert:
+    address: 206.12.19.132
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim
+  jenkins:
+    address: 206.12.19.133
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+  blavet:
+    address: 206.12.19.134
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts, nfs-client, autofs
+  barriere:
+    address: 206.12.19.135
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  diabelli:
+    address: 206.12.19.136
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https
+  bizet:
+    address: 206.12.19.137
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, uploadqueue
+  lilburn:
+    address: 206.12.19.138
+    parents: dijkstra
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, 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
+  # }}}
+  # {{{ gw-ugent
+  ancina:
+    address: 157.193.39.13
+    parents: gw-ugent
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
+    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
+  # }}}
+  # {{{ 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
-  englund:
-    address: 86.59.118.148
-    parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, hassrvfs, megactl
-    # which raid?
-  lindberg:
-    address: 86.59.118.149
-    parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, megactl
-    # which raid?
-  eder:
-    address: 86.59.118.151
-    parents: gw-sil
-    hostgroups: computers, porterbox, squeeze, hassrvfs
-  eysler:
-    address: 86.59.118.152
-    parents: gw-sil
-    hostgroups: computers, buildd, squeeze
-
-  abel:
-    address: 217.140.96.56
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze
-  arnold:
-    address: 217.140.96.57
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
-  alain:
-    address: 217.140.96.58
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
-  alwyn:
-    address: 217.140.96.59
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
-  antheil:
-    address: 217.140.96.60
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
-  arne:
-    address: 217.140.96.61
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
-  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
-  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
-  henze:
-    address: 217.140.96.70
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
-  hoiby:
-    address: 217.140.96.71
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
-
-  poulenc:
-    address: 144.32.168.77
-    parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
-  porpora:
-    address: 144.32.168.78
-    parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+  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, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+  klecker-ftp:
+    address: 130.89.148.12
+    parents: klecker
+    hostgroups: secondary-IPs
+  # }}}
+  # {{{ gw-ynic
   hildegard:
     address: 144.32.168.74
     parents: gw-ynic
@@ -904,27 +900,27 @@ servers:
     address: 144.32.168.76
     parents: gw-ynic
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
-
-  santoro:
-    address: 200.17.202.197
-    parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
-    contacts: faw
-
-  zemlinsky:
-    address: 129.143.160.6
-    parents: gw-karlsruhe
+  porpora:
+    address: 144.32.168.78
+    parents: gw-ynic
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+  poulenc:
+    address: 144.32.168.77
+    parents: gw-ynic
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+  # }}}
+  # {{{ gw-zivit
+  zandonai:
+    address: 80.245.147.46
+    parents: gw-zivit
     hostgroups: computers, buildd, hassrvfs, squeeze
+  zelenka:
+    address: 80.245.147.40
+    parents: gw-zivit
+    hostgroups: computers, porterbox, hassrvfs, squeeze
+  # }}}
+  # }}}
 
-  zappa:
-    address: 148.100.96.103
-    parents: gw-marist
-    hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
-
-  sompek:
-    address: 217.196.146.208
-    parents: gw-conova
-    hostgroups: computers, buildd, hasbootfs, sw-raid, squeeze
 
 #############################
 # host groups
@@ -936,15 +932,17 @@ hostgroups:
   computers:
     alias: computers
     private: 1
-  routing-infrastructure:
-    alias: Internet routers and friends
+  layer2-infrastructure:
+    alias: Layer 2 Devices
+    extinfo-icon_image: base/switch40.png
+    extinfo-icon_image_alt: switch
+  layer3-infrastructure:
+    alias: Layer 3 Devices
     extinfo-icon_image: base/switch40.png
     extinfo-icon_image_alt: router
   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
@@ -1047,9 +1045,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
@@ -1062,18 +1057,12 @@ hostgroups:
   #postgres81-hosts:
   #  alias: hosts running postgres81
   #  private: 1
-  postgres83-hosts:
-    alias: hosts running postgres83
-    private: 1
   postgres84-hosts:
     alias: hosts running postgres84
     private: 1
   postgres90-hosts:
     alias: hosts running postgres90
     private: 1
-  mysql-hosts:
-    alias: hosts running mysql
-    private: 1
   no-ulogd:
     alias: hosts not running ulogd
     private: 1
@@ -1146,7 +1135,13 @@ hostgroups:
   brokensamhain:
     alias: machines that can not run samhain
     private: 1
+  high-RTT:
+    alias: machines with hight round trip times
+    private: 1
 
+  security_mirror:
+    alias: hosts that are security mirrors
+    private: 1
 #############################
 # servicegroups
 #############################
@@ -1165,6 +1160,8 @@ servicegroups:
     alias: apt upgrade status
   samhain:
     alias: samhain integrity status
+  time:
+    alias: time stuff
   security:
     alias: security
     servicegroup_members: apt, weaksshkeys, kernel, samhain
@@ -1177,14 +1174,21 @@ services:
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: routing-infrastructure
+    excludehostgroups: layer3-infrastructure, high-RTT
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
+  -
+    name: PING
+    check: "check_ping!600.0,20%!900.0,40%"
+    hostgroups: high-RTT
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
-    hostgroups: routing-infrastructure
+    hostgroups: layer3-infrastructure
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
@@ -1197,8 +1201,15 @@ 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 10% -c 5%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/home/buildd/build-trees"
     hostgroups: computers
+    excludehosts: sibelius
+  -
+    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 95 98"
+    hosts: sibelius
+
   -
     name: disk usage on /
     servicegroups: diskspace
@@ -1240,7 +1251,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, tartini, powell, piatti
+    hosts: saens, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1262,11 +1273,21 @@ services:
     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
   -
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck, heininen
+    hosts: busoni, wieck, heininen, lully
+  -
+    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
@@ -1284,49 +1305,9 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: stabile,sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-01
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-01"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-23
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-23"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-45
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-45"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-67
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-67"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-89
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-89"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-ab
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-ab"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-cd
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-cd"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-f
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-f"
-    hosts: sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-e
+    name: disk usage on /srv/farm-snapshot/farm-misc
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-e"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
     hosts: sibelius
   -
     name: disk usage on /srv/fossology.debian.net
@@ -1519,12 +1500,6 @@ services:
     normal_check_interval:  60
     notification_interval: 1440
 
-  -
-    name: "network service - sshd - 2260"
-    check: dsa_check_ssh_port!2260
-    hosts: agnesi
-    normal_check_interval:  180
-
   -
     name: ssh - weak keys
     servicegroups: weaksshkeys
@@ -1571,6 +1546,7 @@ services:
     name: process - ntpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
+    servicegroups: time
   -
     name: network service - ntp
     check: dsa_check_ntp
@@ -1578,12 +1554,14 @@ services:
     depends: process - ntpd
     excludehosts: ancina
     excludehostgroups: ntpsuckers
+    servicegroups: time
   #
   -
     name: network service - time
     check: dsa_check_time
     hosts: ancina
     depends: process - xinetd
+    servicegroups: time
 
  ###
   -
@@ -1610,9 +1588,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
+    excludehosts: vasks, wagner
+  -
+    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
@@ -1682,11 +1666,11 @@ 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 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: liszt
+    hosts: liszt, 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
+    hosts: liszt, wagner, bendel
     hostgroups: spamd
     depends: process - spamd - master
   #
@@ -1704,7 +1688,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt, busoni, wagner
+    excludehosts: liszt, bendel, busoni, wagner
 
  ###
   #-
@@ -1736,10 +1720,19 @@ services:
   -
     name: process - amavis - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd (master)'"
-    hostgroups: amavis-hosts
+    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)'"
+    hostgroups: amavis-hosts
+  -
+    name: process - amavis - all
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd-new '"
     hostgroups: amavis-hosts
     depends: process - amavis - master
   #
@@ -1748,19 +1741,20 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C amavisd-new"
     hostgroups: computers
     excludehostgroups: amavis-hosts
+    excludehosts: liszt
  ###
   -
     name: process - weightd - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -C policyd-weight -a 'policyd-weight (master)'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (master)'"
     hostgroups: heavy-postfix
   -
     name: process - weightd - cache
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -C policyd-weight -a 'policyd-weight (cache)'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (cache)'"
     hostgroups: heavy-postfix
     depends: process - weightd - master
   -
     name: process - weightd - child
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u polw -C policyd-weight -a 'policyd-weight (child)'"
+    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
   #
@@ -1930,7 +1924,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, byrd, abel, alwyn, vasks
+    excludehosts: grieg, abel, alwyn, vasks
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1941,6 +1935,10 @@ services:
     name: "host SSL cert"
     nrpe: "if [ -e /etc/ssl/certs/thishost.pem ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/thishost.pem; else echo 'No thishost.pem on this host.'; fi"
     hostgroups: computers
+  -
+    name: "pg SSL cert"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/pg-ubcece.debian.org-chained.pem"
+    hosts: danzi
 
  ############ Processes/Services that only run on some computers ############
  ####
@@ -2014,7 +2012,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehosts: villa, lobos, liszt, senfl, schein, rore
+    excludehosts: villa, lobos, liszt, senfl, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
@@ -2025,11 +2023,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
     normal_check_interval: 120
     hosts: senfl, schein
-  -
-    name: HW - hpasmcli status
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant --fan-high"
-    normal_check_interval: 120
-    hosts: rore
  ###
   -
     name: RAID - areca
@@ -2120,7 +2113,7 @@ services:
   -
     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, byrd, vasks
+    hosts: grieg, vasks
  ###
   -
     name: process - xinetd
@@ -2212,6 +2205,13 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
+    excludehosts: handel
+    depends: "process - apache2 - master"
+    normal_check_interval: 120
+  -
+    name: network service - https
+    check: dsa_check_https_want_auth
+    hosts: handel
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2246,22 +2246,11 @@ services:
     excludehostgroups: bind9-hosts
 
  ####
-  -
-    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
@@ -2299,7 +2288,7 @@ services:
     name: unwanted process - postresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres83-hosts
+    excludehostgroups: postgres90-hosts, postgres84-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'"
@@ -2308,10 +2297,6 @@ services:
     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
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres'"
-    hostgroups: postgres83-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'"
@@ -2333,17 +2318,6 @@ services:
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
     hosts: beethoven
- ####
-  -
-    name: process - mysql - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C mysqld_safe -a '/bin/sh /usr/bin/mysqld_safe'"
-    hostgroups: mysql-hosts
-  -
-    name: process - mysql - workers
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u mysql -C mysqld -a /usr/sbin/mysqld"
-    hostgroups: mysql-hosts
-    depends: process - mysql - master
-
  ####
   -
     name: process - stunnel4 - postgres-udd
@@ -2361,23 +2335,6 @@ services:
     hostgroups: squeeze, wheezy
     excludehosts: fano, fasch, field, finzi
  ####
-  -
-    name: process - krb - kdc
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kdc -a '/usr/lib/heimdal-servers/kdc --config-file=/etc/heimdal-kdc/kdc.conf'"
-    hosts: schuetz, byrd
-  -
-    name: process - krb - iprop - slave
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-slave -a '/usr/sbin/ipropd-slave byrd.debian.org'"
-    hosts: schuetz
-  -
-    name: process - krb - iprop - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-master -a '/usr/sbin/ipropd-master'"
-    hosts: byrd
-  -
-    name: process - krb - kpasswdd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kpasswdd -a '/usr/lib/heimdal-servers/kpasswdd'"
-    hosts: byrd
- ###
   -
     name: process - UPS - nut usbhid-ups - ups1
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C usbhid-ups  -a '/lib/nut/usbhid-ups -a ups1'"
@@ -2512,10 +2469,6 @@ services:
     name: mirror sync - security
     check: "dsa_check_mirrorsync_skew!security-nagios.debian.org!project/trace/security-master.debian.org!150:3600"
     hosts: global
-  -
-    name: mirror sync - volatile
-    check: "dsa_check_mirrorsync_skew!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org!150:3600"
-    hosts: global
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
@@ -2558,10 +2511,6 @@ services:
     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 - a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
-    check: "dsa_check_soas!a.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"
@@ -2593,6 +2542,8 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=952 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=2041 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini
+
+# vim: set ts=2 sw=2 et ai si fdm=marker: