X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=48a19ad834cef6217dd3c0bb11eb42c4c38e0763;hb=cf7cc5b142e2364c5e3550384031ff075dc460a8;hp=53c13a4f837362b3a99eb415a9c825198ddec2bc;hpb=82ecf858958b48c0d10401b2b5dd3f07127eb579;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 53c13a4..48a19ad 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -286,7 +286,7 @@ servers:
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay
   byrd:
     address: 82.195.75.92
     parents: unger
@@ -616,7 +616,7 @@ servers:
   lotti:
     address: 206.12.19.121
     parents: tchaikovsky
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
   quantz:
     address: 206.12.19.122
     parents: salieri
@@ -742,7 +742,7 @@ servers:
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -881,6 +881,9 @@ hostgroups:
   heavy-exim:
     alias: "hosts running the full mail stuff, including clamav and postgrey"
     private: 1
+  mail-relay:
+    alias: "relays usually are hosts with more exim processes"
+    private: 1
   spamd:
     alias: "hosts running spamassassin as daemon"
     private: 1
@@ -1126,7 +1129,7 @@ services:
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck
+    hosts: busoni, wieck, heininen
 
   -
     name: disk usage on /srv/morgue.debian.org
@@ -1443,8 +1446,12 @@ services:
     name: process - exim
     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
+    excludehostgroups: postfix-hosts, mail-relay
     excludehosts: master, busoni, merkel, quantz
+  -
+    name: process - exim
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
+    hostgroups: mail-relay
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"