X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=e7c85b0e00ff6db28cb66255ebaf82d419b98730;hb=641fda5d031ff251ca6b8af33e39c717d9a9fdde;hp=53152107811249e97e2601fd500bcb9e0edff407;hpb=7b627bf69d54c684d9ce76757906fb81cb37da96;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5315210..6dfa9df 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -23,169 +23,163 @@
 servers:
   gw-man-da:
     address: 82.195.75.126
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: joerg, bzed
   gw-man-da2:
     address: 82.195.75.46
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-brainfood:
     address: 70.103.162.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-brown.edu:
     address: 128.148.34.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-osuosl:
     address: 140.211.166.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-scanplus-villa:
     address: 212.211.132.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-scanplus-lobos:
     address: 212.211.132.249
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-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
+    address: 128.31.0.1
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-umn.edu:
     address: 128.101.240.222
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-dg-i.net:
     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
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-sanger:
     address: 193.62.202.20
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-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
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: joerg
   gw-1und1-karlsruhe:
     address: 212.227.120.29
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-blackcat:
     address: 193.201.200.129
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    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
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-utwente:
     address: 130.89.149.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-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:
+  #  parents: gw-ubcece
+  #  hostgroups: layer3-infrastructure
+  sw-ubcece:
+    parents: tchaikovsky
+    hostgroups: layer2-infrastructure
+    contacts: lfilipoz
+    pingable: false
+    check_command: dsa_check_always_ok
+  gw-ubcece:
     address: 206.12.19.254
     parents: tchaikovsky
-    hostgroups: routing-infrastructure
+    hostgroups: layer3-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-telegraaf2:
+    address: 217.196.40.15
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contact_groups: +alioth-admins
   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
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-aca:
     address: 130.239.18.97
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
 #  gw-esiee:
 #    address: 195.220.83.13
-#    parents: gw-ubc
-#    hostgroups: routing-infrastructure
+#    parents: gw-ubcece
+#    hostgroups: layer3-infrastructure
   gw-ghent:
     address: 193.191.17.50
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-anu:
     address: 150.203.164.38
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-sil:
     address: 86.59.118.145
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-arm:
     address: 82.44.141.46
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    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
+    parents: gw-ubcece
+    hostgroups: layer3-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
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-karlsruhe:
+    address: 129.143.166.229
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-marist:
+    address: 148.100.96.1
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-conova:
+    address: 217.196.149.238
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -193,37 +187,25 @@ servers:
     check_command: dsa_check_always_ok
 
   vasks:
-    address: 217.196.43.132
-    parents: gw-telegraaf
-    hostgroups: computers
+    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.140
-    parents: gw-telegraaf
-    hostgroups: computers
+    address: 217.196.43.132
+    parents: gw-telegraaf2
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
 
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
     hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
-  raff:
-    address: 192.25.206.59
-    parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
-#  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
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -237,7 +219,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, lenny
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -245,7 +227,7 @@ servers:
   merulo:
     address: 192.25.206.58
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasusrfs, lenny
+    hostgroups: computers, porterbox, hasusrfs, squeeze
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
@@ -259,26 +241,26 @@ servers:
   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
   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
-  nielsen:
-    address: 82.195.75.99
-    parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, lenny
+    hostgroups: computers, acpid-hosts, service, squeeze, megactl
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -311,14 +293,18 @@ servers:
     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
+#  lamb:
+#    address: 82.195.75.101
+#    parents: unger
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+  czerny:
+    address: 82.195.75.109
+    parents: gw-man-da
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+  new-master:
+    address: 82.195.75.110
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
 
   master:
     address: 70.103.162.29
@@ -333,7 +319,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
+    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
 
   franck:
     address: 128.148.34.3
@@ -343,7 +329,7 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, squeeze
 #  mayr:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
@@ -351,7 +337,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa, squeeze
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -361,10 +347,18 @@ servers:
     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
+  parry:
+    address: 140.211.15.153
     parents: gw-osuosl
-    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny
+    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
 
   villa:
     address: 212.211.132.32
@@ -400,11 +394,6 @@ servers:
   #  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
@@ -413,7 +402,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
     contacts: bzed
 
   widor:
@@ -427,18 +416,6 @@ servers:
     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
@@ -450,16 +427,10 @@ servers:
     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
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, squeeze
     contacts: joerg
 
   schumann:
@@ -486,17 +457,12 @@ servers:
   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
+    hostgroups: computers, buildd, sw-raid, 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
+    hostgroups: computers, service, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -509,34 +475,38 @@ servers:
     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
+
 
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, lenny
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
     contacts: luk
 
-  agnesi:
-    address: 67.233.102.241
-    parents: gw-agnesi
-    hostgroups: deadslow, porterbox, lenny
-
   spontini:
     address: 206.12.19.14
-    parents: gw-ubc
+    parents: sw-ubcece
     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
+    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
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   luchesi:
     address: 206.12.19.214
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   tchaikovsky:
     address: 206.12.19.118
@@ -544,7 +514,7 @@ servers:
   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
@@ -563,28 +533,28 @@ 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
     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
     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
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
   paganini:
     address: 206.12.19.10
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
   respighi:
     address: 206.12.19.11
-    parents: gw-ubc
+    parents: sw-ubcece
     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
+    parents: sw-ubcece
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -596,46 +566,42 @@ servers:
   fano:
     address: 206.12.19.110
     parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   finzi:
     address: 206.12.19.111
     parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   gabrielli:
     address: 206.12.19.17
-    parents: tchaikovsky
-    hostgroups: computers, porterbox, lenny
+    parents: sw-ubcece
+    hostgroups: computers, porterbox, squeeze
   corelli:
     address: 206.12.19.16
-    parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    parents: sw-ubcece
+    hostgroups: computers, buildd, squeeze
   lucatelli:
     address: 206.12.19.15
-    parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    parents: sw-ubcece
+    hostgroups: computers, buildd, squeeze
   rossini:
     address: 206.12.19.19
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   salieri:
     address: 206.12.19.20
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   traetta:
     address: 206.12.19.21
-    parents: tchaikovsky
+    parents: sw-ubcece
     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
+#  locke:
+#    address: 206.12.19.120
+#    parents: sw-ubcece
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
   lotti:
     address: 206.12.19.121
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
   quantz:
     address: 206.12.19.122
@@ -652,7 +618,7 @@ servers:
   danzi:
     address: 206.12.19.125
     parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: traetta
@@ -665,6 +631,38 @@ servers:
     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
@@ -675,11 +673,6 @@ servers:
     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
@@ -700,11 +693,6 @@ servers:
     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
@@ -735,7 +723,7 @@ servers:
   fasch:
     address: 194.177.211.201
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     #, mptraid
   holter:
     address: 194.177.211.202
@@ -772,7 +760,7 @@ servers:
   field:
     address: 194.177.211.210
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     #, mptraid
 
   beethoven:
@@ -782,7 +770,7 @@ servers:
   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
+    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
@@ -790,38 +778,70 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, hassrvfs
+    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
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, megactl
     # which raid?
+  eder:
+    address: 86.59.118.151
+    parents: gw-sil
+    hostgroups: computers, porterbox, squeeze, hassrvfs
+  eysler:
+    address: 86.59.118.152
+    parents: gw-sil
+    hostgroups: computers, buildd, squeeze
 
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    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
@@ -831,13 +851,44 @@ servers:
     address: 144.32.168.78
     parents: gw-ynic
     hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+  hildegard:
+    address: 144.32.168.74
+    parents: gw-ynic
+    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
 
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
+    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
+    hostgroups: computers, buildd, 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
 #
@@ -848,18 +899,23 @@ hostgroups:
   computers:
     alias: computers
     private: 1
-  routing-infrastructure:
-    alias: Internet routers and friends
-    extinfo-icon_image: base/switch40.png
+  layer2-infrastructure:
+    alias: layer 2 devices like switches
+    extinfo-icon_image: base/switch.png
+    extinfo-icon_image_alt: switch
+  layer3-infrastructure:
+    alias: layer 3 devices like routers
+    extinfo-icon_image: base/router.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
@@ -906,6 +962,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
@@ -915,6 +974,8 @@ hostgroups:
 
   squeeze:
     alias: Hosts running squeeze
+  wheezy:
+    alias: Hosts running wheezy
 
   lenny:
     alias: Hosts running lenny
@@ -975,9 +1036,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
@@ -1012,9 +1070,6 @@ hostgroups:
     alias: secondary IP addresses
     private: 1
 
-  smart:
-    alias: hosts with smartd
-    private: 1
   hasbootfs:
     alias: hosts with a /boot filesystem
     private: 1
@@ -1033,9 +1088,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
@@ -1050,6 +1105,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
 #############################
@@ -1068,6 +1130,8 @@ servicegroups:
     alias: apt upgrade status
   samhain:
     alias: samhain integrity status
+  time:
+    alias: time stuff
   security:
     alias: security
     servicegroup_members: apt, weaksshkeys, kernel, samhain
@@ -1080,14 +1144,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
@@ -1102,17 +1173,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
@@ -1128,11 +1206,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
@@ -1144,16 +1217,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
@@ -1164,11 +1232,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
@@ -1186,16 +1249,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
@@ -1204,48 +1267,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-cd
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-cd"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-abf
+    name: disk usage on /srv/farm-snapshot/farm-f
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-abf"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-f"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-cde
+    name: disk usage on /srv/farm-snapshot/farm-e
     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-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
@@ -1269,6 +1342,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
  ####
@@ -1297,27 +1371,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"
@@ -1330,6 +1404,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
 
  ####
   -
@@ -1337,17 +1412,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
@@ -1356,6 +1434,7 @@ services:
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5
+    excludehostgroups: brokensamhain
 
  ####
   -
@@ -1421,17 +1500,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
  ####
   -
@@ -1449,23 +1523,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
@@ -1473,12 +1554,14 @@ services:
     depends: process - ntpd
     excludehosts: ancina
     excludehostgroups: ntpsuckers
+    servicegroups: time
   #
   -
     name: network service - time
     check: dsa_check_time
     hosts: ancina
     depends: process - xinetd
+    servicegroups: time
 
  ###
   -
@@ -1497,6 +1580,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
@@ -1508,6 +1592,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: heininen
     hostgroups: computers
+    excludehosts: vasks, wagner
  ### MAIL STUFF
  ###
   -
@@ -1539,34 +1624,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'"
@@ -1574,7 +1664,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
   #
@@ -1592,7 +1682,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
 
  ###
   #-
@@ -1752,32 +1842,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
@@ -1812,7 +1908,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"
@@ -1823,6 +1919,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 ############
  ####
@@ -1848,12 +1948,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
@@ -1943,6 +2043,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
@@ -1960,6 +2066,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"
@@ -1986,16 +2093,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
@@ -2013,17 +2120,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
@@ -2062,14 +2174,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
   -
@@ -2121,24 +2232,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
 
  ####
   -
@@ -2205,17 +2315,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
@@ -2230,26 +2329,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'"
@@ -2272,6 +2354,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
 
  ####
   #-
@@ -2307,6 +2393,12 @@ services:
     hostgroups: buildd
     excludehosts: fano, fasch, field, finzi
     contact_groups: buildd
+ ####
+  -
+    name: network service - gobby
+    check: check_tcp!6523
+    hosts: gombert
+    contact_groups: gobby
 
  ###
   #-
@@ -2319,10 +2411,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 ############
  ####
@@ -2348,10 +2436,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"
@@ -2432,10 +2516,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"
@@ -2467,6 +2547,6 @@ 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