[nagiosplug] Corrected rate_multiplier calculation
"Ton Voon" <[email protected]>
| Newsgroups | gmane.network.nagios.plugins.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module: nagiosplug Branch: master Commit: 5c72d075deb12239e2f1c61cf7b91e0f6ef19640 Author: tonvoon <[email protected]> Date: Wed Jun 30 13:16:32 2010 +0000 URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=5c72d07 Corrected rate_multiplier calculation --- plugins/check_snmp.c | 2 +- plugins/tests/check_snmp.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index e6707a0..206073b 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -424,7 +424,7 @@ main (int argc, char **argv) temp_double+=(double)18446744069414584320.0; /* 2^64-2^32 */; } /* Convert to per second, then use multiplier */ - temp_double = temp_double/(duration*rate_multiplier); + temp_double = temp_double/duration*rate_multiplier; iresult = get_status(temp_double, thlds[i]); asprintf (&show, conv, temp_double); } diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t index 1e350f2..e7ad192 100755 --- a/plugins/tests/check_snmp.t +++ b/plugins/tests/check_snmp.t @@ -151,7 +151,7 @@ sleep 1; $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets_per_minute --rate-multiplier=60" ); is($res->return_code, 0, "OK as no thresholds" ); -is($res->output, "SNMP RATE OK - inoctets_per_minute 11.1 | inoctets_per_minute=11.1 ", "Checking multiplier"); +is($res->output, "SNMP RATE OK - inoctets_per_minute 39960 | inoctets_per_minute=39960 ", "Checking multiplier"); $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 -s '\"stringtests\"'" ); ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first