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

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  englund has apache now
  and xinetd on sibelius
  Make the check work with Ubuntu's kernel names (Alexander Reichle-Schmehl)
  (c) years
  Fix --ignore-transfer-speed logic
  Group ../debian/changelog better
  sibelius is now an rsyncd host
  Do not do cpqarrayd checks on squeeze
  Do not require the set of excludes to be a subset of the included hosts
  Do apt checks on squeeze now
  update hostgroups for raff
  Change disk usage thresholds for /vicepa from 80/90 to 90/95

diff --combined config/nagios-master.cfg
index 284e518,5a5a616..b23986b
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -190,7 -190,7 +190,7 @@@ servers
    raff:
      address: 192.25.206.59
      parents: gw-HP-ftc
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+     hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
    merkel:
      address: 192.25.206.16
      parents: gw-HP-ftc
@@@ -417,7 -417,7 +417,7 @@@
    sibelius:
      address: 193.62.202.28
      parents: gw-sanger
-     hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze
+     hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts
      contacts: tjrc1, dave
    smetana:
      address: 193.62.202.29
@@@ -547,7 -547,7 +547,7 @@@
    stabile:
      address: 206.12.19.13
      parents: gw-ubc
 -    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, ftpd-hosts
 +    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server
    paganini:
      address: 206.12.19.10
      parents: tchaikovsky
@@@ -753,7 -753,7 +753,7 @@@
    englund:
      address: 86.59.118.148
      parents: gw-sil
-     hostgroups: computers, acpid-hosts, service
+     hostgroups: computers, acpid-hosts, service, apache2-hosts
      # which raid?
    lindberg:
      address: 86.59.118.149
@@@ -1195,7 -1195,7 +1195,7 @@@ services
    -
      name: disk usage on /vicepa
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /vicepa"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
      hostgroups: hasvicepa
  
   ############ All Computers ############
@@@ -1205,7 -1205,6 +1205,6 @@@
      servicegroups: apt
      nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
      hostgroups: computers
-     excludehostgroups: squeeze
      normal_check_interval:  60
      retry_check_interval: 15
   ####
@@@ -1772,6 -1771,7 +1771,7 @@@
      servicegroups: raid
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
      hostgroups: dl385, dl380, dl360, bl460, dl585
+     excludehostgroups: squeeze
    -
      name: RAID - arrayprobe
      servicegroups: raid