X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=5c9e48ecb9ecc63aae12c52e123144559ba88333;hb=d548067728dc2d65477c20a139472456d737a35a;hp=0bf9f7368e72d5ee285d664293117049747900a2;hpb=10ebfcc4608f12f557e860adff039624cbb26c44;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0bf9f73..5c9e48e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -193,7 +193,7 @@ servers:
     hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim, bind9-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, spamd, heavy-exim, bind9-hosts
   spohr2:
     address: 192.25.206.38
     parents: spohr
@@ -271,7 +271,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, ulogd-hosts
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -279,12 +279,12 @@ servers:
   byrd:
     address: 82.195.75.101
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, postgres84-hosts
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim
 
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload, lenny
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
@@ -294,7 +294,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny, uploadqueue
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, lenny, uploadqueue
 
   mayer:
     address: 140.211.166.78
@@ -358,7 +358,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, heavy-exim, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim, lenny
 
   saens:
     address: 128.101.240.212
@@ -414,7 +414,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, hassrvfs, hasvarfs, hasusrfs
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, hassrvfs, hasvarfs, hasusrfs
     contacts: joerg
 
   schumann:
@@ -686,7 +686,10 @@ hostgroups:
     alias: hosts running postfix instead of exim
     private: 1
   heavy-exim:
-    alias: "hosts running the full mail stuff, including clamav, SA, and postgrey"
+    alias: "hosts running the full mail stuff, including clamav and postgrey"
+    private: 1
+  spamd:
+    alias: "hosts running spamassassin as daemon"
     private: 1
   heavy-postfix:
     alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, policyd-weight"
@@ -1145,17 +1148,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, byrd
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, byrd
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, rietz, merkel
+    hosts: master, rietz, merkel, byrd
  ###
   -
     name: process - clamav - clamd
@@ -1183,8 +1186,8 @@ services:
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hostgroups: heavy-exim
-    excludehosts: rietz, merkel, raff, powell, bellini
+    hostgroups: spamd
+    excludehosts: powell
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1197,9 +1200,8 @@ services:
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
     hosts: liszt
-    hostgroups: heavy-exim
+    hostgroups: spamd
     depends: process - spamd - master
-    excludehosts: rietz, merkel, raff, bellini
   #
   -
     name: process - spamd - master
@@ -1214,12 +1216,8 @@ services:
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
-    excludehostgroups: heavy-exim
-    excludehosts: liszt
-  -
-    name: unwanted process - spamd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
-    hosts: merkel, raff, bellini
+    excludehostgroups: spamd
+    excludehosts: liszt, rietz
 
  ###
   #-
@@ -1705,7 +1703,7 @@ services:
  ####
   -
     name: process - debianqueued
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
     hostgroups: uploadqueue
 
  ###