system spamd on buxtehude

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c3855a6..ebbb8df 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -758,7 +758,7 @@ servers:
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs, apache-https
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs, apache-https, spamd
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -2140,21 +2140,12 @@ services:
     hostgroups: spamd
     depends: process - spamd - master
   #
-  -
-    name: process - spamd - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
-    hosts: buxtehude
-  -
-    name: process - spamd - child
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
-    hosts: buxtehude
-  #
   -
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: bendel, busoni, buxtehude
+    excludehosts: bendel, busoni
 
   -
     name: unwanted process - greylistd