Corrected rate_multiplier calculation

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index e6707a0851567ceb5df167546574ddd385aa065e..206073b6d1cd79bc7d8394438e795bccde5de1fc 100644 (file)
--- 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 1e350f2324e36bbc73069fe8ad3183e225e45394..e7ad1927f27dfab24d0987f492c611303fbf881e 100755 (executable)
--- 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\"'" );