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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ec148a7..5e0bfdc 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -156,6 +156,10 @@ servers:
     address: 130.239.18.97
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-esiee:
+    address: 147.215.2.249
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -309,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
@@ -389,6 +401,10 @@ servers:
     address: 195.20.242.124
     parents: schumann
     hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts, hassrvfs
+  geo3:
+    address: 195.20.242.125
+    parents: schumann
+    hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
 
   caballero:
     address: 193.201.200.200
@@ -464,6 +480,10 @@ servers:
     address: 137.82.84.74
     parents: dijkstra
     hostgroups: computers, lenny, puppet, buildd, hasbootfs, hassrvfs
+  geo2:
+    address: 137.82.84.71
+    parents: dijkstra
+    hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
 
   lebrun:
     address: 193.198.184.10
@@ -519,6 +539,11 @@ servers:
     parents: gw-aca
     hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet
 
+  lafayette:
+    address: 147.215.7.160
+    parents: gw-esiee
+    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs
+
 #############################
 # host groups
 #
@@ -1285,6 +1310,7 @@ services:
     check: dsa_check_smtp
     hostgroups: computers
     excludehostgroups: postfix-hosts
+    excludehosts: lafayette
     depends: process - exim
 
   -
@@ -1293,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