reordered / renamed things to match dsa-passwords
authorLuca Filipozzi <lucaf@emyr.net>
Thu, 29 Mar 2012 11:10:53 +0000 (11:10 +0000)
committerLuca Filipozzi <lucaf@emyr.net>
Thu, 29 Mar 2012 11:10:53 +0000 (11:10 +0000)
config/nagios-master.cfg

index 12a7203..bbb458d 100644 (file)
 # hosts
 #############################
 servers:
-  gw-man-da:
-    address: 82.195.75.126
+  # {{{ gateways
+  # {{{ gateways found in dsa-passwords
+  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, bzed
-  gw-man-da2:
-    address: 82.195.75.46
+    contacts: joerg
+  gw-accumu:
+    address: 130.239.18.97
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contacts: joerg, bzed
-  gw-HP-ftc:
-    address: 192.25.206.1
+  gw-anu:
+    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-ubcece
     hostgroups: layer3-infrastructure
-  gw-brown.edu:
+  gw-brown:
     address: 128.148.34.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-osuosl:
-    address: 140.211.166.1
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-scanplus-villa:
-    address: 212.211.132.1
+  gw-carnet:
+    address: 161.53.160.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-scanplus-lobos:
-    address: 212.211.132.249
+  gw-conova:
+    address: 217.196.149.238
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-mit-csail:
+  gw-csail:
     address: 128.31.0.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-umn.edu:
-    address: 128.101.240.222
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-dg-i.net:
+  gw-dgi:
     address: 93.94.132.102
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: bzed
-  gw-freenet:
-    address: 62.104.23.249
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-sanger:
-    address: 193.62.202.20
+  gw-ftc:
+    address: 192.25.206.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contacts: tjrc1, dave
-  gw-1und1:
-    address: 195.20.247.54
+  gw-grnet:
+    address: 194.177.211.193
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contacts: joerg
-  gw-1und1-karlsruhe:
-    address: 212.227.120.29
+  gw-helsinki:
+    address: 128.214.173.25
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-blackcat:
-    address: 193.201.200.129
+    contacts: holger
+  gw-isc:
+    address: 149.20.20.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-grnet:
-    address: 194.177.211.193
+  gw-karlsruhe:
+    address: 129.143.166.229
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-utwente:
-    address: 130.89.149.1
+  gw-man-da:
+    address: 82.195.75.126
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  #gw-ughent:
-  #  address: 157.193.39.254
-  #  parents: gw-ubcece
-  #  hostgroups: layer3-infrastructure
-  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
-  gw-ubcece:
-    address: 206.12.19.254
-    hostgroups: layer3-infrastructure
-    contacts: lfilipoz
-  gw-carnet:
-    address: 161.53.160.1
+    contacts: joerg, bzed
+  gw-man-da2:
+    address: 82.195.75.46
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-telegraaf2:
-    address: 217.196.40.15
+    contacts: joerg, bzed
+  gw-marist:
+    address: 148.100.96.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contact_groups: +alioth-admins
-  gw-helsinki:
-    address: 128.214.173.25
+  gw-osuosl:
+    address: 140.211.166.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contacts: holger
-  gw-isc:
-    address: 149.20.20.1
+  gw-rapidswitch:
+    address: 193.201.200.129
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-aca:
-    address: 130.239.18.97
+  gw-sanger:
+    address: 193.62.202.20
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-#  gw-esiee:
-#    address: 195.220.83.13
-#    parents: gw-ubcece
-#    hostgroups: layer3-infrastructure
-  gw-ghent:
-    address: 193.191.17.50
+    contacts: tjrc1, dave
+  gw-scanplus-lobos:
+    address: 212.211.132.249
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-anu:
-    address: 150.203.164.38
+  gw-scanplus-villa:
+    address: 212.211.132.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-sil:
     address: 86.59.118.145
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-arm:
-    address: 82.44.141.46
+  gw-ubcece:
+    address: 206.12.19.254
+    hostgroups: layer3-infrastructure
+    contacts: lfilipoz
+  gw-utwente:
+    address: 130.89.149.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-ynic:
@@ -170,152 +142,119 @@ servers:
     address: 146.97.42.26
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  # }}}
+  # {{{ gateways not found in dsa-passwords
+  gw-1und1-karlsruhe:
+    address: 212.227.120.29
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-c3sl:
     address: 200.17.202.254
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-zivit:
-    address: 80.245.144.3
+#  gw-esiee:
+#    address: 195.220.83.13
+#    parents: gw-ubcece
+#    hostgroups: layer3-infrastructure
+  gw-freenet:
+    address: 62.104.23.249
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-karlsruhe:
-    address: 129.143.166.229
+  gw-ghent:
+    address: 193.191.17.50
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-marist:
-    address: 148.100.96.1
+  gw-telegraaf2:
+    address: 217.196.40.15
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-conova:
-    address: 217.196.149.238
+    contact_groups: +alioth-admins
+  gw-umn.edu:
+    address: 128.101.240.222
     parents: gw-ubcece
     hostgroups: layer3-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
-  spohr:
-    address: 192.25.206.33
-    parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
-  peri:
-    address: 192.25.206.15
-    parents: gw-HP-ftc
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
-    contacts: dannf
-  penalosa:
-    address: 192.25.206.68
-    parents: gw-HP-ftc
-    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
-    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
-  agricola:
-    address: 82.195.75.86
-    parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hassrvfs, squeeze
-    contacts: bzed
-  arcadelt:
-    address: 82.195.75.87
-    parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
-    contacts: bzed
-  liszt:
-    address: 82.195.75.100
-    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
-  bendel:
-    address: 82.195.75.101
-    parents: gw-man-da
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https
-  heininen:
-    address: 82.195.75.98
-    parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
-  unger:
-    address: 82.195.75.102
-    parents: gw-man-da
-    hostgroups: computers, service, dl360, acpid-hosts, squeeze
-  handel:
-    address: 82.195.75.104
-    parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze
-  geo1:
-    address: 82.195.75.105
-    parents: unger
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
-  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
-  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
-#  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
-
+  gw-zivit:
+    address: 80.245.144.3
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  # }}}
+  # }}}
+  # {{{ servers
+  # {{{ servers found in dsa-passwords
+  # {{{ 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-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-anu
+  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
+  # }}}
+  # {{{ 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
@@ -324,18 +263,262 @@ servers:
     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
-
+  # }}}
+  # {{{ gw-brown
   franck:
     address: 128.148.34.3
-    parents: gw-brown.edu
+    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-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-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-ftc
+  alkman:
+    address: 192.25.206.63
+    parents: gw-ftc
+    hostgroups: computers, buildd, acpid-hosts, squeeze
+  merulo:
+    address: 192.25.206.58
+    parents: gw-ftc
+    hostgroups: computers, porterbox, hasusrfs, squeeze
+  mundy:
+    address: 192.25.206.62
+    parents: gw-ftc
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
+  penalosa:
+    address: 192.25.206.68
+    parents: gw-ftc
+    hostgroups: computers, buildd, hasbootfs, lenny
+    contacts: dannf
+  paer:
+    address: 192.25.206.11
+    parents: gw-ftc
+    hostgroups: computers, porterbox, hasbootfs, hashomefs, lenny
+  peri:
+    address: 192.25.206.15
+    parents: gw-ftc
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    contacts: dannf
+  samosa:
+    address: 192.25.206.57
+    parents: gw-ftc
+    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-ftc
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
+  # }}}
+  # {{{ 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, squeeze
+    contacts: bzed
+  arcadelt:
+    address: 82.195.75.87
+    parents: gw-man-da
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    contacts: bzed
+  ball:
+    address: 82.195.75.70
+    parents: gw-man-da
+    hostgroups: computers, buildd, hasbootfs, squeeze
+  # 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
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https, lenny
+    contacts: bzed
+  heininen:
+    address: 82.195.75.98
+    parents: gw-man-da
+    hostgroups: computers, acpid-hosts, service, squeeze, megactl
+  rem:
+    address: 82.195.75.68
+    parents: gw-man-da
+    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
+  # byrd TODO
+  diamond:
+    address: 82.195.75.108
+    parents: unger
+    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
+  handel:
+    address: 82.195.75.104
+    parents: unger
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze
+  kaufmann:
+    address: 82.195.75.107
+    parents: unger
+    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
+#  lamb:
+#    address: 82.195.75.101
+#    parents: unger
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+  # }}}
+  # {{{ 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
@@ -344,19 +527,6 @@ servers:
 #    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
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
@@ -369,63 +539,26 @@ servers:
     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
-
+  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
+  # albeniz TODO
+  # goetz TODO
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -436,71 +569,67 @@ 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, 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, squeeze
-    contacts: luk
-
+  # }}}
+  # {{{ 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: sw-ubcece-mcld
@@ -580,288 +709,128 @@ servers:
     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
-
-  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
-
-  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
-
-  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
-    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
+    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
-
-  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
+  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-utwente
+  kassia:
+    address: 130.89.149.224
+    parents: gw-utwente
+    hostgroups: computers, service, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
+  kassia-sec:
+    address: 130.89.149.225
+    parents: kassia
+    hostgroups: secondary-IPs
+  kassia-ftp:
+    address: 130.89.149.226
+    parents: kassia
+    hostgroups: secondary-IPs
+  kassia-volatile:
+    address: 130.89.149.227
+    parents: kassia
+    hostgroups: secondary-IPs
+  klecker:
+    address: 130.89.148.10
+    parents: gw-utwente
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+  klecker-ftp:
+    address: 130.89.148.12
+    parents: klecker
+    hostgroups: secondary-IPs
+  # }}}
+  # {{{ gw-ynic
   hildegard:
     address: 144.32.168.74
     parents: gw-ynic
@@ -874,31 +843,96 @@ servers:
     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
+  # }}}
+  # }}}
+  # {{{ servers not found in dsa-passwords
+  # {{{ gw-1und1-karlsruhe
+  schumann:
+    address: 212.227.126.54
+    parents: gw-1und1-karlsruhe
+    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-karlsruhe
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
+  # }}}
+  # {{{ 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
-
-  zemlinsky:
-    address: 129.143.160.6
-    parents: gw-karlsruhe
+  # }}}
+   # {{{ gw-esiee
+#  lafayette:
+#    address: 147.215.7.160
+#    parents: gw-esiee
+#    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
+  # }}}
+  # {{{ gw-freenet
+  pergolesi:
+    address: 62.104.23.252
+    parents: gw-freenet
+    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
+  # }}}
+  # {{{ gw-ghent
+  ancina:
+    address: 157.193.39.13
+    parents: gw-ghent
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
+    contacts: luk
+  # }}}
+  # {{{ 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-umn.edu
+  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
+  # }}}
+  # {{{ 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.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
 
 #############################
 # host groups
@@ -2561,3 +2595,5 @@ services:
     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: