X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=5e0bfdcb8aa35181e8fe8148d0fefe3bf355ed26;hb=67fd8fa5e304902325486d683da8af89a56d07e8;hp=06e39edf8e8175a750feacf8ee6efd05ef3dac54;hpb=134531a01c2204dbc875ce868ddcb595b252ac53;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 06e39ed..5e0bfdc 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -313,6 +313,14 @@ servers:
     address: 128.31.0.46
     parents: gw-mit-csail
     hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, puppet
+  rore:
+    address: 128.31.0.49
+    parents: gw-mit-csail
+    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, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
@@ -534,7 +542,7 @@ servers:
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
-    hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet, sw-raid
+    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs
 
 #############################
 # host groups
@@ -1302,6 +1310,7 @@ services:
     check: dsa_check_smtp
     hostgroups: computers
     excludehostgroups: postfix-hosts
+    excludehosts: lafayette
     depends: process - exim
 
   -
@@ -1310,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