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

diff --combined config/nagios-master.cfg
index 86c66fd,edde6eb..764a02a
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -56,7 -56,7 +56,7 @@@ servers
      parents: gw-ubc
      hostgroups: routing-infrastructure
    gw-mit-csail:
-     address: 128.30.0.254
+     address: 128.31.0.1
      parents: gw-ubc
      hostgroups: routing-infrastructure
    gw-xs4all:
@@@ -81,10 -81,6 +81,6 @@@
      parents: gw-ubc
      hostgroups: routing-infrastructure
      contacts: tjrc1, dave
-   gw-frost:
-     address: 130.81.27.83
-     parents: gw-ubc
-     hostgroups: routing-infrastructure
    gw-1und1:
      address: 195.20.247.54
      parents: gw-ubc
@@@ -216,14 -212,6 +212,6 @@@
      address: 192.25.206.59
      parents: gw-HP-ftc
      hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
- #  merkel:
- #    address: 192.25.206.16
- #    parents: gw-HP-ftc
- #    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, xinetd-hosts, lenny
- #  merkel2:
- #    address: 192.25.206.71
- #    parents: merkel
- #    hostgroups: secondary-IPs
    spohr:
      address: 192.25.206.33
      parents: gw-HP-ftc
@@@ -249,7 -237,7 +237,7 @@@
    merulo:
      address: 192.25.206.58
      parents: gw-HP-ftc
-     hostgroups: computers, porterbox, hasusrfs, lenny
+     hostgroups: computers, porterbox, hasusrfs, squeeze, brokensamhain
    alkman:
      address: 192.25.206.63
      parents: gw-HP-ftc
@@@ -263,12 -251,12 +251,12 @@@
    agricola:
      address: 82.195.75.86
      parents: gw-man-da
-     hostgroups: computers, porterbox, sw-raid, hassrvfs, lenny
+     hostgroups: computers, porterbox, sw-raid, hassrvfs, squeeze
      contacts: bzed
    arcadelt:
      address: 82.195.75.87
      parents: gw-man-da
-     hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+     hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
      contacts: bzed
    liszt:
      address: 82.195.75.100
@@@ -319,10 -307,10 +307,10 @@@
      address: 82.195.75.92
      parents: unger
      hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 -  lamb:
 -    address: 82.195.75.101
 -    parents: unger
 -    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
 +#  lamb:
 +#    address: 82.195.75.101
 +#    parents: unger
 +#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
  
    master:
      address: 70.103.162.29
@@@ -355,7 -343,7 +343,7 @@@
    rietz:
      address: 140.211.166.43
      parents: gw-osuosl
-     hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa, squeeze, apache2-hosts
+     hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
      #, bosserver
    rietz2:
      address: 140.211.166.44
@@@ -417,7 -405,7 +405,7 @@@
    argento:
      address: 93.94.130.160
      parents: gw-dg-i.net
-     hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+     hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
      contacts: bzed
  
    widor:
@@@ -454,12 -442,6 +442,6 @@@
      hostgroups: computers, porterbox, sw-raid, sparc, squeeze
      contacts: tjrc1, dave
  
-   voltaire:
-     address: 72.66.115.54
-     parents: gw-frost
-     hostgroups: computers, buildd, hasvarfs, hashomefs, lenny
-     contacts: sfrost
- 
    powell:
      address: 87.106.64.223
      parents: gw-1und1
@@@ -490,7 -472,7 +472,7 @@@
    caballero:
      address: 193.201.200.200
      parents: gw-blackcat
-     hostgroups: computers, buildd, sw-raid, lenny
+     hostgroups: computers, buildd, sw-raid, squeeze, brokensamhain
  
    pescetti:
      address: 217.114.76.85
@@@ -588,7 -570,7 +570,7 @@@
    vivaldi:
      address: 206.12.19.12
      parents: tchaikovsky
-     hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, lenny, autofs
+     hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
    # MSA 2000 (2012i)
    giustini:
      address: 192.168.2.6
@@@ -633,10 -615,10 +615,10 @@@
      address: 206.12.19.119
      parents: tchaikovsky
      hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 -  locke:
 -    address: 206.12.19.120
 -    parents: tchaikovsky
 -    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
 +#  locke:
 +#    address: 206.12.19.120
 +#    parents: tchaikovsky
 +#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
    lotti:
      address: 206.12.19.121
      parents: tchaikovsky
@@@ -673,6 -655,14 +655,14 @@@
      address: 206.12.19.130
      parents: salieri
      hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+   berlioz:
+     address: 206.12.19.131
+     parents: traetta
+     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https
+   gombert:
+     address: 206.12.19.132
+     parents: traetta
+     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
  
    lebrun:
      address: 193.198.184.10
@@@ -809,23 -799,23 +799,23 @@@
    abel:
      address: 217.140.96.56
      parents: gw-arm
-     hostgroups: computers, hasbootfs, hassrvfs, porterbox, lenny
+     hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze
    arnold:
      address: 217.140.96.57
      parents: gw-arm
-     hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+     hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
    alain:
      address: 217.140.96.58
      parents: gw-arm
-     hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+     hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
    alwyn:
      address: 217.140.96.59
      parents: gw-arm
-     hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+     hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
    antheil:
      address: 217.140.96.60
      parents: gw-arm
-     hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+     hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
    arne:
      address: 217.140.96.61
      parents: gw-arm
@@@ -1143,11 -1133,6 +1133,6 @@@ services
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
      hostgroups: hasorgfs
- #  -
- #    name: disk usage on /org
- #    servicegroups: diskspace
- #    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
- #    hosts: merkel
    -
      name: disk usage on /srv
      servicegroups: diskspace
@@@ -1159,11 -1144,6 +1144,6 @@@
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
      hosts: ries
- #  -
- #    name: disk usage on /org/scratch
- #    servicegroups: diskspace
- #    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
- #    hosts: merkel
    -
      name: disk usage on /tmp
      servicegroups: diskspace
@@@ -1179,11 -1159,6 +1159,6 @@@
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
      hostgroups: hashomefs
-   -
-     name: disk usage on /mnt/hdc
-     servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
-     hosts: voltaire
    -
      name: disk usage on /x
      servicegroups: diskspace
@@@ -1322,27 -1297,27 +1297,27 @@@
      retry_check_interval: 5
  
   ####
 -  - name: afs - space
 -    hostgroups: bosserver
 -    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
 -    normal_check_interval: 60
 -    max_check_attempts: 2
 -    retry_check_interval: 5
 -
 -  - name: afs - bos
 -    hostgroups: bosserver
 -    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
 -    normal_check_interval: 60
 -    max_check_attempts: 2
 -    retry_check_interval: 5
 -
 -  - name: afs - waiting connections
 -    hostgroups: bosserver
 -    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
 -    normal_check_interval: 60
 -    max_check_attempts: 2
 -    retry_check_interval: 5
 -
 +#  - name: afs - space
 +#    hostgroups: bosserver
 +#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
 +#    normal_check_interval: 60
 +#    max_check_attempts: 2
 +#    retry_check_interval: 5
 +#
 +#  - name: afs - bos
 +#    hostgroups: bosserver
 +#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
 +#    normal_check_interval: 60
 +#    max_check_attempts: 2
 +#    retry_check_interval: 5
 +#
 +#  - name: afs - waiting connections
 +#    hostgroups: bosserver
 +#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
 +#    normal_check_interval: 60
 +#    max_check_attempts: 2
 +#    retry_check_interval: 5
 +#
    #- name: afs - udebug
    #  hostgroups: bosserver
    #  nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-udebug -H localhost"
@@@ -2043,11 -2018,11 +2018,11 @@@
      hostgroups: computers
      excludehostgroups: acpid-hosts, kvmdomains
   ###
 -  -
 -    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
 -
 +#  -
 +#    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
 +#
   ###
    -
      name: process - inetd
@@@ -2409,10 -2384,6 +2384,6 @@@
      hostgroups: nfs-server
   # see if the nfs stuff works and doesn't hang.
    # the df check all script will also hang, but we don't appear to pay attention to that
- #  -
- #    name: nfs mount ftp archive
- #    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
- #    hosts: merkel
    -
      name: nfs mount ftp archive
      nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"