SVN: nagios-config/trunk/commands: check_dns.cfg check_http.cfg check_imap.cfg check_ircd.cfg check_...
glen
glen at pld-linux.org
Fri Sep 4 18:44:31 CEST 2009
Author: glen
Date: Fri Sep 4 18:44:31 2009
New Revision: 10531
Modified:
nagios-config/trunk/commands/check_dns.cfg
nagios-config/trunk/commands/check_http.cfg
nagios-config/trunk/commands/check_imap.cfg
nagios-config/trunk/commands/check_ircd.cfg
nagios-config/trunk/commands/check_load.cfg
nagios-config/trunk/commands/check_mrtgtraf.cfg
nagios-config/trunk/commands/check_mysql.cfg
nagios-config/trunk/commands/check_nntp.cfg
nagios-config/trunk/commands/check_ping.cfg
nagios-config/trunk/commands/check_procs.cfg
nagios-config/trunk/commands/check_spamd.cfg
nagios-config/trunk/commands/check_telnet.cfg
nagios-config/trunk/commands/check_users.cfg
Log:
- allow extra args for all commands
Modified: nagios-config/trunk/commands/check_dns.cfg
==============================================================================
--- nagios-config/trunk/commands/check_dns.cfg (original)
+++ nagios-config/trunk/commands/check_dns.cfg Fri Sep 4 18:44:31 2009
@@ -1,16 +1,11 @@
# 'check_dns' command definition
define command {
command_name check_dns
- command_line $USER1$/check_dns -s $HOSTADDRESS$ -H www.yahoo.com
-}
-
-define command {
- command_name check_dns_custom
- command_line $USER1$/check_dns -s $HOSTADDRESS$ -H $ARG1$
+ command_line $USER1$/check_dns -s $HOSTADDRESS$ -H www.yahoo.com $ARG1$
}
# check if DNSBL is returning success on test record 127.0.0.2
define command {
command_name check_dnsbl
- command_line $USER1$/check_dns -s $HOSTADDRESS$ -H 2.0.0.127.$ARG1$ -a 127.0.0.2
+ command_line $USER1$/check_dns -s $HOSTADDRESS$ -H 2.0.0.127.$ARG1$ -a 127.0.0.2 $ARG2$
}
Modified: nagios-config/trunk/commands/check_http.cfg
==============================================================================
--- nagios-config/trunk/commands/check_http.cfg (original)
+++ nagios-config/trunk/commands/check_http.cfg Fri Sep 4 18:44:31 2009
@@ -4,6 +4,13 @@
command_line $USER1$/check_http -I $HOSTADDRESS$ $ARG1$
}
+define command {
+ command_name check_https
+ command_line $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -S $ARG2$
+}
+
+# These below are deprecated, use check_http / check_https and add the extra args yourself
+
# 'check_http' with port support
define command {
command_name check_http_port
@@ -18,18 +25,13 @@
define command {
command_name check_http_uri_string
- command_line $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -p $ARG2$ -u $ARG3$ -s '$ARG4$'
+ command_line $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -p $ARG2$ -u $ARG3$ -s '$ARG4$' $ARG5$
}
# check http service with URI and expect regex
define command {
command_name check_http_regex
- command_line $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$ -r $ARG3$
-}
-
-define command {
- command_name check_https
- command_line $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -S
+ command_line $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$ -r $ARG3$ $ARG4$
}
define command {
@@ -39,5 +41,5 @@
define command {
command_name check_https_cert
- command_line $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -S -C 14
+ command_line $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -S -C 14 $ARG2$
}
Modified: nagios-config/trunk/commands/check_imap.cfg
==============================================================================
--- nagios-config/trunk/commands/check_imap.cfg (original)
+++ nagios-config/trunk/commands/check_imap.cfg Fri Sep 4 18:44:31 2009
@@ -7,5 +7,5 @@
# check secure imap
define command {
command_name check_imaps
- command_line $USER1$/check_simap -H $HOSTADDRESS$
+ command_line $USER1$/check_simap -H $HOSTADDRESS$ $ARG1$
}
Modified: nagios-config/trunk/commands/check_ircd.cfg
==============================================================================
--- nagios-config/trunk/commands/check_ircd.cfg (original)
+++ nagios-config/trunk/commands/check_ircd.cfg Fri Sep 4 18:44:31 2009
@@ -1,5 +1,5 @@
# check for ircd
define command {
command_name check_ircd
- command_line $USER1$/check_ircd -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$
+ command_line $USER1$/check_ircd -H $HOSTADDRESS$ $ARG1$
}
Modified: nagios-config/trunk/commands/check_load.cfg
==============================================================================
--- nagios-config/trunk/commands/check_load.cfg (original)
+++ nagios-config/trunk/commands/check_load.cfg Fri Sep 4 18:44:31 2009
@@ -2,5 +2,5 @@
# 'check_local_load' command definition
define command {
command_name check_local_load
- command_line $USER1$/check_load -w $ARG1$ -c $ARG2$
+ command_line $USER1$/check_load $ARG1$
}
Modified: nagios-config/trunk/commands/check_mrtgtraf.cfg
==============================================================================
--- nagios-config/trunk/commands/check_mrtgtraf.cfg (original)
+++ nagios-config/trunk/commands/check_mrtgtraf.cfg Fri Sep 4 18:44:31 2009
@@ -1,5 +1,5 @@
# 'check_local_mrtgtraf' command definition
define command {
command_name check_local_mrtgtraf
- command_line $USER1$/check_mrtgtraf -F $ARG1$ -a $ARG2$ -w $ARG3$ -c $ARG4$ -e $ARG5$
+ command_line $USER1$/check_mrtgtraf -F $ARG1$ -a $ARG2$ -w $ARG3$ -c $ARG4$ -e $ARG5$ $ARG6$
}
Modified: nagios-config/trunk/commands/check_mysql.cfg
==============================================================================
--- nagios-config/trunk/commands/check_mysql.cfg (original)
+++ nagios-config/trunk/commands/check_mysql.cfg Fri Sep 4 18:44:31 2009
@@ -2,10 +2,10 @@
# uses $USER3$ and $USER4$ from resources.cfg for authentication
define command {
command_name check_mysql
- command_line $USER1$/check_mysql -H $ARG1$ -u $USER3$ -p $USER4$ -P$ARG2$
+ command_line $USER1$/check_mysql -H $ARG1$ -u $USER3$ -p $USER4$ -P$ARG2$ $ARG3$
}
define command {
command_name check_mysql-slave
- command_line $USER1$/check_mysql -H $ARG1$ -u $USER3$ -p $USER4$ -P$ARG2$ -S
+ command_line $USER1$/check_mysql -H $ARG1$ -u $USER3$ -p $USER4$ -P$ARG2$ -S $ARG4$
}
Modified: nagios-config/trunk/commands/check_nntp.cfg
==============================================================================
--- nagios-config/trunk/commands/check_nntp.cfg (original)
+++ nagios-config/trunk/commands/check_nntp.cfg Fri Sep 4 18:44:31 2009
@@ -1,5 +1,5 @@
# 'check_nntp' command definition
define command {
command_name check_nntp
- command_line $USER1$/check_nntp -H $HOSTADDRESS$
+ command_line $USER1$/check_nntp -H $HOSTADDRESS$ $ARG1$
}
Modified: nagios-config/trunk/commands/check_ping.cfg
==============================================================================
--- nagios-config/trunk/commands/check_ping.cfg (original)
+++ nagios-config/trunk/commands/check_ping.cfg Fri Sep 4 18:44:31 2009
@@ -1,7 +1,7 @@
# 'check_ping' command definition
define command {
command_name check_ping
- command_line $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5
+ command_line $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5 $ARG3$
}
# This command checks to see if a host is "alive" by pinging it
Modified: nagios-config/trunk/commands/check_procs.cfg
==============================================================================
--- nagios-config/trunk/commands/check_procs.cfg (original)
+++ nagios-config/trunk/commands/check_procs.cfg Fri Sep 4 18:44:31 2009
@@ -2,5 +2,5 @@
# 'check_local_procs' command definition
define command {
command_name check_local_procs
- command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
+ command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ $ARG4$
}
Modified: nagios-config/trunk/commands/check_spamd.cfg
==============================================================================
--- nagios-config/trunk/commands/check_spamd.cfg (original)
+++ nagios-config/trunk/commands/check_spamd.cfg Fri Sep 4 18:44:31 2009
@@ -1,5 +1,5 @@
# check for spamassassin spamd
define command {
command_name check_spamd
- command_line $USER1$/check_tcp -H $HOSTNAME$ -p 783 -s 'PING SPAMC/1.0' -e 'PONG'
+ command_line $USER1$/check_tcp -H $HOSTNAME$ -p 783 -s 'PING SPAMC/1.0' -e 'PONG' $ARG1$
}
Modified: nagios-config/trunk/commands/check_telnet.cfg
==============================================================================
--- nagios-config/trunk/commands/check_telnet.cfg (original)
+++ nagios-config/trunk/commands/check_telnet.cfg Fri Sep 4 18:44:31 2009
@@ -1,5 +1,5 @@
# 'check_telnet' command definition
define command {
command_name check_telnet
- command_line $USER1$/check_tcp -H $HOSTADDRESS$ -p 23
+ command_line $USER1$/check_tcp -H $HOSTADDRESS$ -p 23 $ARG1$
}
Modified: nagios-config/trunk/commands/check_users.cfg
==============================================================================
--- nagios-config/trunk/commands/check_users.cfg (original)
+++ nagios-config/trunk/commands/check_users.cfg Fri Sep 4 18:44:31 2009
@@ -2,5 +2,5 @@
# local machine
define command {
command_name check_local_users
- command_line $USER1$/check_users -w $ARG1$ -c $ARG2$
+ command_line $USER1$/check_users -w $ARG1$ -c $ARG2$ $ARG3$
}
More information about the pld-cvs-commit
mailing list