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

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore fan lines that do not say 'Yes' in the present-line
  Fix --ignore-transfer-speed to not always ignore transfer speed
  dsa-check-udldap-freshness: Also check age of /var/lib/misc/passwd.db in addition to /var/lib/misc/thishost/passwd.tdb.
  Add dave as a contact for the sanger hosts
  dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore "N/A" DIMM status.
  check quantz can ping one of its nfs servers
  kill trailing whitespace
  Give in to nagging users
  More exim processes for our mail relays
  and heininen has a var/log
  and lotti has a /srv

diff --combined config/nagios-master.cfg
index 60dffd3,dde866e..7b2eb4d
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -80,7 -80,7 +80,7 @@@ servers
      address: 193.62.202.20
      parents: gw-ubc
      hostgroups: routing-infrastructure
-     contacts: tjrc1
+     contacts: tjrc1, dave
    gw-frost:
      address: 130.81.27.83
      parents: gw-ubc
@@@ -286,7 -286,7 +286,7 @@@
    kokkonen:
      address: 82.195.75.97
      parents: gw-man-da
-     hostgroups: computers, service, acpid-hosts, heavy-exim
+     hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay
    byrd:
      address: 82.195.75.92
      parents: unger
@@@ -408,23 -408,23 +408,23 @@@
      parents: gw-sanger
      # SMP kernel doesn't run stable
      hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers
-     contacts: tjrc1
+     contacts: tjrc1, dave
    goetz:
      address: 193.62.202.26
      parents: gw-sanger
      # SMP kernel doesn't run stable
      hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs
-     contacts: tjrc1
+     contacts: tjrc1, dave
    sibelius:
      address: 193.62.202.28
      parents: gw-sanger
      hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts, service, apache2-hosts
-     contacts: tjrc1
+     contacts: tjrc1, dave
    smetana:
      address: 193.62.202.29
      parents: gw-sanger
      hostgroups: computers, porterbox, sw-raid, sparc
-     contacts: tjrc1
+     contacts: tjrc1, dave
  
    voltaire:
      address: 72.66.115.54
@@@ -616,7 -616,7 +616,7 @@@
    lotti:
      address: 206.12.19.121
      parents: tchaikovsky
-     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
    quantz:
      address: 206.12.19.122
      parents: salieri
@@@ -625,10 -625,6 +625,10 @@@
      address: 206.12.19.123
      parents: salieri
      hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, xinetd-hosts, apache2-hosts, apache-https
 +  reger:
 +    address: 206.12.19.124
 +    parents: salieri
 +    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, heavy-exim
  
    lebrun:
      address: 193.198.184.10
@@@ -746,7 -742,7 +746,7 @@@
    merikanto:
      address: 86.59.118.147
      parents: gw-sil
-     hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service
+     hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay
    merikanto2:
      address: 86.59.118.150
      parents: merikanto
@@@ -885,6 -881,9 +885,9 @@@ hostgroups
    heavy-exim:
      alias: "hosts running the full mail stuff, including clamav and postgrey"
      private: 1
+   mail-relay:
+     alias: "relays usually are hosts with more exim processes"
+     private: 1
    spamd:
      alias: "hosts running spamassassin as daemon"
      private: 1
@@@ -1130,7 -1129,7 +1133,7 @@@ services
      name: disk usage on /var/log
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-     hosts: busoni, wieck
+     hosts: busoni, wieck, heininen
  
    -
      name: disk usage on /srv/morgue.debian.org
@@@ -1447,8 -1446,12 +1450,12 @@@
      name: process - exim
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
      hostgroups: computers
-     excludehostgroups: postfix-hosts
+     excludehostgroups: postfix-hosts, mail-relay
      excludehosts: master, busoni, merkel, quantz
+   -
+     name: process - exim
+     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
+     hostgroups: mail-relay
    -
      name: process - exim - total
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
@@@ -1885,7 -1888,7 +1892,7 @@@
    -
      name: process - bosserver
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
-     hostgroups: bosserver 
+     hostgroups: bosserver
  
   ###
    -
@@@ -2243,6 -2246,11 +2250,11 @@@
      nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
      hosts: bellini
  
+   -
+     name: nfs server stabile reachable
+     nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.13 -w 50,10% -c 200,30%"
+     hosts: quantz
+ 
   ############ MISC OTHER Stuff ############
   #####
    -