X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0189860dcaa562cedb0f0e801adc0eeeccdd6450;hb=f24f1478082f4d96d2f6f5d5a6c2b64dd9ad06ce;hp=32438ccf94422aa4c2c32badbadc2dae4f3779e1;hpb=2d64ec7790e91b5941b665ad027fa07276cf3d84;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 32438cc..0189860 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -72,11 +72,6 @@ servers:
     address: 194.177.211.193
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-helsinki:
-    address: 128.214.173.25
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: holger
   gw-isc:
     address: 149.20.20.1
     parents: gw-ubcece
@@ -159,14 +154,18 @@ servers:
   pkgmirror-1and1:
     address: 213.165.95.4
     parents: powell
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula
+  babin:
+    address: 213.165.95.6
+    parents: powell
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   # }}}
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
     parents: gw-ubcece
     #parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, wheezy, bacula-client
+    hostgroups: computers, acpid-hosts, service, wheezy
   chopin:
     address: 195.20.242.124
     parents: schumann
@@ -174,16 +173,16 @@ servers:
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy, bacula-client
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https, bacula-client
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https
   wieck:
     address: 195.20.242.89
     parents: gw-ubcece
     #parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, security_mirror, hasvarlogfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, security_mirror, hasvarlogfs, no-bacula
   # }}}
   # {{{ gw-accumu
   pettersson:
@@ -193,7 +192,7 @@ servers:
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
   # }}}
   # {{{ gw-arm
   abel:
@@ -215,11 +214,11 @@ servers:
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   harris:
     address: 217.140.96.66
     parents: gw-arm
@@ -237,12 +236,6 @@ servers:
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
-  # {{{ gw-brainfood
-  murphy:
-    address: 97.107.116.31
-    parents: gw-ubcece
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
-  # }}}
   # {{{ gw-brown
   franck:
     address: 138.16.160.12
@@ -257,40 +250,44 @@ servers:
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
 
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server, xinetd-hosts
+  milanollo2:
+    address: 5.153.231.9
+    parents: milanollo
+    hostgroups: secondary-IPs
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
@@ -298,7 +295,7 @@ servers:
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
@@ -313,29 +310,49 @@ servers:
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
     contacts: holger
+  binet:
+    address: 5.153.231.8
+    parents: gw-bytemark
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
+  bmdb1:
+    address: 5.153.231.10
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, postgres91-hosts
+  coccia:
+    address: 5.153.231.11
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client
+  backuphost:
+    address: 5.153.231.12
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy
+  philp:
+    address: 5.153.231.13
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
   # }}}
   # {{{ gw-c3sl
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, wheezy, high-RTT, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, wheezy, high-RTT, security_mirror, no-bacula
     contacts: faw
   # }}}
   # {{{ gw-carnet
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, squeeze
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, wheezy
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, wheezy
   # }}}
   # {{{ gw-cecsit
   gluck:
     address: 150.203.164.38
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-conova
   sompek:
@@ -355,7 +372,7 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-csail
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-dgi
   argento:
@@ -379,13 +396,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-ftcollins
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
-  # }}}
-  # {{{ gw-freenet
-  pergolesi:
-    address: 62.104.23.252
-    parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
+    hostgroups: computers, service, dl380, apache2-hosts, wheezy, no-bacula
   # }}}
   # {{{ gw-grnet
   barber:
@@ -395,28 +406,15 @@ servers:
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy, bacula-client
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
-  fasch:
-    address: 194.177.211.201
-    parents: rautavaara
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
-    contacts: christoph
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
     hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https, squeeze
-  holter:
-    address: 194.177.211.202
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service, squeeze
-  krenek:
-    address: 194.177.211.207
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd, squeeze
   orff:
     address: 194.177.211.209
     parents: gw-grnet
@@ -424,24 +422,17 @@ servers:
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, squeeze
+    hostgroups: computers, acpid-hosts, megaraid, service, squeeze, nfs-server
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd, wheezy
-  # }}}
-  # {{{ gw-helsinki
-  piatti:
-    address: 193.167.161.225
-    parents: gw-helsinki
-    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
-    contacts: holger
+    hostgroups: computers, acpid-hosts, mptraid, no-bacula, wheezy
   # }}}
   # {{{ gw-isc
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -481,12 +472,17 @@ servers:
   master:
     address: 82.195.75.110
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, bacula-client, spamd, heavy-exim, highload
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
   fils:
     address: 82.195.75.89
     parents: ganeti3
     hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
+  fayrfax:
+    address: 82.195.75.82
+    parents: ganeti3
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    contacts: christoph
   vento:
     address: 82.195.75.98
     parents: ganeti3
@@ -494,7 +490,7 @@ servers:
   lully:
     address: 82.195.75.99
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs, bacula-client
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs
   rem:
     address: 82.195.75.68
     parents: gw-man-da
@@ -506,15 +502,15 @@ servers:
   diamond:
     address: 82.195.75.108
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, bind9-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts, no-bacula
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze, bacula-client
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy
   geo1:
     address: 82.195.75.105
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
+    hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
   handel:
     address: 82.195.75.104
     parents: ganeti3
@@ -530,7 +526,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, bacula-client, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, rsyncd-hosts, xinetd-hosts
   vieuxtemps:
     address: 82.195.75.113
     parents: ganeti3
@@ -550,7 +546,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts, no-bacula
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -575,15 +571,11 @@ servers:
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
-    hostgroups: computers, wheezy, hassrvfs
-  piston:
-    address: 140.211.15.154
-    parents: gw-osuosl
-    hostgroups: computers, wheezy, hassrvfs
+    hostgroups: computers, wheezy, hassrvfs, porterbox
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, apache2-hosts, bind9-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, bind9-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -613,17 +605,17 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-sil
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, wheezy, bacula-client
+    hostgroups: computers, hasbootfs, aacraid, service, acpid-hosts, wheezy
   eder:
     address: 86.59.118.151
     parents: gw-sil
@@ -632,20 +624,12 @@ servers:
     address: 86.59.118.152
     parents: gw-sil
     hostgroups: computers, buildd, wheezy
-  merikanto:
-    address: 86.59.118.147
-    parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs, apache2-hosts
-  merikanto2:
-    address: 86.59.118.150
-    parents: merikanto
-    hostgroups: secondary-IPs
   # }}}
   # {{{ gw-telegraaf2
   vasks:
     address: 217.196.43.140
     parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
+    hostgroups: computers, nfs-server, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
     contact_groups: alioth-admins
     no-servicegroups: true
   wagner:
@@ -682,7 +666,7 @@ servers:
   spontini:
     address: 206.12.19.14
     parents: sw-ubcece-mcld
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
@@ -723,27 +707,23 @@ servers:
   dinis:
     address: 206.12.19.139 
     parents: ganeti2
-    hostgroups: computers, general, kvmdomains, wheezy, bacula-client
+    hostgroups: computers, general, kvmdomains, wheezy
   wolkenstein:
     address: 206.12.19.116
     parents: ganeti2
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy, bacula-client
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
   brahms:
     address: 206.12.19.115
     parents: ganeti2
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   geo2:
     address: 206.12.19.113
     parents: ganeti2
     hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
-  morricone:
-    address: 206.12.19.9
-    parents: sw-ubcece-kais
-    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
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
   paganini:
     address: 206.12.19.10
     parents: sw-ubcece-kais
@@ -813,11 +793,11 @@ servers:
   quantz:
     address: 206.12.19.122
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts, autofs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs
   nono:
     address: 206.12.19.123
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, xinetd-hosts, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https
   reger:
     address: 206.12.19.124
     parents: ganeti2
@@ -845,7 +825,7 @@ servers:
   berlioz:
     address: 206.12.19.131
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https, bacula-client
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https
   gombert:
     address: 206.12.19.132
     parents: ganeti2
@@ -861,15 +841,15 @@ servers:
   barriere:
     address: 206.12.19.135
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
   diabelli:
     address: 206.12.19.136
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, bacula-client
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https
   bizet:
     address: 206.12.19.137
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, no-bacula
   lilburn:
     address: 206.12.19.138
     parents: ganeti2
@@ -881,7 +861,7 @@ servers:
   beach:
     address: 206.12.19.140
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
@@ -889,20 +869,19 @@ servers:
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
   menotti:
     address: 206.12.19.143
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts
-    #, apache-https
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
   coincy:
     address: 206.12.19.144
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
   stanley:
     address: 206.12.19.145
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, no-bacula
   muffat:
     address: 206.12.19.146
     parents: ganeti2
@@ -919,7 +898,7 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-utwente
   klecker:
@@ -935,15 +914,15 @@ servers:
   hildegard:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   howells:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   hummel:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
@@ -1032,6 +1011,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  bm-bl:
+    alias: HP blades at bytemark
+    private: 1
   dl585:
     alias: HP DL385 hosts
     private: 1
@@ -1126,9 +1108,9 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
-  
-  bacula-client:
-    alias: hosts which are backuped with bacula
+
+  no-bacula:
+    alias: hosts which are not being backed up with bacula
     private: 1
 
   nfs-client:
@@ -1229,7 +1211,7 @@ servicegroups:
 services:
   -
     name: PING
-    check: "check_ping!300.0,20%!600.0,40%"
+    check: "check_ping!350.0,20%!600.0,40%"
     hostgroups: pingable
     excludehostgroups: layer3-infrastructure, high-RTT
     normal_check_interval: 5
@@ -1258,7 +1240,7 @@ services:
   -
     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=/home/buildd/build-trees"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -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,stabile
   -
@@ -1275,7 +1257,7 @@ services:
   -
     name: disk usage on /
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
     hostgroups: computers
     excludehosts: spohr
   -
@@ -1298,27 +1280,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
     hostgroups: hasorgfs
-  -
-    name: disk usage on /srv
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hostgroups: hassrvfs
-    excludehosts: stabile, beach
-  -
-    name: disk usage on /srv
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts:  beach
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
-    hosts: stabile
+    hostgroups: hassrvfs
   -
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, piatti
+    hosts: saens
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1338,7 +1309,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: stabile, sibelius, busoni, buxtehude
+    hosts: sibelius, busoni, buxtehude
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1349,16 +1320,10 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/spool/postfix"
     hosts: bendel
-
-  #-
-  #  name: disk usage on /srv/morgue.debian.org
-  #  servicegroups: diskspace
-  #  nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
-  #  hosts: stabile
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/mirrors"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/mirrors"
     hosts: beethoven, sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
@@ -1426,6 +1391,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
+    excludehosts: backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1433,7 +1399,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: beethoven
+    hosts: beethoven, backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1442,7 +1408,8 @@ services:
     servicegroups: backup
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula $HOSTNAME$.debian.org"
     runfrom: dinis
-    hostgroups: bacula-client
+    hostgroups: computers
+    excludehostgroups: buildd, porterbox, no-bacula
     normal_check_interval:  60
     retry_check_interval: 15
   -
@@ -1450,7 +1417,8 @@ services:
     servicegroups: backup
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula -w 840 -c 1560 $HOSTNAME$.debian.org F"
     runfrom: dinis
-    hostgroups: bacula-client
+    hostgroups: computers
+    excludehostgroups: buildd, porterbox, no-bacula
     normal_check_interval:  60
     retry_check_interval: 15
   -
@@ -1911,6 +1879,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:30 -c 0:50 -u postfix -C local -a 'local -t unix'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
+  -
+    name: unwanted process - openvpn
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C openvpn"
+    hostgroups: computers
+    normal_check_interval: 120
+
 
  ###
   -
@@ -1948,6 +1922,12 @@ services:
     hostgroups: computers
     excludehosts: wagner, vasks
     normal_check_interval: 60
+  -
+    name: setup - local hostname etc-hosts
+    nrpe: 'if getent ahosts `hostname` | grep -q 127.0; then echo "Warning: local hostname resolves to 127/8 address"; exit 1; else echo "OK: Hostname resolves to non-127/8 address."; exit 0; fi'
+    hostgroups: computers
+    excludehosts: wagner, vasks
+    normal_check_interval: 60
   -
     name: setup - ud-ldap freshness
     nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
@@ -2007,11 +1987,6 @@ services:
     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, deadslow
   -
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
@@ -2083,13 +2058,19 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
-    excludehosts: schein
+    excludehosts: schein, rietz
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
+    normal_check_interval: 120
+    hostgroups: bm-bl
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     normal_check_interval: 120
-    hosts: schein
+    hosts: schein, rietz
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2107,7 +2088,7 @@ services:
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl585
+    hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
     excludehosts: villa, lobos, senfl, schein
   -
     name: HW - hpasmcli status
@@ -2121,9 +2102,9 @@ services:
     hosts: senfl, schein
  ###
   -
-    name: RAID - areca
+    name: RAID - 3ware
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-areca"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
     hosts: powell
  ###
   -
@@ -2238,7 +2219,7 @@ services:
     check: check_tcp!873
     hostgroups: rsyncd-hosts
     depends: process - xinetd
-    excludehosts: merikanto, rietz
+    excludehosts: rietz
   -
     name: network service - rsync
     check: check_tcp!873
@@ -2247,8 +2228,8 @@ services:
   -
     name: network service - rsync
     check: check_tcp!873
-    hosts: merikanto2
-    depends: merikanto:process - xinetd
+    hosts: milanollo2
+    depends: milanollo:process - xinetd
 
  ###
   -
@@ -2297,13 +2278,13 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
-    excludehosts: handel
+    excludehosts: handel,menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
-    hosts: handel
+    hosts: handel,menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2427,7 +2408,8 @@ services:
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: beethoven
+    #hosts: beethoven
+    hosts: backuphost
  ####
  ####
   -
@@ -2467,14 +2449,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, finzi, fils
+    hosts: fano, finzi, fils, fayrfax
     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, finzi, fils
+    excludehosts: fano, finzi, fils, fayrfax
     contact_groups: buildd
   -
     name: processes - zombie schroot
@@ -2482,11 +2464,13 @@ services:
     nrpe: "(/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0 > /dev/null || /usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0) && /usr/lib/nagios/plugins/check_procs -a schroot -s ZNs -c 0"
     hostgroups: buildd
     contact_groups: +buildd
+    normal_check_interval: 5
+    max_check_attempts: 24
+    retry_check_interval: 5
   -
     name: processes - lvcreate
     nrpe: "/usr/lib/nagios/plugins/check_procs -m 'ELAPSED' -c 500 -C lvcreate -u root -a 'lvcreate'"
-    #hostgroups: buildd
-    hosts: mundy
+    hostgroups: buildd
     contact_groups: +buildd
  ####
   -
@@ -2504,11 +2488,6 @@ services:
 
  ############ NFS Stuff ############
  ####
-  -
-    name: process - portmap
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C portmap -a '/sbin/portmap'"
-    hostgroups: nfs-client, nfs-server
-    excludehostgroups: wheezy
   -
     name: process - statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"