summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortonvoon <ton.voon@opsview.com>2010-06-30 13:16:32 +0000
committertonvoon <ton.voon@opsview.com>2010-06-30 13:16:32 +0000
commit5c72d075deb12239e2f1c61cf7b91e0f6ef19640 (patch)
tree6d17bc91b24385a8f40b34c04b4e16c97f82b874
parent34445190148ac113da9d29cbf8b62f4ce8606304 (diff)
downloadmonitoring-plugins-5c72d075deb12239e2f1c61cf7b91e0f6ef19640.tar.gz
Corrected rate_multiplier calculation
-rw-r--r--plugins/check_snmp.c2
-rwxr-xr-xplugins/tests/check_snmp.t2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index e6707a08..206073b6 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -424,7 +424,7 @@ main (int argc, char **argv)
424 temp_double+=(double)18446744069414584320.0; /* 2^64-2^32 */; 424 temp_double+=(double)18446744069414584320.0; /* 2^64-2^32 */;
425 } 425 }
426 /* Convert to per second, then use multiplier */ 426 /* Convert to per second, then use multiplier */
427 temp_double = temp_double/(duration*rate_multiplier); 427 temp_double = temp_double/duration*rate_multiplier;
428 iresult = get_status(temp_double, thlds[i]); 428 iresult = get_status(temp_double, thlds[i]);
429 asprintf (&show, conv, temp_double); 429 asprintf (&show, conv, temp_double);
430 } 430 }
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index 1e350f23..e7ad1927 100755
--- a/plugins/tests/check_snmp.t
+++ b/plugins/tests/check_snmp.t
@@ -151,7 +151,7 @@ sleep 1;
151 151
152$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" ); 152$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" );
153is($res->return_code, 0, "OK as no thresholds" ); 153is($res->return_code, 0, "OK as no thresholds" );
154is($res->output, "SNMP RATE OK - inoctets_per_minute 11.1 | inoctets_per_minute=11.1 ", "Checking multiplier"); 154is($res->output, "SNMP RATE OK - inoctets_per_minute 39960 | inoctets_per_minute=39960 ", "Checking multiplier");
155 155
156 156
157$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\"'" ); 157$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\"'" );