X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=c3638fd84974248abbf569972869970a9d8e6748;hb=ecb01d5552a674810f43ab0f51cf66a9771a3f5f;hp=05c021dbf29f37ef638f26027dd257b30005f5ee;hpb=3519d7e8ebd0fd473bce576d9c5d4d8889f2ba2d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 05c021d..c3638fd 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -224,7 +224,7 @@ servers:
   morales:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs
+    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, puppet
     contacts: bzed
   sperger:
     address: 82.195.75.98
@@ -454,7 +454,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs
+    hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs, incomingmailrelayed2025
     contacts: luk
 
   agnesi:
@@ -541,7 +541,7 @@ servers:
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
-    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs
+    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs, incomingmailrelayed
 
 #############################
 # host groups
@@ -698,6 +698,14 @@ hostgroups:
     alias: hosts with a /srv
     private: 1
 
+  incomingmailrelayed:
+    alias: incoming mail needs to go through a mail relay
+    # i.e. no port 25
+    private: 1
+  incomingmailrelayed2025:
+    alias: incoming mail needs to go through a mail relay
+    # i.e. no port 25
+    private: 1
 
 #############################
 # servicegroups
@@ -1028,12 +1036,12 @@ services:
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: allegri, zelenka
+    excludehosts: allegri, zelenka, ancina
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: allegri, zelenka
+    hosts: allegri, zelenka, ancina
     depends: process - xinetd
 
  ###
@@ -1301,8 +1309,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: computers
-    excludehostgroups: postfix-hosts
-    excludehosts: lafayette
+    excludehostgroups: postfix-hosts, incomingmailrelayed, incomingmailrelayed2025
     depends: process - exim
 
   -
@@ -1314,7 +1321,12 @@ services:
   -
     name: network service - submission
     check: dsa_check_smtp_port!587
-    hosts: lafayette
+    hostgroups: incomingmailrelayed
+    depends: process - exim
+  -
+    name: network service - smtp 2025
+    check: dsa_check_smtp_port!2025
+    hostgroups: incomingmailrelayed2025
     depends: process - exim
   -
     name: network service - smtp - port 2025
@@ -1500,13 +1512,13 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, allegri, gluck, zelenka
+    hosts: samosa, allegri, gluck, zelenka, ancina
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, allegri, gluck, zelenka
+    excludehosts: samosa, allegri, gluck, zelenka, ancina
     excludehostgroups: rsyncd-hosts
  ###
   -