Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

diff --combined config/nagios-master.cfg
index 8eccb49,6d4b13d..aac9011
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -347,7 -347,7 +347,7 @@@ servers
    mayer:
      address: 140.211.166.78
      parents: gw-osuosl
-     hostgroups: computers, buildd, hasbootfs, lenny
+     hostgroups: computers, buildd, hasbootfs, squeeze
  #  mayr:
  #    address: 140.211.166.58
  #    parents: gw-osuosl
@@@ -522,7 -522,7 +522,7 @@@
    ancina:
      address: 157.193.39.13
      parents: gw-ghent
-     hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, lenny
+     hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
      contacts: luk
  
    agnesi:
@@@ -617,15 -617,15 +617,15 @@@
    corelli:
      address: 206.12.19.16
      parents: tchaikovsky
-     hostgroups: computers, buildd, lenny
+     hostgroups: computers, buildd, squeeze
    lucatelli:
      address: 206.12.19.15
      parents: tchaikovsky
-     hostgroups: computers, buildd, lenny
+     hostgroups: computers, buildd, squeeze
    rossini:
      address: 206.12.19.19
      parents: tchaikovsky
-     hostgroups: computers, dl585, acpid-hosts, service, squeeze
+     hostgroups: computers, dl585, acpid-hosts, service, squeeze, apache2-hosts
    salieri:
      address: 206.12.19.20
      parents: tchaikovsky
@@@ -685,7 -685,7 +685,7 @@@
    gombert:
      address: 206.12.19.132
      parents: traetta
 -    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
 +    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim
    jenkins:
      address: 206.12.19.133
      parents: salieri
@@@ -694,6 -694,18 +694,18 @@@
      address: 206.12.19.134
      parents: traetta
      hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts, nfs-client, autofs
+   barriere:
+     address: 206.12.19.135
+     parents: traetta
+     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+   diabelli:
+     address: 206.12.19.136
+     parents: traetta
+     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts
+   bizet:
+     address: 206.12.19.137
+     parents: traetta
+     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
  
    lebrun:
      address: 193.198.184.10
@@@ -924,7 -936,11 +936,11 @@@
    sompek:
      address: 217.196.146.208
      parents: gw-conova
-     hostgroups: computers, buildd, hasbootfs, sw-raid, squeeze
+     hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+   stadler:
+     address: 217.196.146.209
+     parents: gw-conova
+     hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
  
  #############################
  # host groups
@@@ -1199,6 -1215,13 +1215,13 @@@ services
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 90 95"
      hostgroups: computers
+     excludehosts: sibelius
+   -
+     name: disk usage - all
+     servicegroups: diskspace
+     nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 95 98"
+     hosts: sibelius
+ 
    -
      name: disk usage on /
      servicegroups: diskspace
@@@ -1286,47 -1309,47 +1309,47 @@@
    -
      name: disk usage on /srv/farm-snapshot/farm-01
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-01"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-01"
      hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-23
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-23"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-23"
      hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-45
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-45"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-45"
      hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-67
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-67"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-67"
      hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-89
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-89"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-89"
      hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-ab
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-ab"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-ab"
      hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-cd
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-cd"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-cd"
      hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-f
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-f"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-f"
      hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-e
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-e"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-e"
      hosts: sibelius
    -
      name: disk usage on /srv/fossology.debian.net
@@@ -2593,6 -2616,6 +2616,6 @@@
      hosts: giustini
    -
      name: event log
-     remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=952 $HOSTADDRESS$ public"
+     remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=2041 $HOSTADDRESS$ public"
      runfrom: dijkstra
      hosts: giustini