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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  fix typo
  add faw, add gw for santoro Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  add santoro, yes, i know we need to fix the gw Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  piatti to squeeze
  I can't believe that has ever worked
  kassia squeeze Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  tchaikovsky to squeeze
  scelsi to squeeze
  rossini now squeeze
  typo Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  rem has a new IP Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  arne on squeeze
  oops, bad steve writing bad yaml
  new check for mail queue size on heavy_exim
  except it has a different hostgroup name
  kokkonen has apache now
  make nagios shut up Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  englund has apache now

diff --combined config/nagios-master.cfg
index 9d0fc41,d74c6e2..e7fbc78
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -177,6 -177,10 +177,10 @@@ servers
      address: 146.97.42.26
      parents: gw-ubc
      hostgroups: routing-infrastructure
+   gw-c3sl:
+     address: 200.17.202.254
+     parents: gw-ubc
+     hostgroups: routing-infrastructure
  
    global:
      hostgroups: notacomputer
@@@ -285,7 -289,7 +289,7 @@@
    kokkonen:
      address: 82.195.75.97
      parents: gw-man-da
-     hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay
+     hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts
    byrd:
      address: 82.195.75.92
      parents: unger
@@@ -471,7 -475,7 +475,7 @@@
    kassia:
      address: 130.89.149.224
      parents: gw-utwente
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts
+     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
    kassia-sec:
      address: 130.89.149.225
      parents: kassia
@@@ -515,7 -519,7 +519,7 @@@
      hostgroups: computers, bl460, acpid-hosts, service
    tchaikovsky:
      address: 206.12.19.118
-     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https
+     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, squeeze
    wolkenstein:
      address: 206.12.19.116
      parents: dijkstra
@@@ -547,7 -551,7 +551,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
@@@ -591,7 -595,7 +595,7 @@@
    rossini:
      address: 206.12.19.19
      parents: tchaikovsky
-     hostgroups: computers, dl585, acpid-hosts, service
+     hostgroups: computers, dl585, acpid-hosts, service, squeeze
    salieri:
      address: 206.12.19.20
      parents: tchaikovsky
@@@ -646,12 -650,12 +650,12 @@@
    piatti:
      address: 193.167.161.225
      parents: gw-helsinki
-     hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service
+     hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
      contacts: holger
  
    rem:
-     address: 195.71.99.217
-     parents: gw-telefonica
+     address: 82.195.75.68
+     parents: gw-man-da
      hostgroups: computers, buildd, hasbootfs, hashomefs
  
    zelenka:
@@@ -727,7 -731,7 +731,7 @@@
    scelsi:
      address: 194.177.211.208
      parents: gw-grnet
-     hostgroups: computers, acpid-hosts, mptraid, service
+     hostgroups: computers, acpid-hosts, mptraid, service, squeeze
    orff:
      address: 194.177.211.209
      parents: gw-grnet
@@@ -753,7 -757,7 +757,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
@@@ -784,7 -788,7 +788,7 @@@
    arne:
      address: 217.140.96.61
      parents: gw-arm
-     hostgroups: computers, hasbootfs, hassrvfs
+     hostgroups: computers, hasbootfs, hassrvfs, squeeze
  
    poulenc:
      address: 144.32.168.77
@@@ -795,6 -799,12 +799,12 @@@
      parents: gw-ynic
      hostgroups: computers, buildd, sw-raid, hassrvfs
  
+   santoro:
+     address: 200.17.202.197
+     parents: gw-c3sl
+     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
+     contacts: faw
+ 
  #############################
  # host groups
  #
@@@ -1467,6 -1477,10 +1477,10 @@@ services
      name: process - exim
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
      hosts: master, busoni, merkel, quantz
+   -
+     name: mail queue
+     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
+     hostgroups: heavy-exim
   ###
    -
      name: process - clamav - clamd
@@@ -1681,11 -1695,6 +1695,11 @@@
      depends: process - postfix - master
      normal_check_interval: 120
  
 +  -
 +    name: setup - local resolver
 +    nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
 +    hostgroups: computers
 +    normal_check_interval: 60
  
    -
      name: setup - dsa config