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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  wolkenstein

diff --combined config/nagios-master.cfg
index 8208dab,a74e023..a503959
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -479,6 -479,10 +479,10 @@@ servers
      address: 137.82.84.70
      parents: gw-ubc
      hostgroups: computers, bl460, acpid-hosts, lenny
+   wolkenstein:
+     address: 137.82.84.89
+     parents: dijkstra
+     hostgroups: computers, lenny, hasbootfs, hassrvfs
    brahms:
      address: 137.82.84.74
      parents: dijkstra
@@@ -1412,7 -1416,6 +1416,7 @@@ services
      name: unwanted process - inetd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
      hostgroups: computers
 +    excludehosts: rietz
    -
      name: unwanted process - snmpd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"