X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=29cf2d9a5cc5d1aa5b5bb00d4a3cb942a3c43ede;hb=3dfd4edc313b166ba36907944e9faf56d95ab7b0;hp=4957ae331ea670f67c643413b3e29f99ef697cb5;hpb=11c6c807f9cf923c71572afde2c34e59db558d3a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4957ae3..29cf2d9 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -22,7 +22,6 @@
 #############################
 servers:
   # {{{ gateways
-  # {{{ gateways found in dsa-passwords
   global:
     hostgroups: notacomputer
     pingable: false
@@ -32,11 +31,19 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: joerg
+  gw-1und1-sec:
+    address: 212.227.126.33
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-accumu:
     address: 130.239.18.97
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-anu:
+  gw-c3sl:
+    address: 200.17.202.254
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-cecsit:
     address: 150.203.164.38
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
@@ -69,7 +76,11 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: bzed
-  gw-ftc:
+  gw-freenet:
+    address: 62.104.23.249
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-ftcollins:
     address: 192.25.206.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
@@ -95,11 +106,6 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: joerg, bzed
-  gw-man-da2:
-    address: 82.195.75.46
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: joerg, bzed
   gw-marist:
     address: 148.100.96.1
     parents: gw-ubcece
@@ -129,10 +135,23 @@ servers:
     address: 86.59.118.145
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-telegraaf2:
+    address: 217.196.40.15
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+    contact_groups: +alioth-admins
   gw-ubcece:
     address: 206.12.19.254
     hostgroups: layer3-infrastructure
     contacts: lfilipoz
+  gw-ugent:
+    address: 193.191.17.50
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-umn:
+    address: 128.101.240.222
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-utwente:
     address: 130.89.149.1
     parents: gw-ubcece
@@ -142,45 +161,12 @@ 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-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-ghent:
-    address: 193.191.17.50
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-telegraaf2:
-    address: 217.196.40.15
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contact_groups: +alioth-admins
-  gw-umn.edu:
-    address: 128.101.240.222
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   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
@@ -188,6 +174,28 @@ servers:
     hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, squeeze
     contacts: joerg
   # }}}
+  # {{{ gw-1und1-sec
+  schumann:
+    address: 212.227.126.54
+    parents: gw-1und1-sec
+    hostgroups: computers, acpid-hosts, service, squeeze
+  chopin:
+    address: 195.20.242.124
+    parents: schumann
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres90-hosts, squeeze
+  geo3:
+    address: 195.20.242.125
+    parents: schumann
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
+  soler:
+    address: 195.20.242.126
+    parents: schumann
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze
+  wieck:
+    address: 195.20.242.89
+    parents: gw-1und1-sec
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror, hasvarlogfs
+  # }}}
   # {{{ gw-accumu
   pettersson:
     address: 130.239.18.123
@@ -198,12 +206,6 @@ servers:
     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
@@ -241,10 +243,6 @@ servers:
     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
@@ -252,7 +250,7 @@ servers:
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
   # }}}
   # {{{ gw-brainfood
   master:
@@ -268,12 +266,19 @@ servers:
   franck:
     address: 128.148.34.3
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres90-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, squeeze
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, squeeze
   ries:
     address: 128.148.34.103
     parents: gw-brown
     hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
   # }}}
+  # {{{ gw-c3sl
+  santoro:
+    address: 200.17.202.197
+    parents: gw-c3sl
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT, security_mirror
+    contacts: faw
+  # }}}
   # {{{ gw-carnet
   lebrun:
     address: 193.198.184.10
@@ -284,6 +289,12 @@ servers:
     parents: gw-carnet
     hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
   # }}}
+  # {{{ gw-cecsit
+  gluck:
+    address: 150.203.164.38
+    parents: gw-cecsit
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, security_mirror
+  # }}}
   # {{{ gw-conova
   sompek:
     address: 217.196.149.225
@@ -295,10 +306,6 @@ servers:
     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
@@ -306,7 +313,7 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-dgi
   argento:
@@ -320,42 +327,39 @@ servers:
     hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, squeeze
     contacts: bzed
   # }}}
-  # {{{ gw-ftc
+  # {{{ gw-ftcollins
   alkman:
     address: 192.25.206.63
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, buildd, acpid-hosts, squeeze
   merulo:
     address: 192.25.206.58
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, porterbox, hasusrfs, squeeze
   mundy:
     address: 192.25.206.62
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
   penalosa:
     address: 192.25.206.68
-    parents: gw-ftc
+    parents: gw-ftcollins
     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
+    parents: gw-ftcollins
     hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
   spohr:
     address: 192.25.206.33
-    parents: gw-ftc
+    parents: gw-ftcollins
     hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
   # }}}
+  # {{{ gw-freenet
+  pergolesi:
+    address: 62.104.23.252
+    parents: gw-freenet
+    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
+  # }}}
   # {{{ gw-grnet
   barber:
     address: 194.177.211.203
@@ -419,7 +423,7 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -448,40 +452,33 @@ servers:
     parents: gw-man-da
     hostgroups: computers, service, dl380, acpid-hosts, squeeze
   bendel:
-    address: 82.195.75.101
+    address: 82.195.75.100
     parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
   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:
+  fils:
+    address: 82.195.75.89
+    parents: czerny
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+  vento:
     address: 82.195.75.98
-    parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, heavy-exim
+  lully:
+    address: 82.195.75.99
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvarlogfs
   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
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, squeeze
   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
@@ -497,7 +494,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -517,7 +514,15 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze, hasvarlogfs
+  byrd:
+    address: 140.211.166.20
+    parents: gw-osuosl
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+  buxtehude:
+    address: 140.211.166.26
+    parents: byrd
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, squeeze, hasvarlogfs
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -530,15 +535,15 @@ servers:
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze, buildd, hassrvfs
+    hostgroups: computers, squeeze, buildd, hassrvfs
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze, hassrvfs
+    hostgroups: computers, squeeze, hassrvfs
   piston:
     address: 140.211.15.154
     parents: gw-osuosl
-    hostgroups: computers, hassrvfs, squeeze
+    hostgroups: computers, squeeze, hassrvfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -560,7 +565,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts, hasvarlogfs
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -572,11 +577,11 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   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
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-sil
   beethoven:
@@ -610,6 +615,18 @@ servers:
     parents: merikanto
     hostgroups: secondary-IPs
   # }}}
+  # {{{ gw-telegraaf2
+  vasks:
+    address: 217.196.43.140
+    parents: gw-telegraaf2
+    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
+    contact_groups: alioth-admins
+  wagner:
+    address: 217.196.43.132
+    parents: gw-telegraaf2
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres91-hosts, apache-https, dl385, brokensamhain
+    contact_groups: alioth-admins
+  # }}}
   # {{{ gw-ubcece
   sw-ubcece:
     hostgroups: layer2-infrastructure
@@ -641,10 +658,30 @@ servers:
     address: 206.12.19.218
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  pasquini:
+    address: 206.12.19.217
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
   luchesi:
     address: 206.12.19.214
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  tristano:
+    address: 206.12.19.213
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  boito:
+    address: 206.12.19.216
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  bertali:
+    address: 206.12.19.212
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  ganeti2:
+    address: 206.12.19.23
+    parents: sw-ubcece-kais
+    hostgroups: notacomputer
   tchaikovsky:
     address: 206.12.19.118
     parents: luchesi
@@ -661,22 +698,10 @@ servers:
     address: 206.12.19.113
     parents: dijkstra
     hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
-  duarte:
-    address: 206.12.19.114
-    parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze, nfs-server
-  valente:
-    address: 206.12.19.112
-    parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts, service, lenny
-  bellini:
-    address: 206.12.19.7
-    parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, squeeze, autofs
   morricone:
     address: 206.12.19.9
     parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
+    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
   stabile:
     address: 206.12.19.13
     parents: sw-ubcece-kais
@@ -689,10 +714,6 @@ servers:
     address: 206.12.19.11
     parents: sw-ubcece-kais
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
-  vivaldi:
-    address: 206.12.19.12
-    parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -701,6 +722,10 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
+  falla:
+    address: 206.12.19.117
+    parents: luchesi
+    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
   fano:
     address: 206.12.19.110
     parents: luchesi
@@ -709,6 +734,10 @@ servers:
     address: 206.12.19.111
     parents: luchesi
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+  fischer:
+    address: 206.12.19.112
+    parents: luchesi
+    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
@@ -760,15 +789,15 @@ servers:
   glinka:
     address: 206.12.19.126
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts, autofs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs
   dukas:
     address: 206.12.19.128
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs, apache-https
   tye:
     address: 206.12.19.129
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
   elgar:
     address: 206.12.19.130
     parents: salieri
@@ -780,7 +809,7 @@ servers:
   gombert:
     address: 206.12.19.132
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim, apache2-hosts
   jenkins:
     address: 206.12.19.133
     parents: salieri
@@ -800,7 +829,44 @@ servers:
   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
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, uploadqueue
+  lilburn:
+    address: 206.12.19.138
+    parents: dijkstra
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs
+  popov:
+    address: 206.12.19.119
+    parents: luchesi
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+  beach:
+    address: 206.12.19.140
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts
+  ullmann:
+    address: 206.12.19.141
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, postgres91-hosts, nfs-client, apache2-hosts, autofs
+  sonntag:
+    address: 206.12.19.142
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, nfs-client, autofs, hassrvfs
+  menotti:
+    address: 206.12.19.143
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts, apache-https
+  # }}}
+  # {{{ gw-ugent
+  ancina:
+    address: 157.193.39.13
+    parents: gw-ugent
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
+    contacts: luk
+  # }}}
+  # {{{ gw-umn
+  saens:
+    address: 128.101.240.212
+    parents: gw-umn
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-utwente
   kassia:
@@ -822,7 +888,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -850,74 +916,6 @@ servers:
     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
-  # }}}
-   # {{{ 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
@@ -929,7 +927,6 @@ servers:
     hostgroups: computers, porterbox, hassrvfs, squeeze
   # }}}
   # }}}
-  # }}}
 
 
 #############################
@@ -1055,9 +1052,6 @@ hostgroups:
   amavis-hosts:
     alias: hosts running amavis
     private: 1
-  ftpd-hosts:
-    alias: hosts running vsftpd
-    private: 1
   #tftpd-hosts:
   #  alias: hosts running a tftpd (tftpd-hpa as a daemon)
   #  private: 1
@@ -1070,15 +1064,15 @@ hostgroups:
   #postgres81-hosts:
   #  alias: hosts running postgres81
   #  private: 1
-  postgres83-hosts:
-    alias: hosts running postgres83
-    private: 1
   postgres84-hosts:
     alias: hosts running postgres84
     private: 1
   postgres90-hosts:
     alias: hosts running postgres90
     private: 1
+  postgres91-hosts:
+    alias: hosts running postgres91
+    private: 1
   no-ulogd:
     alias: hosts not running ulogd
     private: 1
@@ -1128,6 +1122,9 @@ hostgroups:
   hasvarfs:
     alias: hosts with a /var filesystem
     private: 1
+  hasvarlogfs:
+    alias: hosts with a /var/log filesystem
+    private: 1
   hasusrfs:
     alias: hosts with a /usr filesystem
     private: 1
@@ -1155,6 +1152,9 @@ hostgroups:
     alias: machines with hight round trip times
     private: 1
 
+  security_mirror:
+    alias: hosts that are security mirrors
+    private: 1
 #############################
 # servicegroups
 #############################
@@ -1214,9 +1214,14 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 90 95"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 10% -c 5%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/home/buildd/build-trees"
     hostgroups: computers
-    excludehosts: sibelius
+    excludehosts: sibelius,stabile
+  -
+    name: disk usage - all
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 10% -c 5%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/srv/snapshot.debian.org"
+    hosts: stabile
   -
     name: disk usage - all
     servicegroups: diskspace
@@ -1228,12 +1233,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: kassia, spohr, liszt
+    excludehosts: kassia, spohr
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: kassia, spohr, liszt
+    hosts: kassia, spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1254,12 +1259,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
-    excludehosts: ries
+    excludehosts: ries, beach
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts: ries
+    hosts: ries, beach
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -1284,13 +1289,17 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: samosa, stabile, sibelius, busoni
-
+    hosts: samosa, stabile, sibelius, busoni, buxtehude
   -
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck, heininen
+    hostgroups: hasvarlogfs
+  -
+    name: disk usage on /var/spool/postfix
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/spool/postfix"
+    hosts: bendel
 
   #-
   #  name: disk usage on /srv/morgue.debian.org
@@ -1300,83 +1309,63 @@ services:
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/mirrors"
     hosts: beethoven, sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
-    hosts: stabile,sibelius
-  -
-    name: disk usage on /srv/farm-snapshot/farm-01
-    servicegroups: diskspace
-    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 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 95 98 /srv/farm-snapshot/farm-45"
-    hosts: sibelius
+    nrpe: "/usr/lib/nagios/plugins/check_disk 94 98 /srv/snapshot.debian.org"
+    hosts: stabile
   -
-    name: disk usage on /srv/farm-snapshot/farm-67
+    name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-67"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-89
+    name: disk usage on /srv/farm-snapshot/farm-misc
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-89"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-ab
+    name: disk usage on /var/lib/postgresql/9.0/dak
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-ab"
-    hosts: sibelius
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.0/dak"
+    hosts: franck
   -
-    name: disk usage on /srv/farm-snapshot/farm-cd
+    name: disk usage on /var/lib/postgresql/9.1/dak
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-cd"
-    hosts: sibelius
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.1/dak"
+    hosts: franck
   -
-    name: disk usage on /srv/farm-snapshot/farm-f
+    name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-f"
-    hosts: sibelius
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org"
+    hosts: franck
   -
-    name: disk usage on /srv/farm-snapshot/farm-e
+    name: disk usage on /srv/pgbackup
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-e"
-    hosts: sibelius
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /srv/pgbackup"
+    hosts: franck
   -
-    name: disk usage on /srv/fossology.debian.net
+    name: disk usage on /srv/pgbackup
     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
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/pgbackup"
+    hosts: beethoven
   -
-    name: disk usage on /var/lib/postgresql/9.0/dak
+    name: disk usage on /srv/git-backup
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.0/dak"
-    hosts: franck
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/git-backup"
+    hosts: beethoven
   -
-    name: disk usage on /srv/ftp-master.debian.org
+    name: disk usage on /srv/da-backup
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org"
-    hosts: franck
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/da-backup"
+    hosts: beethoven
   -
-    name: disk usage on /srv/pgbackup
+    name: disk usage on /srv/bacula
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /srv/pgbackup"
-    hosts: franck
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/bacula"
+    hosts: beethoven
 
  ############ All Computers ############
  ####
@@ -1509,11 +1498,6 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: liszt
-  -
-    name: processes - total
-    nrpe: "/usr/lib/nagios/plugins/check_procs 800 1000"
-    hosts: liszt
  ####
   -
     name: swap usage - percent
@@ -1631,9 +1615,15 @@ services:
     hostgroups: freebsd
 
   -
-    name: remote logging
+    name: remote logging on lotti
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: lotti
+    hostgroups: computers
+    excludehosts: vasks, wagner
+  -
+    name: remote logging on lully
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-    runfrom: heininen
+    runfrom: lully
     hostgroups: computers
     excludehosts: vasks, wagner
  ### MAIL STUFF
@@ -1643,7 +1633,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts, mail-relay
-    excludehosts: master, busoni, quantz
+    excludehosts: master, busoni, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
@@ -1653,11 +1643,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, quantz
+    excludehosts: master, busoni, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, busoni, quantz
+    hosts: master, busoni, quantz, buxtehude
   -
     name: mail queue
     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
@@ -1703,29 +1693,29 @@ services:
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: liszt
+    hosts: bendel
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
-    hosts: liszt, wagner
+    hosts: wagner, bendel
     hostgroups: spamd
     depends: process - spamd - master
   #
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
-    hosts: busoni
+    hosts: busoni, buxtehude
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
-    hosts: busoni
+    hosts: busoni, buxtehude
   #
   -
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt, busoni, wagner
+    excludehosts: bendel, busoni, wagner, buxtehude
 
  ###
   #-
@@ -1756,11 +1746,11 @@ services:
  ###
   -
     name: process - amavis - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd (master)'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd-new (master)'"
     hostgroups: amavis-hosts
   -
     name: process - amavis - all
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd '"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd-new '"
     hostgroups: amavis-hosts
     depends: process - amavis - master
   #
@@ -1772,16 +1762,16 @@ services:
  ###
   -
     name: process - weightd - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -C policyd-weight -a 'policyd-weight (master)'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (master)'"
     hostgroups: heavy-postfix
   -
     name: process - weightd - cache
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -C policyd-weight -a 'policyd-weight (cache)'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (cache)'"
     hostgroups: heavy-postfix
     depends: process - weightd - master
   -
     name: process - weightd - child
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u polw -C policyd-weight -a 'policyd-weight (child)'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u polw -a 'policyd-weight (child)'"
     hostgroups: heavy-postfix
     depends: process - weightd - master
   #
@@ -1840,17 +1830,6 @@ services:
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
-  -
-    name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:150 -c 0:200 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
-    hosts: liszt
-    depends: process - postfix - master
-  -
-    name: process - postfix - smtp
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:350 -c 0:500 -u postfix -C smtp -a 'smtp -t unix -u -c'"
-    hosts: liszt
-    depends: process - postfix - master
-
  ###
   -
     name: network service - smtp
@@ -2039,22 +2018,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehosts: villa, lobos, liszt, senfl, schein, rore
+    excludehosts: villa, lobos, senfl, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
     normal_check_interval: 120
-    hosts: villa, lobos, liszt
+    hosts: villa, lobos
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
     normal_check_interval: 120
     hosts: senfl, schein
-  -
-    name: HW - hpasmcli status
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant --fan-high"
-    normal_check_interval: 120
-    hosts: rore
  ###
   -
     name: RAID - areca
@@ -2184,11 +2158,11 @@ services:
   #  check: check_tcp!873
   #  hosts: kassia-sec
   #  depends: kassia:process - xinetd
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: merikanto2
-    depends: merikanto:process - xinetd
+#  -
+#    name: network service - rsync
+#    check: check_tcp!873
+#    hosts: merikanto2
+#    depends: merikanto:process - xinetd
 
  ###
   -
@@ -2237,6 +2211,13 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
+    excludehosts: handel
+    depends: "process - apache2 - master"
+    normal_check_interval: 120
+  -
+    name: network service - https
+    check: dsa_check_https_want_auth
+    hosts: handel
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2271,22 +2252,11 @@ services:
     excludehostgroups: bind9-hosts
 
  ####
-  -
-    name: process - vsftp - listener
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C vsftpd -a 'vsftpd: LISTENER'"
-    hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: klecker
-  -
-    name: process - vsftp - instance
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '"
-    hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: klecker
   -
     name: network service - ftp
     check: check_ftp
-    hostgroups: ftpd-hosts, uploadqueue
+    hostgroups: uploadqueue, security_mirror
     excludehosts: klecker
-    depends: process - vsftp - listener
   -
     name: network service - ftp
     check: check_ftp
@@ -2324,7 +2294,11 @@ services:
     name: unwanted process - postresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres83-hosts
+    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres91-hosts
+  -
+    name: process - postresql91 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
+    hostgroups: postgres91-hosts
   -
     name: process - postresql90 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.0/bin/postgres'"
@@ -2333,10 +2307,6 @@ services:
     name: process - postresql84 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
     hostgroups: postgres84-hosts
-  -
-    name: process - postresql83 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres'"
-    hostgroups: postgres83-hosts
   #-
   #  name: process - postresql83 - master udd
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
@@ -2373,7 +2343,7 @@ 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, wheezy
-    excludehosts: fano, fasch, field, finzi
+    excludehostgroups: freebsd
  ####
   -
     name: process - UPS - nut usbhid-ups - ups1
@@ -2427,14 +2397,14 @@ services:
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
-    hosts: fano, fasch, field, finzi
+    hosts: fano, fasch, field, finzi, fils
     contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: fano, fasch, field, finzi
+    excludehosts: fano, fasch, field, finzi, fils
     contact_groups: buildd
  ####
   -
@@ -2449,11 +2419,6 @@ services:
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
   #  hostgroups: tftpd-hosts
  ###
-#  -
-#    name: process - dhcpd
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
-#    hosts: paer
- ###
 
  ############ NFS Stuff ############
  ####
@@ -2477,13 +2442,6 @@ services:
     name: process - mountd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rpc.mountd -a '/sbin/rpc.mountd'"
     hostgroups: nfs-server
- # see if the nfs stuff works and doesn't hang.
-  # the df check all script will also hang, but we don't appear to pay attention to that
-  -
-    name: nfs mount ftp archive
-    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
-    hosts: bellini
-
   -
     name: nfs server stabile reachable
     nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.13 -w 50,10% -c 200,30%"
@@ -2509,10 +2467,6 @@ services:
     name: mirror sync - security
     check: "dsa_check_mirrorsync_skew!security-nagios.debian.org!project/trace/security-master.debian.org!150:3600"
     hosts: global
-  -
-    name: mirror sync - volatile
-    check: "dsa_check_mirrorsync_skew!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org!150:3600"
-    hosts: global
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
@@ -2555,10 +2509,6 @@ services:
     name: DNS SOA sync - 2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
     hosts: global
-  -
-    name: DNS SOA sync - a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
-    check: "dsa_check_soas!a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
-    hosts: global
   -
     name: DNS SOA sync - 2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
@@ -2590,7 +2540,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=2041 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7434 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini