trying to isolate error regarding 'handel' and 'network service - https'
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index ca08551..1caac1f 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:
-    address: 128.30.0.254
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-xs4all:
-    address: 194.109.137.217
-    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-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-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-frost:
-    address: 130.81.27.83
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  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-nmmn:
-    address: 217.114.76.81
-    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
+    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-telefonica:
-    address: 195.71.99.193
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  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
-
-  global:
-    hostgroups: notacomputer
-    pingable: false
-    check_command: dsa_check_always_ok
-
-  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
-#  merkel:
-#    address: 192.25.206.16
-#    parents: gw-HP-ftc
-#    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, xinetd-hosts, lenny
-#  merkel2:
-#    address: 192.25.206.71
-#    parents: merkel
-#    hostgroups: secondary-IPs
-  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, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
+  # }}}
+  # {{{ 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
+  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
+  # }}}
+  # {{{ 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, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
+    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, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
+  # }}}
+  # {{{ 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
+  rore:
+    address: 128.31.0.49
+    parents: gw-csail
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, squeeze
+  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, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze
+  # }}}
+  # {{{ 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, lenny
   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, lenny
-  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, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze
+  # }}}
+  # {{{ 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
-    hostgroups: computers, porterbox, sw-raid, hassrvfs, lenny
+    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, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
     contacts: bzed
+  ball:
+    address: 82.195.75.70
+    parents: gw-man-da
+    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.101
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https
+  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.100
     parents: gw-man-da
@@ -261,277 +493,212 @@ servers:
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze
-  nielsen:
-    address: 82.195.75.99
+    hostgroups: computers, acpid-hosts, service, squeeze, megactl
+  rem:
+    address: 82.195.75.68
     parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, lenny
+    hostgroups: computers, buildd, hasbootfs, hashomefs, 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
   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
-
-  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, rsyncd-hosts, 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
-
-  mayer:
-    address: 140.211.166.78
-    parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny
-#  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, hasvicepa, squeeze
-    #, bosserver
-  rietz2:
-    address: 140.211.166.44
-    parents: rietz
-    hostgroups: secondary-IPs
+#  lamb:
+#    address: 82.195.75.101
+#    parents: unger
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+  # }}}
+  # {{{ 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
-  zee:
-    address: 140.211.166.16
+  # malo TODO
+  mayer:
+    address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny
-
-  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
-
-  klecker:
-    address: 194.109.137.218
-    parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts, lenny
-
-  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, lenny
-    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
-  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
-    contacts: tjrc1, dave
-  smetana:
-    address: 193.62.202.29
-    parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, sparc, squeeze
-    contacts: tjrc1, dave
-
-  voltaire:
-    address: 72.66.115.54
-    parents: gw-frost
-    hostgroups: computers, buildd, hasvarfs, hashomefs, lenny
-    contacts: sfrost
-
-  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, lenny
-    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
-
+    hostgroups: computers, buildd, hasbootfs, squeeze
+#  mayr:
+#    address: 140.211.166.58
+#    parents: gw-osuosl
+#    hostgroups: computers, buildd, hasbootfs
+  parry:
+    address: 140.211.15.153
+    parents: gw-osuosl
+    hostgroups: computers, hassrvfs, squeeze, 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
+  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-blackcat
-    hostgroups: computers, buildd, sw-raid, lenny
-
-  pescetti:
-    address: 217.114.76.85
-    parents: gw-nmmn
-    hostgroups: computers, porterbox, smart, hasorgfs, squeeze
-
-  kassia:
-    address: 130.89.149.224
-    parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, 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
+    parents: gw-rapidswitch
+    hostgroups: computers, buildd, sw-raid, squeeze
+  # }}}
+  # {{{ gw-sanger
+  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
+    contacts: tjrc1, dave
+  smetana:
+    address: 193.62.202.29
+    parents: gw-sanger
+    hostgroups: computers, porterbox, sw-raid, sparc, squeeze
+    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
+  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
+  # }}}
+  # {{{ 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
   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
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, squeeze
   brahms:
     address: 206.12.19.115
     parents: dijkstra
@@ -550,280 +717,210 @@ servers:
     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
+    parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
   stabile:
     address: 206.12.19.13
-    parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze
+    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
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
-  respighi:
-    address: 206.12.19.11
-    parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
-  vivaldi:
-    address: 206.12.19.12
-    parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, lenny, autofs
-  # MSA 2000 (2012i)
-  giustini:
-    address: 192.168.2.6
-    parents: dijkstra
-    hostgroups: notacomputer
-    # unless we implement runfrom for host alive checks
-    pingable: false
-    check_command: dsa_check_always_ok
-  fano:
-    address: 206.12.19.110
-    parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd
-  finzi:
-    address: 206.12.19.111
-    parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd
-  gabrielli:
-    address: 206.12.19.17
-    parents: tchaikovsky
-    hostgroups: computers, porterbox, lenny
-  corelli:
-    address: 206.12.19.16
-    parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
-  lucatelli:
-    address: 206.12.19.15
-    parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
-  rossini:
-    address: 206.12.19.19
-    parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
-  salieri:
-    address: 206.12.19.20
-    parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
-  traetta:
-    address: 206.12.19.21
-    parents: tchaikovsky
-    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
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  lotti:
-    address: 206.12.19.121
-    parents: tchaikovsky
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, 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
-  nono:
-    address: 206.12.19.123
-    parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, 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
-  danzi:
-    address: 206.12.19.125
-    parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-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
-
-  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
-    #, 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
-    #, 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
-  merikanto2:
-    address: 86.59.118.150
-    parents: merikanto
+    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: 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
+    parents: dijkstra
+    hostgroups: notacomputer
+    # unless we implement runfrom for host alive checks
+    pingable: false
+    check_command: dsa_check_always_ok
+  fano:
+    address: 206.12.19.110
+    parents: luchesi
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+  finzi:
+    address: 206.12.19.111
+    parents: luchesi
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+  gabrielli:
+    address: 206.12.19.17
+    parents: sw-ubcece-kais
+    hostgroups: computers, porterbox, squeeze
+  corelli:
+    address: 206.12.19.16
+    parents: sw-ubcece-kais
+    hostgroups: computers, buildd, squeeze
+  lucatelli:
+    address: 206.12.19.15
+    parents: sw-ubcece-kais
+    hostgroups: computers, buildd, squeeze
+  rossini:
+    address: 206.12.19.19
+    parents: sw-ubcece-kais
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+  salieri:
+    address: 206.12.19.20
+    parents: sw-ubcece-kais
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+  traetta:
+    address: 206.12.19.21
+    parents: sw-ubcece-kais
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+#  locke:
+#    address: 206.12.19.120
+#    parents: sw-ubcece-kais
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
+  lotti:
+    address: 206.12.19.121
+    parents: sw-ubcece-kais
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, 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
+  nono:
+    address: 206.12.19.123
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, 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
+  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, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
+  # }}}
+  # {{{ 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, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+  # }}}
+  # {{{ 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
-    # which raid?
-  lindberg:
-    address: 86.59.118.149
-    parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
-    # which raid?
-
-  abel:
-    address: 217.140.96.56
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, lenny
-  arnold:
-    address: 217.140.96.57
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
-  alain:
-    address: 217.140.96.58
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
-  alwyn:
-    address: 217.140.96.59
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
-  antheil:
-    address: 217.140.96.60
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
-  arne:
-    address: 217.140.96.61
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
-
-  poulenc:
-    address: 144.32.168.77
+  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
+    hostgroups: secondary-IPs
+  # }}}
+  # {{{ gw-ynic
+  hildegard:
+    address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+  howells:
+    address: 144.32.168.75
+    parents: gw-ynic
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+  hummel:
+    address: 144.32.168.76
+    parents: gw-ynic
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
   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
+  # }}}
+  # }}}
 
-  santoro:
-    address: 200.17.202.197
-    parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
-    contacts: faw
 
 #############################
 # host groups
@@ -835,18 +932,23 @@ 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
+  armhf:
+    alias: armhf
+    private: 1
   sparc:
     alias: sparc
     private: 1
@@ -893,6 +995,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
   megaraid:
     alias: Hosts with LSI Logic MegaRAID
     private: 1
@@ -902,6 +1007,8 @@ hostgroups:
 
   squeeze:
     alias: Hosts running squeeze
+  wheezy:
+    alias: Hosts running wheezy
 
   lenny:
     alias: Hosts running lenny
@@ -962,9 +1069,6 @@ hostgroups:
   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
@@ -999,9 +1103,6 @@ hostgroups:
     alias: secondary IP addresses
     private: 1
 
-  smart:
-    alias: hosts with smartd
-    private: 1
   hasbootfs:
     alias: hosts with a /boot filesystem
     private: 1
@@ -1020,9 +1121,9 @@ hostgroups:
   hasusrfs:
     alias: hosts with a /usr filesystem
     private: 1
-  hasvicepa:
-    alias: hosts with a /vicepa
-    private: 1
+#  hasvicepa:
+#    alias: hosts with a /vicepa
+#    private: 1
 
   incomingmailrelayed:
     alias: incoming mail needs to go through a mail relay
@@ -1037,6 +1138,13 @@ hostgroups:
     alias: "hosts who's ntp offset is often unknown"
     private: 1
 
+  brokensamhain:
+    alias: machines that can not run samhain
+    private: 1
+  high-RTT:
+    alias: machines with hight round trip times
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -1055,6 +1163,8 @@ servicegroups:
     alias: apt upgrade status
   samhain:
     alias: samhain integrity status
+  time:
+    alias: time stuff
   security:
     alias: security
     servicegroup_members: apt, weaksshkeys, kernel, samhain
@@ -1067,14 +1177,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
@@ -1089,17 +1206,24 @@ services:
     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"
     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
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: klecker, kassia, spohr, liszt
+    excludehosts: kassia, spohr, liszt
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: klecker, kassia, spohr, liszt
+    hosts: kassia, spohr, liszt
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1115,11 +1239,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
     hostgroups: hasorgfs
-#  -
-#    name: disk usage on /org
-#    servicegroups: diskspace
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-#    hosts: merkel
   -
     name: disk usage on /srv
     servicegroups: diskspace
@@ -1131,16 +1250,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
     hosts: ries
-#  -
-#    name: disk usage on /org/scratch
-#    servicegroups: diskspace
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
-#    hosts: merkel
   -
     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
@@ -1151,11 +1265,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
     hostgroups: hashomefs
-  -
-    name: disk usage on /mnt/hdc
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
-    hosts: voltaire
   -
     name: disk usage on /x
     servicegroups: diskspace
@@ -1173,16 +1282,16 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
     hosts: busoni, wieck, heininen
 
-  -
-    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/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"
-    hosts: stabile, beethoven, sibelius
+    hosts: beethoven, sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
@@ -1191,48 +1300,58 @@ services:
   -
     name: disk usage on /srv/farm-snapshot/farm-01
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-01"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /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 85 95 /srv/farm-snapshot/farm-23"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /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 85 95 /srv/farm-snapshot/farm-45"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /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 85 95 /srv/farm-snapshot/farm-67"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /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 85 95 /srv/farm-snapshot/farm-89"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /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 95 98 /srv/farm-snapshot/farm-ab"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-abf
+    name: disk usage on /srv/farm-snapshot/farm-cd
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-abf"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-cd"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-cde
+    name: disk usage on /srv/farm-snapshot/farm-f
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cde"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-f"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-e
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-e"
     hosts: sibelius
   -
     name: disk usage on /srv/fossology.debian.net
     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 /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
@@ -1256,6 +1375,7 @@ 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
  ####
@@ -1284,27 +1404,27 @@ services:
     retry_check_interval: 5
 
  ####
-  - name: afs - space
-    hostgroups: bosserver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
-    normal_check_interval: 60
-    max_check_attempts: 2
-    retry_check_interval: 5
-
-  - name: afs - bos
-    hostgroups: bosserver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
-    normal_check_interval: 60
-    max_check_attempts: 2
-    retry_check_interval: 5
-
-  - name: afs - waiting connections
-    hostgroups: bosserver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
-    normal_check_interval: 60
-    max_check_attempts: 2
-    retry_check_interval: 5
-
+#  - name: afs - space
+#    hostgroups: bosserver
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
+#    normal_check_interval: 60
+#    max_check_attempts: 2
+#    retry_check_interval: 5
+#
+#  - name: afs - bos
+#    hostgroups: bosserver
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
+#    normal_check_interval: 60
+#    max_check_attempts: 2
+#    retry_check_interval: 5
+#
+#  - name: afs - waiting connections
+#    hostgroups: bosserver
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
+#    normal_check_interval: 60
+#    max_check_attempts: 2
+#    retry_check_interval: 5
+#
   #- name: afs - udebug
   #  hostgroups: bosserver
   #  nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-udebug -H localhost"
@@ -1317,6 +1437,7 @@ services:
     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
 
  ####
   -
@@ -1324,17 +1445,20 @@ 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: process - samhain
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
     hostgroups: computers
+    excludehostgroups: brokensamhain
   -
     name: samhain
     servicegroups: samhain
@@ -1343,6 +1467,7 @@ services:
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5
+    excludehostgroups: brokensamhain
 
  ####
   -
@@ -1408,17 +1533,12 @@ 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
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
     hostgroups: computers
+    excludehosts: wagner, vasks
     normal_check_interval:  60
  ####
   -
@@ -1436,23 +1556,30 @@ services:
  ###
   -
     name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
+    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
+    excludehostgroups: freebsd, armhf
+    excludehosts: vasks, wagner
   -
     name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/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
   -
     name: network service - munin-node
     check: check_tcp!4949
     hostgroups: computers
     depends: process - munin-node
+    excludehosts: vasks, wagner
  ###
   -
     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
@@ -1460,12 +1587,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
 
  ###
   -
@@ -1484,6 +1613,7 @@ 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
@@ -1495,6 +1625,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: heininen
     hostgroups: computers
+    excludehosts: vasks, wagner
  ### MAIL STUFF
  ###
   -
@@ -1526,34 +1657,39 @@ 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
   -
     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
   -
     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
+    excludehosts: powell, wagner
   -
     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
+    hosts: powell, wagner
   -
     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'"
@@ -1561,7 +1697,7 @@ services:
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
-    hosts: liszt
+    hosts: liszt, wagner
     hostgroups: spamd
     depends: process - spamd - master
   #
@@ -1579,7 +1715,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt, busoni
+    excludehosts: liszt, busoni, wagner
 
  ###
   #-
@@ -1739,32 +1875,38 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
+    excludehosts: wagner, vasks
     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: 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'"
-    hostgroups: unbound-hosts, squeeze
+    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
@@ -1799,7 +1941,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
+    excludehosts: grieg, abel, alwyn, vasks
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1810,6 +1952,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 ############
  ####
@@ -1835,12 +1981,12 @@ 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
+    excludehostgroups: armhf
   -
-    name: process - cpqarrayd
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
-    hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehostgroups: squeeze
+    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
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -1930,6 +2076,12 @@ 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: process - slapd
@@ -1947,6 +2099,7 @@ 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"
@@ -1973,16 +2126,16 @@ services:
     hostgroups: computers
     excludehostgroups: acpid-hosts, kvmdomains
  ###
-  -
-    name: process - bosserver
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
-    hostgroups: bosserver
-
+#  -
+#    name: process - bosserver
+#    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, byrd
+    hosts: grieg, vasks
  ###
   -
     name: process - xinetd
@@ -2000,17 +2153,22 @@ services:
     hosts: draghi
     depends: process - xinetd
  ###
-#  -
-#    name: network service - rsync
-#    check: check_tcp!873
-#    hostgroups: rsyncd-hosts
-#    depends: process - xinetd
-#
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hostgroups: rsyncd-hosts
+    depends: process - xinetd
+    excludehosts: merikanto, rietz
   -
     name: network service - rsync
     check: check_tcp!873
     hosts: rietz2
     depends: rietz:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: merikanto2
+    depends: merikanto:process - xinetd
   #-
   #  name: network service - rsync
   #  check: check_tcp!873
@@ -2049,14 +2207,13 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: kassia
+    excludehosts: klecker
     depends: process - apache2 - master
   -
     name: network service - http
     check: check_http
-    depends: kassia:process - apache2 - master
-    #hosts: kassia-sec, kassia-ftp, kassia-volatile
-    hosts: kassia-ftp, kassia-volatile
+    depends: klecker:process - apache2 - master
+    hosts: klecker-ftp
 
   # keyserver on kaufmann
   -
@@ -2070,6 +2227,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 with auth
+    check: dsa_check_https_want_auth
+    hosts: handel
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2108,24 +2272,23 @@ services:
     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: kassia
+    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: kassia
+    excludehosts: klecker
   -
     name: network service - ftp
     check: check_ftp
     hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: kassia
+    excludehosts: klecker
     depends: process - vsftp - listener
   -
     name: network service - ftp
     check: check_ftp
-    #hosts: kassia-sec, kassia-ftp
-    hosts: kassia-ftp
-    depends: kassia:process - xinetd
+    hosts: klecker-ftp
+    depends: klecker:process - xinetd
 
  ####
   -
@@ -2192,17 +2355,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
@@ -2217,26 +2369,9 @@ services:
   -
     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
+    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'"
@@ -2259,6 +2394,10 @@ 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
 
  ####
   #-
@@ -2286,15 +2425,20 @@ services:
     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
-    contacts: luk, pkern, HE
-
+    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
-    contacts: luk, pkern, HE
+    contact_groups: buildd
+ ####
+  -
+    name: network service - gobby
+    check: check_tcp!6523
+    hosts: gombert
+    contact_groups: gobby
 
  ###
   #-
@@ -2307,10 +2451,6 @@ services:
 #    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
 #    hosts: paer
  ###
-  -
-    name: process - smartd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C smartd -a '/usr/sbin/smartd --pidfile /var/run/smartd.pid --interval=1800'"
-    hostgroups: smart
 
  ############ NFS Stuff ############
  ####
@@ -2336,10 +2476,6 @@ services:
     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 /org/mirrors/ftp.debian.org/ftp"
-#    hosts: merkel
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
@@ -2420,10 +2556,6 @@ services:
     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.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa
-    check: "dsa_check_soas!2.1.0.0.0.0.0.2.8.8.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"
@@ -2455,6 +2587,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: