X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=6ae31c5b565d860fcd7b5f0b05ef171e8e05fead;hb=160d04a24e2afb4f27c12546bb50e6c6ea00c5cc;hp=16200b265db4f397406622e0765dbb6f33ce53dc;hpb=9439e90f75563ddf8b536895f7b1b90711e5e620;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 16200b2..6ae31c5 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -316,11 +316,11 @@ servers:
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
-    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl360
+    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl360, acpid-hosts
   carver:
     address: 128.31.0.50
     parents: gw-mit-csail
-    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl380
+    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl380, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
@@ -532,7 +532,7 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360, bind9-hosts
 
   praetorius:
     address: 130.239.18.121
@@ -1310,6 +1310,7 @@ services:
     check: dsa_check_smtp
     hostgroups: computers
     excludehostgroups: postfix-hosts
+    excludehosts: lafayette
     depends: process - exim
 
   -
@@ -1318,6 +1319,11 @@ services:
     hostgroups: postfix-hosts
     excludehosts: verdi, kassia, allegri, piatti
     depends: process - postfix - master
+  -
+    name: network service - submission
+    check: dsa_check_smtp_port!587
+    hosts: lafayette
+    depends: process - exim
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
@@ -1414,6 +1420,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw"
     hostgroups: sw-raid
 
+ ###
+  -
+    name: process - monit
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    hostgroups: lenny
+    excludehostgroups: deadslow
  ###
   -
     name: process - cpqarrayd