X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=75025526843a0da8322ca77c697b9883ad5ff2b0;hb=aa6f214d821e7c3aac9b36c9826531b676b3bbfc;hp=668a93114f8b70976ca3b3042f6d2b3fef6e3224;hpb=96d7afdbf57792ae9c877084919520c091fa5148;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 668a931..7502552 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -31,14 +31,18 @@ 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
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-bytemark:
+    address: 89.16.160.116
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-c3sl:
     address: 200.17.202.254
     parents: gw-ubcece
@@ -105,7 +109,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 +143,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
@@ -171,14 +175,18 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, squeeze
-    contacts: joerg
+    hostgroups: computers, service, acpid-hosts, wheezy
+  pkgmirror-1and1:
+    address: 213.165.95.4
+    parents: powell
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
   # }}}
   # {{{ 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
@@ -186,14 +194,15 @@ servers:
   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
@@ -235,10 +244,6 @@ servers:
     address: 217.140.96.66
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, deadslow
-  hartmann:
-    address: 217.140.96.67
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
   hasse:
     address: 217.140.96.68
     parents: gw-arm
@@ -253,12 +258,8 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
   # {{{ gw-brainfood
-  master:
-    address: 70.103.162.29
-    parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
   murphy:
-    address: 70.103.162.31
+    address: 97.107.116.31
     parents: gw-brainfood
     hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
   # }}}
@@ -272,6 +273,49 @@ servers:
     parents: gw-brown
     hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres91-hosts
   # }}}
+  # {{{ gw-bytemark
+  bm-bl1:
+    address: 5.153.231.241
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl2:
+    address: 5.153.231.242
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl3:
+    address: 5.153.231.243
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl4:
+    address: 5.153.231.244
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl5:
+    address: 5.153.231.245
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl6:
+    address: 5.153.231.246
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+
+  milanollo:
+    address: 5.153.231.2
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server
+  picconi:
+    address: 5.153.231.3
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, heavy-exim, spamd
+  senfter:
+    address: 5.153.231.4
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+  adayevskaya:
+    address: 5.153.231.5
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy
+  # }}}
   # {{{ gw-c3sl
   santoro:
     address: 200.17.202.197
@@ -319,13 +363,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dgi
-    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
-    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,10 +378,6 @@ servers:
     address: 192.25.206.62
     parents: gw-ftcollins
     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
-  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
@@ -363,7 +397,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
@@ -372,12 +406,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
@@ -398,10 +427,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,31 +470,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
+    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
@@ -480,28 +506,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:
@@ -513,15 +551,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
@@ -546,7 +584,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
@@ -564,7 +602,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, hasvarlogfs
+    hostgroups: computers, acpid-hosts, postgres91-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts, hasvarlogfs
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -586,25 +624,15 @@ 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
     hostgroups: computers, porterbox, squeeze, hassrvfs
-  englund:
-    address: 86.59.118.148
-    parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, hassrvfs, megactl
-    # which raid?
   eysler:
     address: 86.59.118.152
     parents: gw-sil
     hostgroups: computers, buildd, squeeze
-  lindberg:
-    address: 86.59.118.149
-    parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, megactl
-    # which raid?
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
@@ -620,11 +648,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:
@@ -685,10 +721,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
@@ -700,7 +740,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
@@ -729,10 +769,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
@@ -740,7 +782,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
@@ -752,7 +794,7 @@ servers:
   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
@@ -788,7 +830,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
@@ -804,7 +846,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
@@ -824,11 +866,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
@@ -840,11 +882,11 @@ servers:
   beach:
     address: 206.12.19.140
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, 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
+    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
@@ -852,11 +894,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:
@@ -872,26 +923,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
@@ -1007,9 +1042,9 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
-  megactl:
-    alias: Hosts with LSI Logic MegaRAID, but not usable with megaraid check
-    private: 1
+#  megactl:
+#    alias: Hosts with LSI Logic MegaRAID, but not usable with megaraid check
+#    private: 1
   megaraid:
     alias: Hosts with LSI Logic MegaRAID
     private: 1
@@ -1046,6 +1081,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
@@ -1071,9 +1109,6 @@ hostgroups:
   postgres84-hosts:
     alias: hosts running postgres84
     private: 1
-  postgres90-hosts:
-    alias: hosts running postgres90
-    private: 1
   postgres91-hosts:
     alias: hosts running postgres91
     private: 1
@@ -1092,6 +1127,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
@@ -1169,6 +1208,8 @@ servicegroups:
     alias: buildd checks
   raid:
     alias: raid checks
+  backup:
+    alias: backup checks
   kernel:
     alias: kernel checks
   weaksshkeys:
@@ -1224,7 +1265,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=/srv/snapshot.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 3%  -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
@@ -1237,12 +1278,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
@@ -1263,17 +1304,17 @@ 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
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, powell, piatti
+    hosts: saens, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1293,7 +1334,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
@@ -1318,7 +1359,7 @@ services:
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 94 98 /srv/snapshot.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 98 99 /srv/snapshot.debian.org"
     hosts: stabile
   -
     name: disk usage on /srv/snapshot.debian.org
@@ -1379,6 +1420,7 @@ services:
  ####
   -
     name: backup
+    servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
     normal_check_interval: 60
@@ -1386,11 +1428,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
 
  ####
   -
@@ -1431,11 +1502,11 @@ services:
   #  retry_check_interval: 5
 
  ####
-  -
-    name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
-    hostgroups: computers
-    excludehosts: wagner, vasks
+  #-
+  #  name: puppet
+  #  nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
+  #  hostgroups: computers
+  #  excludehosts: wagner, vasks
 
  ####
   -
@@ -1597,7 +1668,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
 
  ###
@@ -1684,12 +1755,12 @@ 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 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
-    excludehosts: powell, wagner
+    excludehosts: wagner, picconi
     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'"
-    hosts: powell, wagner
+    hosts: wagner, picconi
   -
     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'"
@@ -1734,6 +1805,12 @@ services:
     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'"
@@ -1879,6 +1956,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
@@ -1964,6 +2048,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
@@ -1987,6 +2078,7 @@ services:
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: franck
+    excludehostgroups: wheezy
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -1998,7 +2090,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
@@ -2011,12 +2109,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
@@ -2164,32 +2256,22 @@ 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
 
  ###
   -
     name: process - apache2 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache2 -a /usr/sbin/apache2"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
   -
     name: process - apache2 - worker
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
   -
@@ -2246,6 +2328,33 @@ services:
     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
@@ -2275,62 +2384,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, deadslow
+    excludehostgroups: postgres84-hosts, postgres91-hosts, deadslow
   -
-    name: process - postresql91 - master
+    name: unwanted process - postgresql 9.0
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
+    hostgroups: computers
+  -
+    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
-    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: 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
  ####
  ####
   -
@@ -2391,14 +2495,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
  ####
   -
@@ -2420,6 +2524,7 @@ services:
     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'"
@@ -2499,10 +2604,6 @@ services:
     name: DNS SOA sync - alioth.debian.org
     check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
     hosts: global
-  -
-    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 - 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"
@@ -2534,7 +2635,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