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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  add gabrielli
  paganini has nfs-client
  escher and malo seem to be out
  I really meant tchaikovsky ..
  Revert "and tchaikovsky"
  and tchaikovsky
  handel now has ulog
  peri too
  even more
  and more
  more ulog hosts
  some more ulog hosts
  caballero now has udev

diff --combined config/nagios-master.cfg
index 1cc290d,93cda2b..12213e5
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -181,7 -181,7 +181,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, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts, ulogd-hosts
    merkel:
      address: 192.25.206.16
      parents: gw-HP-ftc
@@@ -197,17 -197,17 +197,17 @@@
    peri:
      address: 192.25.206.15
      parents: gw-HP-ftc
-     hostgroups: computers, buildd, sw-raid, hasbootfs, single-cpu
+     hostgroups: computers, buildd, sw-raid, hasbootfs, single-cpu, ulogd-hosts
      contacts: dannf
    penalosa:
      address: 192.25.206.68
      parents: gw-HP-ftc
-     hostgroups: computers, buildd, hasbootfs, single-cpu
+     hostgroups: computers, buildd, hasbootfs, single-cpu, ulogd-hosts
      contacts: dannf
    mundy:
      address: 192.25.206.62
      parents: gw-HP-ftc
-     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts
+     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, ulogd-hosts
    paer:
      address: 192.25.206.11
      parents: gw-HP-ftc
@@@ -219,7 -219,7 +219,7 @@@
    alkman:
      address: 192.25.206.63
      parents: gw-HP-ftc
-     hostgroups: computers, buildd, acpid-hosts
+     hostgroups: computers, buildd, acpid-hosts, ulogd-hosts
  
    bartok:
      address: 82.195.75.91
@@@ -239,7 -239,7 +239,7 @@@
    arcadelt:
      address: 82.195.75.87
      parents: gw-man-da
-     hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
+     hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs, ulogd-hosts
      contacts: bzed
    liszt:
      address: 82.195.75.100
@@@ -258,7 -258,7 +258,7 @@@
    handel:
      address: 82.195.75.104
      parents: unger
-     hostgroups: computers, service, hasbootfs, kvmdomains
+     hostgroups: computers, service, hasbootfs, kvmdomains, ulogd-hosts
    geo1:
      address: 82.195.75.105
      parents: unger
@@@ -278,11 -278,11 +278,11 @@@
    ball:
      address: 82.195.75.70
      parents: gw-man-da
-     hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers
+     hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers, ulogd-hosts
    purcell:
      address: 82.195.75.69
      parents: gw-man-da
-     hostgroups: computers, buildd, single-cpu
+     hostgroups: computers, buildd, single-cpu, ulogd-hosts
  
    master:
      address: 70.103.162.29
@@@ -291,7 -291,7 +291,7 @@@
    murphy:
      address: 70.103.162.31
      parents: gw-brainfood
-     hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs
+     hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, ulogd-hosts
  
  
    ries:
@@@ -302,15 -302,11 +302,11 @@@
    mayer:
      address: 140.211.166.78
      parents: gw-osuosl
-     hostgroups: computers, buildd, hasbootfs
+     hostgroups: computers, buildd, hasbootfs, ulogd-hosts
    mayr:
      address: 140.211.166.58
      parents: gw-osuosl
-     hostgroups: computers, buildd, hasbootfs
-   malo:
-     address: 140.211.166.27
-     parents: gw-osuosl
-     hostgroups: computers, buildd, smart
+     hostgroups: computers, buildd, hasbootfs, ulogd-hosts
    rietz:
      address: 140.211.166.43
      parents: gw-osuosl
@@@ -331,20 -327,20 +327,20 @@@
    villa:
      address: 212.211.132.32
      parents: gw-scanplus-villa
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, ulogd-hosts
    lobos:
      address: 212.211.132.250
      parents: gw-scanplus-lobos
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, ulogd-hosts
    gluck:
      address: 150.203.164.38
      parents: gw-anu
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts, ulogd-hosts
  
    steffani:
      address: 128.31.0.36
      parents: gw-mit-csail
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts
+     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, ulogd-hosts
    #mahler:
    #  address: 128.31.0.46
    #  parents: gw-mit-csail
@@@ -370,12 -366,12 +366,12 @@@
    saens:
      address: 128.101.240.212
      parents: gw-umn.edu
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, ulogd-hosts
  
    argento:
      address: 93.94.130.160
      parents: gw-dg-i.net
-     hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
+     hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs, ulogd-hosts
      contacts: bzed
  
    widor:
@@@ -399,7 -395,7 +395,7 @@@
      address: 193.62.202.26
      parents: gw-sanger
      # SMP kernel doesn't run stable
-     hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers, hassrvfs
+     hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers, hassrvfs, ulogd-hosts
      contacts: tjrc1
    sibelius:
      address: 193.62.202.28
@@@ -415,7 -411,7 +411,7 @@@
    voltaire:
      address: 72.66.115.54
      parents: gw-frost
-     hostgroups: computers, buildd, hasvarfs, hashomefs
+     hostgroups: computers, buildd, hasvarfs, hashomefs, ulogd-hosts
      contacts: sfrost
  
    puccini:
@@@ -453,7 -449,7 +449,7 @@@
    caballero:
      address: 193.201.200.200
      parents: gw-blackcat
-     hostgroups: computers, no-udev, buildd, sw-raid
+     hostgroups: computers, buildd, sw-raid, ulogd-hosts
  
    pescetti:
      address: 217.114.76.85
@@@ -480,7 -476,7 +476,7 @@@
    ancina:
      address: 157.193.39.13
      parents: gw-ghent
-     hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts
+     hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, ulogd-hosts
      contacts: luk
  
    agnesi:
@@@ -507,7 -503,7 +503,7 @@@
      hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
    tchaikovsky:
      address: 206.12.19.118
-     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu
+     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu, ulogd-hosts
    wolkenstein:
      address: 206.12.19.116
      parents: dijkstra
@@@ -515,7 -511,7 +511,7 @@@
    brahms:
      address: 206.12.19.115
      parents: dijkstra
-     hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains
+     hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, ulogd-hosts
    geo2:
      address: 206.12.19.113
      parents: dijkstra
@@@ -547,7 -543,7 +543,7 @@@
    paganini:
      address: 206.12.19.10
      parents: tchaikovsky
-     hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts
+     hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client
    respighi:
      address: 206.12.19.11
      parents: gw-ubc
@@@ -572,15 -568,19 +568,19 @@@
      address: 206.12.19.111
      parents: luchesi
      hostgroups: computers, freebsd, squeeze
+   gabrielli:
+     address: 206.12.19.17
+     parents: tchaikovsky
+     hostgroups: computers, single-cpu 
  
    lebrun:
      address: 193.198.184.10
      parents: gw-carnet
-     hostgroups: computers, buildd, sw-raid, hasorgfs
+     hostgroups: computers, buildd, sw-raid, hasorgfs, ulogd-hosts
    schroeder:
      address: 193.198.184.11
      parents: gw-carnet
 -    hostgroups: computers, buildd, sw-raid, hasbootfs, hasorgfs
 +    hostgroups: computers, buildd, sw-raid, hassrvfs
  
    tartini:
      address: 82.94.249.158
@@@ -596,7 -596,7 +596,7 @@@
    rem:
      address: 195.71.99.217
      parents: gw-telefonica
-     hostgroups: computers, buildd, hasbootfs, hashomefs
+     hostgroups: computers, buildd, hasbootfs, hashomefs, ulogd-hosts
  
    zelenka:
      address: 80.245.147.40
@@@ -605,26 -605,22 +605,22 @@@
    zandonai:
      address: 80.245.147.46
      parents: gw-HP-ftc
-     hostgroups: computers, buildd, hassrvfs
+     hostgroups: computers, buildd, hassrvfs, ulogd-hosts
  
-   escher:
-     address: 213.188.99.215
-     parents: gw-cst
-     hostgroups: computers, single-cpu, hasbootfs, hasvarfs, hashomefs
    goedel:
      address: 213.188.99.214
      parents: gw-cst
-     hostgroups: computers, single-cpu, hasbootfs, ntpsuckers
+     hostgroups: computers, single-cpu, hasbootfs, ntpsuckers, ulogd-hosts
  
    schein:
      address: 149.20.20.6
      parents: gw-isc
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts
+     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts, ulogd-hosts
  
    praetorius:
      address: 130.239.18.121
      parents: gw-aca
-     hostgroups: computers, buildd, hassrvfs
+     hostgroups: computers, buildd, hassrvfs, ulogd-hosts
    pettersson:
      address: 130.239.18.123
      parents: gw-aca
@@@ -633,7 -629,7 +629,7 @@@
    lafayette:
      address: 147.215.7.160
      parents: gw-esiee
-     hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
+     hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs, ulogd-hosts
  
    grieg:
      address: 194.177.211.200
@@@ -655,11 -651,11 +651,11 @@@
    barber:
      address: 194.177.211.203
      parents: gw-grnet
-     hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
+     hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
    biber:
      address: 194.177.211.204
      parents: gw-grnet
-     hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
+     hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
    cilea:
      address: 194.177.211.205
      parents: gw-grnet
@@@ -689,7 -685,7 +685,7 @@@
    beethoven:
      address: 86.59.118.146
      parents: gw-sil
-     hostgroups: computers, hasbootfs, aacraid
+     hostgroups: computers, hasbootfs, aacraid, ulogd-hosts
  
  
  #############################
@@@ -980,7 -976,7 +976,7 @@@ services
      name: disk usage on /tmp
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-     hosts: saens, puccini, merkel, tartini, powell, piatti, escher
+     hosts: saens, puccini, merkel, tartini, powell, piatti
    -
      name: disk usage on /usr
      servicegroups: diskspace