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

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  rsyncd-hosts updates
  Let's monitor rsync on rsyncd-hosts
  wolkenstein on squeeze
  klecker is down for now
  add jenkins
  local build of samhain is working, I think
  We need to look for two locations, not two directives
  Fix a bashism
  test with == is a bashism
  last 2, and get IPs right
  add armhf hosts
  eder has a /srv
  add eder, eysler
  Get rid of gw-telefonica
  remove locke and lamb, take 2
  remove locke and lamb

Conflicts:
	config/nagios-master.cfg

diff --combined config/nagios-master.cfg
index 6e0f276,de63de1..e7c85b0
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -59,6 -59,10 +59,6 @@@ servers
      address: 128.31.0.1
      parents: gw-ubc
      hostgroups: routing-infrastructure
 -#  gw-xs4all:
 -#    address: 194.109.137.217
 -#    parents: gw-ubc
 -#    hostgroups: routing-infrastructure
    gw-umn.edu:
      address: 128.101.240.222
      parents: gw-ubc
@@@ -133,10 -137,6 +133,6 @@@
      parents: gw-ubc
      hostgroups: routing-infrastructure
      contacts: holger
-   gw-telefonica:
-     address: 195.71.99.193
-     parents: gw-ubc
-     hostgroups: routing-infrastructure
    gw-cst:
      address: 213.157.2.23
      parents: gw-ubc
@@@ -225,7 -225,7 +221,7 @@@
    mundy:
      address: 192.25.206.62
      parents: gw-HP-ftc
-     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze, brokensamhain
+     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
    paer:
      address: 192.25.206.11
      parents: gw-HP-ftc
@@@ -233,11 -233,11 +229,11 @@@
    merulo:
      address: 192.25.206.58
      parents: gw-HP-ftc
-     hostgroups: computers, porterbox, hasusrfs, squeeze, brokensamhain
+     hostgroups: computers, porterbox, hasusrfs, squeeze
    alkman:
      address: 192.25.206.63
      parents: gw-HP-ftc
-     hostgroups: computers, buildd, acpid-hosts, squeeze, brokensamhain
+     hostgroups: computers, buildd, acpid-hosts, squeeze
  
    sperger:
      address: 82.195.75.34
@@@ -303,10 -303,10 +299,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
@@@ -321,7 -321,7 +317,7 @@@
    ries:
      address: 128.148.34.103
      parents: gw-brown.edu
-     hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
+     hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
  
    franck:
      address: 128.148.34.3
@@@ -388,6 -388,11 +384,6 @@@
    #  parents: gw-mit-csail
    #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs
  
 -#  klecker:
 -#    address: 194.109.137.218
 -#    parents: gw-xs4all
 -#    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts, lenny
 -
    saens:
      address: 128.101.240.212
      parents: gw-umn.edu
@@@ -463,7 -468,7 +459,7 @@@
    caballero:
      address: 193.201.200.200
      parents: gw-blackcat
-     hostgroups: computers, buildd, sw-raid, squeeze, brokensamhain
+     hostgroups: computers, buildd, sw-raid, squeeze
  
    pescetti:
      address: 217.114.76.85
@@@ -486,12 -491,6 +482,12 @@@
      address: 130.89.149.227
      parents: kassia
      hostgroups: secondary-IPs
 +  
 +  klecker:
 +    address: 194.109.148.10
 +    parents: gw-utwente
 +    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, acpid-hosts, xinetd-hosts, squeeze
 +
  
    ancina:
      address: 157.193.39.13
@@@ -527,7 -526,7 +523,7 @@@
    wolkenstein:
      address: 206.12.19.116
      parents: dijkstra
-     hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, lenny
+     hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, squeeze
    brahms:
      address: 206.12.19.115
      parents: dijkstra
@@@ -612,10 -611,10 +608,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
@@@ -660,6 -659,10 +656,10 @@@
      address: 206.12.19.132
      parents: traetta
      hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+   jenkins:
+     address: 206.12.19.133
+     parents: salieri
+     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
  
    lebrun:
      address: 193.198.184.10
@@@ -693,7 -696,7 +693,7 @@@
    zandonai:
      address: 80.245.147.46
      parents: gw-zivit
-     hostgroups: computers, buildd, hassrvfs, squeeze, brokensamhain
+     hostgroups: computers, buildd, hassrvfs, squeeze
  
    goedel:
      address: 213.188.99.214
@@@ -792,6 -795,14 +792,14 @@@
      parents: gw-sil
      hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, megactl
      # which raid?
+   eder:
+     address: 86.59.118.151
+     parents: gw-sil
+     hostgroups: computers, porterbox, squeeze, hassrvfs
+   eysler:
+     address: 86.59.118.152
+     parents: gw-sil
+     hostgroups: computers, buildd, squeeze
  
    abel:
      address: 217.140.96.56
@@@ -817,6 -828,30 +825,30 @@@
      address: 217.140.96.61
      parents: gw-arm
      hostgroups: computers, hasbootfs, hassrvfs, squeeze
+   harris:
+     address: 217.140.96.66
+     parents: gw-arm
+     hostgroups: computers, hasbootfs, hassrvfs, squeeze
+   hartmann:
+     address: 217.140.96.67
+     parents: gw-arm
+     hostgroups: computers, hasbootfs, hassrvfs, squeeze
+   hasse:
+     address: 217.140.96.68
+     parents: gw-arm
+     hostgroups: computers, hasbootfs, hassrvfs, squeeze
+   hebden:
+     address: 217.140.96.69
+     parents: gw-arm
+     hostgroups: computers, hasbootfs, hassrvfs, squeeze
+   henze:
+     address: 217.140.96.70
+     parents: gw-arm
+     hostgroups: computers, hasbootfs, hassrvfs, squeeze
+   hoiby:
+     address: 217.140.96.71
+     parents: gw-arm
+     hostgroups: computers, hasbootfs, hassrvfs, squeeze
  
    poulenc:
      address: 144.32.168.77
@@@ -1031,9 -1066,9 +1063,9 @@@ hostgroups
    hasusrfs:
      alias: hosts with a /usr filesystem
      private: 1
-   hasvicepa:
-     alias: hosts with a /vicepa
-     private: 1
+ #  hasvicepa:
+ #    alias: hosts with a /vicepa
+ #    private: 1
  
    incomingmailrelayed:
      alias: incoming mail needs to go through a mail relay
@@@ -1238,11 -1273,11 +1270,11 @@@ services
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
      hosts: vivaldi
-   -
-     name: disk usage on /vicepa
-     servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
-     hostgroups: hasvicepa
+ #  -
+ #    name: disk usage on /vicepa
+ #    servicegroups: diskspace
+ #    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
+ #    hostgroups: hasvicepa
    -
      name: disk usage on /var/lib/postgresql/9.0/dak
      servicegroups: diskspace
@@@ -1294,27 -1329,27 +1326,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"
@@@ -2015,11 -2050,11 +2047,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
@@@ -2042,17 -2077,22 +2074,22 @@@
      hosts: draghi
      depends: process - xinetd
   ###
- #  -
- #    name: network service - rsync
- #    check: check_tcp!873
- #    hostgroups: rsyncd-hosts
- #    depends: process - xinetd
- #
+   -
+     name: network service - rsync
+     check: check_tcp!873
+     hostgroups: rsyncd-hosts
+     depends: process - xinetd
+     excludehosts: merikanto, rietz
    -
      name: network service - rsync
      check: check_tcp!873
      hosts: rietz2
      depends: rietz:process - xinetd
+   -
+     name: network service - rsync
+     check: check_tcp!873
+     hosts: merikanto2
+     depends: merikanto:process - xinetd
    #-
    #  name: network service - rsync
    #  check: check_tcp!873