[project @ peter@palfrader.org-20080406115250-hqx859tlprmb1lax]

own smtp check with longer timeout.  tweaks

diff --git a/checkcommands.cfg b/checkcommands.cfg
index 806a2bc..7bfde41 100644 (file)
--- a/checkcommands.cfg
+++ b/checkcommands.cfg
@@ -10,3 +10,7 @@ define command{
        command_name    dsa_check_http_port
        command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$ -p $ARG1$
 }
+define command{
+       command_name    dsa_check_smtp
+       command_line    /usr/lib/nagios/plugins/check_smtp -t 20 -H $HOSTADDRESS$
+}

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 6fbc709..3b8b89f 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -282,7 +282,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, bind9-hosts
+    hostgroups: computers, buildd, sw-raid
 
 #############################
 # host groups
@@ -802,12 +802,12 @@ services:
  ###
   -
     name: network service - smtp
-    check: check_smtp
+    check: dsa_check_smtp
     hostgroups: postfix-hosts
     depends: process - postfix - master
   -
     name: network service - smtp
-    check: check_smtp
+    check: dsa_check_smtp
     hostgroups: computers
     excludehostgroups: postfix-hosts
     depends: process - exim