X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=471c0bdbf437eeb637dc5a0d05f606ac8be07bad;hb=4a3998b74f9516363e3ea5b5b8b8b51b7414ef1b;hp=b6d4e8366502d1ad54e7a4c22ec7c3ffad80c4b3;hpb=26547b8c9f7d466c03be4d2e495c4a452aa8fc9c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b6d4e83..471c0bd 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.126.33
-    parents: gw-ubcece
+#  gw-1und1-sec:
+#    address: 212.227.126.33
+#    parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-accumu:
     address: 130.239.18.97
@@ -105,7 +105,6 @@ servers:
     address: 82.195.75.126
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contacts: joerg, bzed
   gw-marist:
     address: 148.100.96.1
     parents: gw-ubcece
@@ -140,6 +139,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contact_groups: +alioth-admins
+    no-servicegroups: true
   gw-ubcece:
     address: 206.12.19.254
     hostgroups: layer3-infrastructure
@@ -177,23 +177,25 @@ servers:
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
-    parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, squeeze
+    parents: gw-ubcece
+    #parents: gw-1und1-sec
+    hostgroups: computers, acpid-hosts, service, squeeze, bacula-client
   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
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze, bacula-client
   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, bacula-client
   wieck:
     address: 195.20.242.89
-    parents: gw-1und1-sec
+    parents: gw-ubcece
+    #parents: gw-1und1-sec
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror, hasvarlogfs
   # }}}
   # {{{ gw-accumu
@@ -210,55 +212,51 @@ 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
+    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, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
   # {{{ gw-brainfood
-  master:
-    address: 70.103.162.29
+  old-master:
+    address: 97.107.116.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
+    hostgroups: computers, general, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze, bacula-client
   murphy:
-    address: 70.103.162.31
+    address: 97.107.116.31
     parents: gw-brainfood
     hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
   # }}}
@@ -319,13 +317,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dgi
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
-    contacts: bzed
-  widor:
-    address: 93.94.130.161
-    parents: gw-dgi
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, squeeze
-    contacts: bzed
+    hostgroups: computers, sw-raid, hassrvfs, wheezy
   # }}}
   # {{{ gw-ftcollins
   alkman:
@@ -340,15 +332,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
-  samosa:
-    address: 192.25.206.57
-    parents: gw-ftcollins
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
   spohr:
     address: 192.25.206.33
     parents: gw-ftcollins
@@ -368,7 +351,7 @@ servers:
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze, bacula-client
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
@@ -377,12 +360,7 @@ servers:
     address: 194.177.211.201
     parents: rautavaara
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-    #, mptraid
-  field:
-    address: 194.177.211.210
-    parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-    #, mptraid
+    contacts: christoph
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
@@ -403,10 +381,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
@@ -450,27 +424,32 @@ servers:
   czerny:
     address: 82.195.75.109
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze, drbd-hosts
+  clementi:
+    address: 82.195.75.103
+    parents: gw-man-da
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze, drbd-hosts
   bendel:
     address: 82.195.75.100
-    parents: czerny
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
-  new-master:
+  master:
     address: 82.195.75.110
-    parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, bacula-client, spamd, heavy-exim, highload
   fils:
     address: 82.195.75.89
-    parents: czerny
+    parents: ganeti3
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    contacts: christoph
   vento:
     address: 82.195.75.98
-    parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, heavy-exim
+    parents: ganeti3
+    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
+    parents: ganeti3
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvarlogfs, bacula-client
   rem:
     address: 82.195.75.68
     parents: gw-man-da
@@ -481,28 +460,40 @@ servers:
     hostgroups: computers, service, dl360, acpid-hosts, squeeze
   diamond:
     address: 82.195.75.108
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, bind9-hosts
   draghi:
     address: 82.195.75.106
-    parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze
+    parents: ganeti3
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze, bacula-client
   geo1:
     address: 82.195.75.105
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
   handel:
     address: 82.195.75.104
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
   kaufmann:
     address: 82.195.75.107
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
-#  lamb:
-#    address: 82.195.75.101
-#    parents: unger
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+  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, bacula-client
+  vieuxtemps:
+    address: 82.195.75.113
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, varnish-hosts
+  mailly:
+    address: 82.195.75.114
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-marist
   zappa:
@@ -514,15 +505,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, hasvarlogfs
+    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
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, squeeze, hasvarlogfs
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -547,7 +538,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts, bind9-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -587,7 +578,7 @@ servers:
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze
+    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze, bacula-client
   eder:
     address: 86.59.118.151
     parents: gw-sil
@@ -604,7 +595,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
@@ -621,11 +612,19 @@ servers:
     parents: gw-telegraaf2
     hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
     contact_groups: alioth-admins
+    no-servicegroups: true
   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
+    no-servicegroups: true
+  anonscm:
+    address: 217.196.43.132
+    parents: wagner
+    contact_groups: alioth-admins
+    hostgroups: secondary-IPs
+    no-servicegroups: true
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -661,7 +660,7 @@ servers:
   pasquini:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
   luchesi:
     address: 206.12.19.214
     parents: sw-ubcece-kais
@@ -669,15 +668,15 @@ servers:
   tristano:
     address: 206.12.19.213
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    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
+    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
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
   ganeti2:
     address: 206.12.19.23
     parents: sw-ubcece-kais
@@ -686,10 +685,14 @@ servers:
     address: 206.12.19.118
     parents: luchesi
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, squeeze
+  dinis:
+    address: 206.12.19.139 
+    parents: ganeti2
+    hostgroups: computers, general, kvmdomains, squeeze, bacula-client
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy, bacula-client
   brahms:
     address: 206.12.19.115
     parents: dijkstra
@@ -701,7 +704,7 @@ servers:
   morricone:
     address: 206.12.19.9
     parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
+    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
   stabile:
     address: 206.12.19.13
     parents: sw-ubcece-kais
@@ -730,10 +733,12 @@ servers:
     address: 206.12.19.110
     parents: luchesi
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    contacts: christoph
   finzi:
     address: 206.12.19.111
     parents: luchesi
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    contacts: christoph
   fischer:
     address: 206.12.19.112
     parents: luchesi
@@ -741,7 +746,7 @@ servers:
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
-    hostgroups: computers, porterbox, squeeze
+    hostgroups: computers, porterbox, wheezy
   corelli:
     address: 206.12.19.16
     parents: sw-ubcece-kais
@@ -749,11 +754,11 @@ 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
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, wheezy
   salieri:
     address: 206.12.19.20
     parents: sw-ubcece-kais
@@ -789,7 +794,7 @@ servers:
   glinka:
     address: 206.12.19.126
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, xinetd-hosts
   dukas:
     address: 206.12.19.128
     parents: traetta
@@ -805,7 +810,7 @@ servers:
   berlioz:
     address: 206.12.19.131
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https, bacula-client
   gombert:
     address: 206.12.19.132
     parents: traetta
@@ -825,11 +830,11 @@ servers:
   diabelli:
     address: 206.12.19.136
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, bacula-client
   bizet:
     address: 206.12.19.137
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, uploadqueue
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   lilburn:
     address: 206.12.19.138
     parents: dijkstra
@@ -845,7 +850,7 @@ servers:
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, postgres91-hosts, nfs-client, apache2-hosts, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
@@ -853,7 +858,20 @@ servers:
   menotti:
     address: 206.12.19.143
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts, apache-https
+    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
+  muffat:
+    address: 206.12.19.146
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-ugent
   ancina:
@@ -869,26 +887,10 @@ servers:
     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, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -898,15 +900,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
@@ -950,6 +952,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
@@ -1017,13 +1021,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
@@ -1042,6 +1045,9 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
+  varnish-hosts:
+    alias: hosts running varnish
+    private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -1088,6 +1094,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
@@ -1165,6 +1175,8 @@ servicegroups:
     alias: buildd checks
   raid:
     alias: raid checks
+  backup:
+    alias: backup checks
   kernel:
     alias: kernel checks
   weaksshkeys:
@@ -1233,12 +1245,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: kassia, spohr
+    excludehosts: spohr
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: kassia, spohr
+    hosts: spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1259,12 +1271,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
-    excludehosts: ries, beach
+    excludehosts: stabile, beach
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts: ries, beach
+    hosts: stabile, beach
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -1289,7 +1301,7 @@ 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, buxtehude
+    hosts: stabile, sibelius, busoni, buxtehude
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1326,11 +1338,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
     hosts: sibelius
-  -
-    name: disk usage on /var/lib/postgresql/9.0/dak
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.0/dak"
-    hosts: franck
   -
     name: disk usage on /var/lib/postgresql/9.1/dak
     servicegroups: diskspace
@@ -1380,6 +1387,7 @@ services:
  ####
   -
     name: backup
+    servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
     normal_check_interval: 60
@@ -1387,11 +1395,40 @@ services:
     retry_check_interval: 5
   -
     name: backup server config
+    servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
     hosts: beethoven
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
+  -
+    name: backup - bacula - last backup
+    servicegroups: backup
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula $HOSTNAME$.debian.org"
+    runfrom: dinis
+    hostgroups: bacula-client
+    normal_check_interval:  60
+    retry_check_interval: 15
+  -
+    name: backup - bacula - last full backup
+    servicegroups: backup
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula -w 840 -c 1560 $HOSTNAME$.debian.org F"
+    runfrom: dinis
+    hostgroups: bacula-client
+    normal_check_interval:  60
+    retry_check_interval: 15
+  -
+    name: process - bacula-fd
+    servicegroups: backup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
+    hostgroups: computers
+    excludehostgroups: freebsd
+    excludehosts: wagner, vasks
+  -
+    name: process - bacula-fd
+    servicegroups: backup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
+    hostgroups: freebsd
 
  ####
   -
@@ -1560,8 +1597,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
@@ -1580,7 +1617,7 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: ancina
-    excludehostgroups: ntpsuckers
+    excludehostgroups: ntpsuckers, deadslow
     servicegroups: time
   #
   -
@@ -1598,7 +1635,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
 
  ###
@@ -1673,19 +1710,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'"
@@ -1704,17 +1742,17 @@ services:
   -
     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, buxtehude
+    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, buxtehude
+    hosts: buxtehude
   #
   -
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
-    excludehostgroups: spamd
+    excludehostgroups: spamd, deadslow
     excludehosts: bendel, busoni, wagner, buxtehude
 
  ###
@@ -1727,12 +1765,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'"
@@ -1742,7 +1787,7 @@ 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
@@ -1758,7 +1803,7 @@ 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
@@ -1779,7 +1824,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
 
 
 
@@ -1878,6 +1923,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
@@ -1901,6 +1953,7 @@ services:
     name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
     hostgroups: computers
+    excludehostgroups: deadslow
 
  ####
  ###
@@ -1916,25 +1969,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
 
  ####
   -
@@ -1959,6 +2015,13 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /var/run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
+    excludehosts: argento
+  -
+    # wheezy:
+    name: process - mdadm monitor
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
+    hosts: argento
   -
     name: RAID - sw raid
     servicegroups: raid
@@ -1975,13 +2038,14 @@ 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
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: franck
+    excludehostgroups: wheezy
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -1993,7 +2057,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
@@ -2006,12 +2076,6 @@ 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
@@ -2066,6 +2130,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
@@ -2129,7 +2199,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
@@ -2153,22 +2223,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
 
  ###
@@ -2185,7 +2245,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
@@ -2230,11 +2290,38 @@ 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
 
+###
+  -
+    name: process - varnish - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+    hostgroups: varnish-hosts
+  -
+    name: process - varnish - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u nobody -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+    hostgroups: varnish-hosts
+    depends: process - varnish - master
+  -
+    name: network service - http
+    check: check_http
+    hostgroups: varnish-hosts
+    depends: process - varnish - master
+
+###
+
+# Alioth web URLs
+
+  -
+    name: network service - loggerhead
+    remotecheck: "/usr/lib/nagios/plugins/check_http -H anonscm.debian.org -u /loggerhead/"
+    hosts: anonscm
+    runfrom: tchaikovsky
+    depends: wagner:process - apache2 - master
+
  ####
   -
     name: process - named
@@ -2249,7 +2336,7 @@ 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
 
  ####
   -
@@ -2264,79 +2351,57 @@ 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
+  #  name: process - postgresql81 - master
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a '/usr/lib/postgresql/8.1/bin/postmaster -D /var/lib/postgresql/8.1/main -c config_file=/etc/postgresql/8.1/main/postgresql.conf'"
   #  hostgroups: postgres81-hosts
   #-
-  #  name: process - postresql81 - writer
+  #  name: process - postgresql81 - writer
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: writer process'"
   #  hostgroups: postgres81-hosts
-  #  depends: process - postresql81 - master
+  #  depends: process - postgresql81 - master
   #-
-  #  name: process - postresql81 - buffer
+  #  name: process - postgresql81 - buffer
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats buffer process'"
   #  hostgroups: postgres81-hosts
-  #  depends: process - postresql81 - master
+  #  depends: process - postgresql81 - master
   #-
-  #  name: process - postresql81 - collector
+  #  name: process - postgresql81 - collector
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats collector process'"
   #  hostgroups: postgres81-hosts
-  #  depends: process - postresql81 - master
+  #  depends: process - postgresql81 - master
  ####
   -
-    name: unwanted process - postresql
+    name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres91-hosts
+    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres91-hosts, deadslow
   -
-    name: process - postresql91 - master
+    name: process - postgresql91 - 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
+    name: process - postgresql90 - 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'"
     hostgroups: postgres90-hosts
   -
-    name: process - postresql84 - master
+    name: process - postgresql84 - 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 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
  ####
  ####
   -
@@ -2397,14 +2462,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, fils
+    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, fils
+    excludehosts: fano, fasch, finzi, fils
     contact_groups: buildd
  ####
   -
@@ -2455,7 +2520,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 ############
  #####
@@ -2540,7 +2605,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7434 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7778 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini