X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=42f76f1faad63ee93cb2b40b11bc41751be24fd4;hb=1749876011d300fbd90218b22f1fc999e62224bb;hp=2273e09915ee2fe178ccd5739f8ffce36e03a97a;hpb=ab1e990c0522a8809c040e8e5454cd6d90b9fb79;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 2273e09..42f76f1 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -290,7 +290,7 @@ servers:
   raptor:
     address: 195.243.109.162
     parents: gw-topalis
-    hostgroups: computers, porterbox
+    hostgroups: computers, porterbox, postfix-hosts
 
   albeniz:
     address: 193.62.202.27
@@ -317,6 +317,7 @@ servers:
     address: 72.66.115.54
     parents: gw-frost
     hostgroups: computers, buildd
+    contacts: sfrost
 
   puccini:
     address: 87.106.4.56
@@ -976,13 +977,19 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, kassia, allegri
+    excludehosts: verdi, kassia, allegri, raptor
     depends: process - postfix - master
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
     hosts: verdi, kassia, murphy, allegri
     depends: process - postfix - master
+  -
+    name: network service - smtp - port 2025
+    remotecheck: /usr/lib/nagios/plugins/check_smtp -t 40 -H $HOSTADDRESS$ -p 2025
+    runfrom: murphy
+    hosts: raptor
+    depends: process - postfix - master
 
   -
     name: network service local - smtps cert
@@ -1092,6 +1099,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-dac960"
     hosts: verdi
+ ###
+  -
+    name: RAID - 3ware
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
+    hosts: puccini
 
  ###
   -
@@ -1232,7 +1245,7 @@ services:
  ####
   -
     name: process - debianqueued
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued -a '/usr/bin/perl -w ./debianqueued'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued"
     hosts: ries
 
  ###