X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=fc9d663209967667f6382b0ea8b4885bc35a72a2;hb=8335c03579a890f69fb8c85126f2fd36ece06548;hp=a6a74c3f3016c26a2147f9d026c66550b781eaab;hpb=2f1b88b95d14322c23418deeaab466a926e5bb76;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a6a74c3..4bb8414 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -31,9 +31,9 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contacts: joerg
-  gw-1und1-sec:
-    address: 212.227.120.29
-    parents: gw-ubcece
+#  gw-1und1-sec:
+#    address: 212.227.126.33
+#    parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-accumu:
     address: 130.239.18.97
@@ -106,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
@@ -182,12 +177,13 @@ servers:
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
-    parents: gw-1und1-sec
+    parents: gw-ubcece
+    #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
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres91-hosts, squeeze
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -195,11 +191,12 @@ servers:
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze, apache-https
   wieck:
     address: 195.20.242.89
-    parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
+    parents: gw-ubcece
+    #parents: gw-1und1-sec
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror, hasvarlogfs
   # }}}
   # {{{ gw-accumu
   pettersson:
@@ -215,55 +212,47 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze, deadslow
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, squeeze, deadslow
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
   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
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, deadslow
   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
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
   henze:
     address: 217.140.96.70
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
   # {{{ gw-brainfood
   master:
-    address: 70.103.162.29
+    address: 97.107.116.29
     parents: gw-brainfood
     hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
   murphy:
@@ -275,17 +264,17 @@ 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
+    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres91-hosts
   # }}}
   # {{{ gw-c3sl
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT, security_mirror
     contacts: faw
   # }}}
   # {{{ gw-carnet
@@ -302,7 +291,7 @@ servers:
   gluck:
     address: 150.203.164.38
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-conova
   sompek:
@@ -315,10 +304,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
@@ -326,13 +311,13 @@ 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:
     address: 93.94.130.160
     parents: gw-dgi
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, sw-raid, hassrvfs, wheezy
     contacts: bzed
   widor:
     address: 93.94.130.161
@@ -353,20 +338,6 @@ servers:
     address: 192.25.206.62
     parents: gw-ftcollins
     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
-  penalosa:
-    address: 192.25.206.68
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, hasbootfs, lenny
-    contacts: dannf
-  paer:
-    address: 192.25.206.11
-    parents: gw-ftcollins
-    hostgroups: computers, porterbox, hasbootfs, hashomefs, lenny
-  peri:
-    address: 192.25.206.15
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
-    contacts: dannf
   samosa:
     address: 192.25.206.57
     parents: gw-ftcollins
@@ -400,11 +371,6 @@ servers:
     parents: rautavaara
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     #, mptraid
-  field:
-    address: 194.177.211.210
-    parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-    #, mptraid
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
@@ -425,10 +391,6 @@ servers:
     address: 194.177.211.199
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, megaraid, service, squeeze
-  scelsi:
-    address: 194.177.211.208
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, service, squeeze
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
@@ -445,7 +407,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:
@@ -473,41 +435,38 @@ servers:
     address: 82.195.75.109
     parents: gw-man-da
     hostgroups: computers, service, dl380, acpid-hosts, squeeze
+  clementi:
+    address: 82.195.75.103
+    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:
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, bacula-client
+  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, kvmdomains, wheezy, 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
@@ -523,11 +482,20 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
   kaufmann:
     address: 82.195.75.107
     parents: unger
     hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
+  ganeti3:
+    address: 82.195.75.111
+    parents: gw-man-da
+    hostgroups: notacomputer
+  wilder:
+    address: 82.195.75.112
+    parents: ganeti3
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https
+
 #  lamb:
 #    address: 82.195.75.101
 #    parents: unger
@@ -543,7 +511,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, heavy-exim, 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
@@ -556,15 +532,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, hassrvfs
+    hostgroups: computers, squeeze, hassrvfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -586,7 +562,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
@@ -598,11 +574,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:
@@ -625,7 +601,7 @@ servers:
   lindberg:
     address: 86.59.118.149
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, megactl
+    hostgroups: computers, acpid-hosts, service, squeeze, megactl
     # which raid?
   merikanto:
     address: 86.59.118.147
@@ -645,7 +621,7 @@ servers:
   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
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres91-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
   # }}}
   # {{{ gw-ubcece
@@ -679,10 +655,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, drbd-hosts
   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, drbd-hosts
+  boito:
+    address: 206.12.19.216
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+  bertali:
+    address: 206.12.19.212
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
+  ganeti2:
+    address: 206.12.19.23
+    parents: sw-ubcece-kais
+    hostgroups: notacomputer
   tchaikovsky:
     address: 206.12.19.118
     parents: luchesi
@@ -699,22 +695,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
@@ -727,10 +711,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
@@ -739,6 +719,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
@@ -747,6 +731,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
@@ -758,7 +746,7 @@ servers:
   lucatelli:
     address: 206.12.19.15
     parents: sw-ubcece-kais
-    hostgroups: computers, buildd, squeeze
+    hostgroups: computers, buildd, squeeze, deadslow
   rossini:
     address: 206.12.19.19
     parents: sw-ubcece-kais
@@ -798,15 +786,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
@@ -818,7 +806,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
@@ -838,7 +826,40 @@ 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, wheezy, hassrvfs
+  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
+  coincy:
+    address: 206.12.19.144
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs
+  stanley:
+    address: 206.12.19.145
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
   # }}}
   # {{{ gw-ugent
   ancina:
@@ -851,29 +872,13 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
   # }}}
   # {{{ gw-utwente
-  kassia:
-    address: 130.89.149.224
-    parents: gw-utwente
-    hostgroups: computers, service, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
-  kassia-sec:
-    address: 130.89.149.225
-    parents: kassia
-    hostgroups: secondary-IPs
-  kassia-ftp:
-    address: 130.89.149.226
-    parents: kassia
-    hostgroups: secondary-IPs
-  kassia-volatile:
-    address: 130.89.149.227
-    parents: kassia
-    hostgroups: secondary-IPs
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -883,15 +888,15 @@ servers:
   hildegard:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
   howells:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
   hummel:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
@@ -935,6 +940,8 @@ hostgroups:
   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
@@ -1002,13 +1009,12 @@ hostgroups:
   wheezy:
     alias: Hosts running wheezy
 
-  lenny:
-    alias: Hosts running lenny
-
   kvmdomains:
     alias: Hosts that are KVM domains
     private: 1
 
+  drbd-hosts:
+    alias: hosts running drbd
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -1037,9 +1043,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
@@ -1052,15 +1055,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
@@ -1076,6 +1079,10 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
+  
+  bacula-client:
+    alias: hosts which are backuped with bacula
+    private: 1
 
   nfs-client:
     alias: hosts mounting filesystems using NFS
@@ -1110,6 +1117,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
@@ -1137,6 +1147,9 @@ hostgroups:
     alias: machines with hight round trip times
     private: 1
 
+  security_mirror:
+    alias: hosts that are security mirrors
+    private: 1
 #############################
 # servicegroups
 #############################
@@ -1196,9 +1209,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
@@ -1210,12 +1228,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: kassia, spohr, liszt
+    excludehosts: spohr
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: kassia, spohr, liszt
+    hosts: spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1236,12 +1254,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
-    excludehosts: ries
+    excludehosts: stabile, beach
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts: ries
+    hosts: stabile, beach
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -1266,13 +1284,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: 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
@@ -1282,83 +1304,58 @@ 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
-  -
-    name: disk usage on /srv/farm-snapshot/farm-67
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-67"
-    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-89
+    name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-89"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-ab
+    name: disk usage on /srv/farm-snapshot/farm-misc
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-ab"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
     hosts: sibelius
   -
-    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 ############
  ####
@@ -1385,7 +1382,11 @@ services:
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
-
+  -
+    name: backup - bacula
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula -H $HOSTNAME$"
+    runfrom: dinis
+    hostgroups: bacula-client
  ####
   -
     name: running kernel
@@ -1491,11 +1492,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
@@ -1558,8 +1554,8 @@ services:
     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
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
+    hostgroups: wheezy
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1578,7 +1574,7 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: ancina
-    excludehostgroups: ntpsuckers
+    excludehostgroups: ntpsuckers, deadslow
     servicegroups: time
   #
   -
@@ -1596,7 +1592,7 @@ services:
  ###
   -
     name: process - cron
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C cron -a /usr/sbin/cron"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C cron -a /usr/sbin/cron"
     hostgroups: computers
 
  ###
@@ -1613,9 +1609,15 @@ services:
     hostgroups: freebsd
 
   -
-    name: remote logging
+    name: remote logging on lotti
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-    runfrom: heininen
+    runfrom: lotti
+    hostgroups: computers
+    excludehosts: vasks, wagner
+  -
+    name: remote logging on lully
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: lully
     hostgroups: computers
     excludehosts: vasks, wagner
  ### MAIL STUFF
@@ -1625,7 +1627,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'"
@@ -1635,11 +1637,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"
@@ -1665,19 +1667,20 @@ services:
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
     hostgroups: computers
-    excludehostgroups: heavy-exim, heavy-postfix
+    excludehostgroups: heavy-exim, heavy-postfix, deadslow
     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
+    excludehostgroups: heavy-exim, heavy-postfix, deadslow
     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, wagner
+    excludehostgroups: deadslow
   -
     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'"
@@ -1685,29 +1688,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: 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: 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
+    excludehostgroups: spamd, deadslow
+    excludehosts: bendel, busoni, wagner, buxtehude
 
  ###
   #-
@@ -1719,12 +1722,19 @@ services:
     name: unwanted process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
     hostgroups: computers
+    excludehostgroups: deadslow
 
  ###
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
     hostgroups: heavy-exim
+    excludehostgroups: wheezy
+  -
+    name: process - postgrey
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
+    hostgroups: heavy-exim
+    excludehostgroups: squeeze
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
@@ -1734,15 +1744,15 @@ services:
     name: unwanted process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
     hostgroups: computers
-    excludehostgroups: heavy-postfix, heavy-exim
+    excludehostgroups: heavy-postfix, heavy-exim, deadslow
  ###
   -
     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
   #
@@ -1750,20 +1760,20 @@ services:
     name: unwanted process - amavis
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C amavisd-new"
     hostgroups: computers
-    excludehostgroups: amavis-hosts
+    excludehostgroups: amavis-hosts, deadslow
  ###
   -
     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
   #
@@ -1771,7 +1781,7 @@ services:
     name: unwanted process - policyd-weight
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight"
     hostgroups: computers
-    excludehostgroups: heavy-postfix
+    excludehostgroups: heavy-postfix, deadslow
 
 
 
@@ -1822,17 +1832,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
@@ -1881,6 +1880,13 @@ services:
     hostgroups: computers
     excludehosts: vasks, wagner
     excludehostgroups: freebsd
+  -
+    name: system - filesystem check
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
+    normal_check_interval:  60
+    retry_check_interval: 15
+    excludehosts: wagner, vasks
+    hostgroups: computers
  ###
   -
     name: local resolver
@@ -1904,6 +1910,7 @@ services:
     name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
     hostgroups: computers
+    excludehostgroups: deadslow
 
  ####
  ###
@@ -1919,25 +1926,28 @@ services:
     name: unwanted process - gkrellmd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
     hostgroups: computers
+    excludehostgroups: deadslow
   -
     name: unwanted process - portmap
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C portmap"
     hostgroups: computers
-    excludehostgroups: nfs-client, nfs-server
+    excludehostgroups: nfs-client, nfs-server, deadslow
   -
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
     hostgroups: computers
-    excludehostgroups: nfs-client, nfs-server
+    excludehostgroups: nfs-client, nfs-server, deadslow
   -
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
     excludehosts: grieg, abel, alwyn, vasks
+    excludehostgroups: deadslow
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
     hostgroups: computers
+    excludehostgroups: deadslow
 
  ####
   -
@@ -1978,7 +1988,7 @@ services:
   -
     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
+    hostgroups: wheezy
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -1996,7 +2006,13 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
-    excludehosts: kassia
+    excludehosts: schein
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
+    normal_check_interval: 120
+    hosts: schein
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2009,34 +2025,23 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
     normal_check_interval: 120
     hostgroups: dl585
-  -
-    name: HW - hpacucli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:2 --ignore-transfer-speed=1I:1:3 --ignore-transfer-speed=1I:1:4 --ignore-transfer-speed=2I:1:5 --ignore-transfer-speed=2I:1:6"
-    normal_check_interval: 120
-    hosts: kassia
  ###
   -
     name: HW - hpasmcli status
     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
@@ -2074,6 +2079,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megactl"
     hostgroups: megactl
+ ###
+  -
+    name: RAID - DRBD
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
+    hostgroups: drbd-hosts
  ###
   -
     name: process - slapd
@@ -2137,7 +2148,7 @@ services:
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehostgroups: xinetd-hosts
+    excludehostgroups: xinetd-hosts, deadslow
  ###
   -
     name: network service - finger
@@ -2161,22 +2172,12 @@ services:
     check: check_tcp!873
     hosts: merikanto2
     depends: merikanto:process - xinetd
-  #-
-  #  name: network service - rsync
-  #  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: process - nagios3
+    name: process - icinga
     # there is always one extra process per check currently running..
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C nagios3 -a '/usr/sbin/nagios3 -d /etc/nagios3/nagios.cfg'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
     hosts: tchaikovsky
 
  ###
@@ -2193,7 +2194,7 @@ services:
     name: unwanted process - apache2
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"
     hostgroups: computers
-    excludehostgroups: apache2-hosts
+    excludehostgroups: apache2-hosts, deadslow
 
   -
     name: network service - http
@@ -2219,6 +2220,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
   -
@@ -2231,7 +2239,7 @@ services:
     name: unwanted network service - https
     check: dsa_check_port_closed!443
     hostgroups: apache2-hosts
-    excludehostgroups: apache-https
+    excludehostgroups: apache-https, deadslow
     # ravel does ssh on port 443
     excludehosts: ravel
     normal_check_interval: 60
@@ -2250,25 +2258,14 @@ services:
     name: unwanted process - named
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C named"
     hostgroups: computers
-    excludehostgroups: bind9-hosts
+    excludehostgroups: bind9-hosts, deadslow
 
  ####
-  -
-    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
@@ -2276,11 +2273,15 @@ services:
     depends: klecker:process - xinetd
 
  ####
+  #-
+  #  name: process - debianqueued
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
   -
     name: process - debianqueued
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak-unpriv -C debianqueued"
     hostgroups: uploadqueue
 
+
  ###
   #-
   #  name: process - postresql81 - master
@@ -2306,7 +2307,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, deadslow
+  -
+    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'"
@@ -2315,47 +2320,17 @@ 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'"
-  #  hosts: piatti
-  #-
-  #  name: process - postresql83 - dak master
-  #  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/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
-  #  hosts: chopin
-  #-
-  #  name: process - postresql84 - dak master
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-  #  hosts: franck, chopin
-  #-
-  #  name: process - postresql84 - dak-dev master
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
-  #  hosts: franck
- # backups
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
     hosts: beethoven
- ####
-  -
-    name: process - stunnel4 - postgres-udd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
-    hosts: samosa
-  -
-    name: udd stunnel - master cert
-    nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 8080 -S -C 14 -t 45"
-    hosts: samosa
  ####
  ####
   -
     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
@@ -2409,14 +2384,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, 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, finzi, fils
     contact_groups: buildd
  ####
   -
@@ -2431,11 +2406,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 ############
  ####
@@ -2459,13 +2429,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%"
@@ -2479,7 +2442,7 @@ services:
     name: unwanted process - automount
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C automount"
     hostgroups: computers
-    excludehostgroups: autofs
+    excludehostgroups: autofs, deadslow
 
  ############ MISC OTHER Stuff ############
  #####
@@ -2491,10 +2454,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"
@@ -2537,10 +2496,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"
@@ -2572,7 +2527,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