More exim processes for our mail relays

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ca2cc1a..48a19ad 100644 (file)
--- 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
@@ -395,7 +395,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, bind9-hosts
     contacts: bzed
 
   pergolesi:
@@ -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
@@ -1080,6 +1083,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
+    excludehosts: ries
+  -
+    name: disk usage on /srv
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
+    hosts: ries
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -1120,12 +1129,12 @@ 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
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
     hosts: stabile
   -
     name: disk usage on /srv/mirrors
@@ -1437,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"