X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=ef171bd8f2fbe3f410f25db5434aee423749e366;hb=f310fc018dc94ca54243c11aeaf564bb6f5acf0a;hp=169ff2d2d87eb8383f682c26e08387d506ca52ae;hpb=a050a28f91e5a1c6cbff3438a4fde569dc2c8a77;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 169ff2d..ef171bd 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -17,8 +17,6 @@
 #  - puccini: mailgraph
 #  -
 #  - agnesi
-#  - lebrun
-#  - murphy
 #  - piatti
 #  - tartini
 #sarge:
@@ -190,6 +188,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
@@ -574,18 +576,16 @@ services:
     hostgroups: computers
   -
     name: "network service - sshd"
-    check: check_ssh
+    check: dsa_check_ssh
     hostgroups: computers
     depends: process - sshd
     normal_check_interval:  60
-    notification_interval:  60
 
   -
     name: "network service - sshd"
-    check: check_ssh
+    check: dsa_check_ssh
     hostgroups: deadslow
     normal_check_interval:  180
-    notification_interval:  180
  ####
   -
     name: network service - nrpe
@@ -872,11 +872,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 +879,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
@@ -1067,14 +1091,12 @@ services:
     hosts: samosa
     depends: "process - apache2 - master"
     normal_check_interval: 120
-    notification_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
     hosts: samosa
     depends: network service - https
     normal_check_interval: 240
-    notification_interval: 240
  ####
   -
     name: process - named