Author: glen Date: Tue Aug 4 23:25:22 2009 GMT Module: packages Tag: HEAD ---- Log message: - include perfdata in submitting; rel 4
---- Files affected: packages/nagios-nsca: nagios-nsca.spec (1.17 -> 1.18) , nagios-nsca.submit (1.6 -> 1.7) , nsca-command.cfg (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/nagios-nsca/nagios-nsca.spec diff -u packages/nagios-nsca/nagios-nsca.spec:1.17 packages/nagios-nsca/nagios-nsca.spec:1.18 --- packages/nagios-nsca/nagios-nsca.spec:1.17 Tue Aug 4 08:03:07 2009 +++ packages/nagios-nsca/nagios-nsca.spec Wed Aug 5 01:25:17 2009 @@ -7,7 +7,7 @@ Summary(pl.UTF-8): Demon NSCA dla Nagiosa Name: nagios-nsca Version: 2.7.2 -Release: 3 +Release: 4 License: GPL Group: Networking Source0: http://dl.sourceforge.net/nagios/nsca-%{version}.tar.gz @@ -130,6 +130,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2009/08/04 23:25:17 glen +- include perfdata in submitting; rel 4 + Revision 1.17 2009/08/04 06:03:07 glen - add command definition to client package; rel 3 ================================================================ Index: packages/nagios-nsca/nagios-nsca.submit diff -u packages/nagios-nsca/nagios-nsca.submit:1.6 packages/nagios-nsca/nagios-nsca.submit:1.7 --- packages/nagios-nsca/nagios-nsca.submit:1.6 Tue Aug 4 08:19:24 2009 +++ packages/nagios-nsca/nagios-nsca.submit Wed Aug 5 01:25:17 2009 @@ -9,6 +9,7 @@ # or "UNKNOWN") # $4 = plugin_output (A text string that should be used # as the plugin output for the service checks) +# $5 = perfdata # # Arguments for host: @@ -18,16 +19,17 @@ # or "UNKNOWN") # $3 = plugin_output (A text string that should be used # as the plugin output for the host checks) +# $4 = perfdata # -if [ "$#" = 4 ]; then +if [ "$#" = 5 ]; then TYPE=SERVICE CODE=$3 -elif [ "$#" = 3 ]; then +elif [ "$#" = 4 ]; then TYPE=HOST CODE=$2 else - echo >&2 "You must specify exactly 3 or 4 arguments" + echo >&2 "You must specify exactly 4 or 5 arguments" exit 1 fi @@ -70,9 +72,9 @@ # monitoring server if [ "$TYPE" = "SERVICE" ]; then - echo -e "$1\t$2\t$RETURN_CODE\t$4\n" | /usr/sbin/send_nsca $CENTRAL -c /etc/nagios/send_nsca.cfg + echo -e "$1\t$2\t$RETURN_CODE\t$4|$5\n" | /usr/sbin/send_nsca $CENTRAL -c /etc/nagios/send_nsca.cfg elif [ "$TYPE" = "HOST" ]; then - echo -e "$1\t$RETURN_CODE\t$3\n" | /usr/sbin/send_nsca $CENTRAL -c /etc/nagios/send_nsca.cfg + echo -e "$1\t$RETURN_CODE\t$3|$4\n" | /usr/sbin/send_nsca $CENTRAL -c /etc/nagios/send_nsca.cfg else echo >&2 "This cannot happen" exit 1 ================================================================ Index: packages/nagios-nsca/nsca-command.cfg diff -u packages/nagios-nsca/nsca-command.cfg:1.1 packages/nagios-nsca/nsca-command.cfg:1.2 --- packages/nagios-nsca/nsca-command.cfg:1.1 Tue Aug 4 08:03:22 2009 +++ packages/nagios-nsca/nsca-command.cfg Wed Aug 5 01:25:17 2009 @@ -5,10 +5,10 @@ define command { command_name send_nsca-host - command_line /usr/sbin/send_nsca-submit $HOSTNAME$ $HOSTSTATE$ '$HOSTOUTPUT$' + command_line /usr/sbin/send_nsca-submit $HOSTNAME$ $HOSTSTATE$ '$HOSTOUTPUT$' '$HOSTPERFDATA$' } define command { command_name send_nsca-service - command_line /usr/sbin/send_nsca-submit $HOSTNAME$ '$SERVICEDESC$' $SERVICESTATE$ '$SERVICEOUTPUT$' + command_line /usr/sbin/send_nsca-submit $HOSTNAME$ '$SERVICEDESC$' $SERVICESTATE$ '$SERVICEOUTPUT$' '$SERVICEPERFDATA$' } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nsca/nagios-nsca.spec?r1=1.17&r2=1.18&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nsca/nagios-nsca.submit?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nsca/nsca-command.cfg?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
