X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ebabe0561fd5369fb31751ab4f2264e7140802c1;hb=178860df47242ade634be7176b9098672acdff45;hp=a0b1fec2262df51c1698d8f6c89fbbd35ee8fe4e;hpb=f3e38b48d2b05a7d74bf46894152aad4c984bbb3;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a0b1fec..ebabe05 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -285,7 +285,7 @@ servers:
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts
   byrd:
     address: 82.195.75.92
     parents: unger
@@ -417,7 +417,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts
+    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -547,7 +547,7 @@ servers:
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, ftpd-hosts
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
@@ -591,7 +591,7 @@ servers:
   rossini:
     address: 206.12.19.19
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
   salieri:
     address: 206.12.19.20
     parents: tchaikovsky
@@ -650,8 +650,8 @@ servers:
     contacts: holger
 
   rem:
-    address: 195.71.99.217
-    parents: gw-telefonica
+    address: 82.195.75.68
+    parents: gw-man-da
     hostgroups: computers, buildd, hasbootfs, hashomefs
 
   zelenka:
@@ -753,7 +753,7 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service
+    hostgroups: computers, acpid-hosts, service, apache2-hosts
     # which raid?
   lindberg:
     address: 86.59.118.149
@@ -784,7 +784,7 @@ servers:
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, squeeze
 
   poulenc:
     address: 144.32.168.77
@@ -1467,6 +1467,10 @@ services:
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
     hosts: master, busoni, merkel, quantz
+  -
+    name: mail queue
+    nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
+    hostgroups: heavy-exim
  ###
   -
     name: process - clamav - clamd