X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=1f8a07fa7ed86df5d11172778c261935e804d1a4;hb=4accde3f20899b6196b08dcc22bcff9cd9c1b726;hp=5f018f683abc928e2eee0b910f8bdd1d5b3028f1;hpb=98699de66a1205c5733caea31118816bf75dfb92;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 5f018f6..1f8a07f 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -190,6 +190,10 @@ servers:
     address: 70.103.162.29
     parents: gw-brainfood
     hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload
+  murphy:
+    address: 70.103.162.31
+    parents: gw-brainfood
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, postfix-hosts
 
   ries:
     address: 128.148.34.103
@@ -319,12 +323,12 @@ servers:
   kassia:
     address: 130.89.175.54
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360
+    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360
 
   allegri:
     address: 157.193.39.233
     parents: gw-ughent
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, postfix-hosts, sw-raid
 
 #############################
 # host groups
@@ -872,11 +876,6 @@ services:
     depends: process - postfix - master
 
  ###
-  -
-    name: network service - smtp
-    check: dsa_check_smtp
-    hostgroups: postfix-hosts
-    depends: process - postfix - master
   -
     name: network service - smtp
     check: dsa_check_smtp
@@ -884,7 +883,36 @@ services:
     excludehostgroups: postfix-hosts
     depends: process - exim
 
+  -
+    name: network service - smtp
+    check: dsa_check_smtp
+    hostgroups: postfix-hosts
+    excludehosts: verdi, kassia, allegri
+    depends: process - postfix - master
+  -
+    name: network service - smtp - port 2025
+    check: dsa_check_smtp_port!2025
+    hosts: verdi, kassia, murphy
+    depends: process - postfix - master
+  -
+    name: network service - smtp - port 8080
+    check: dsa_check_smtp_port!8080
+    hosts: allegri
+    depends: process - postfix - master
 
+  -
+    name: network service local - smtps cert
+    nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
+    hostgroups: postfix-hosts
+    depends: process - postfix - master
+    normal_check_interval: 1440
+
+
+  -
+    name: setup - debian-admin in etc aliases
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-da-in-aliases"
+    hostgroups: computers
+    normal_check_interval: 1440
  ###
   -
     name: process - uptimed