mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When ifSpeed is not returned by the switch, billing was broken.

Browse Source
This commit is contained in:
Karsten Schmidt
2016-08-01 14:46:33 +02:00
parent 1fe334690c
commit 09b4497778
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
poll-billing.php
View File

@@ -75,7 +75,7 @@ function CollectData($bill_id) {
$tmp_period = dbFetchCell("SELECT UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) - UNIX_TIMESTAMP('".mres($last_counters['timestamp'])."')"); $tmp_period = dbFetchCell("SELECT UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) - UNIX_TIMESTAMP('".mres($last_counters['timestamp'])."')");
if ((delta_to_bits($port_data['in_measurement'], $tmp_period)-delta_to_bits($port_data['last_in_measurement'], $tmp_period)) > $port_data['ifSpeed']) { if ($port_data['ifSpeed'] > 0 && (delta_to_bits($port_data['in_measurement'], $tmp_period)-delta_to_bits($port_data['last_in_measurement'], $tmp_period)) > $port_data['ifSpeed']) {
$port_data['in_delta'] = $port_data['last_in_delta']; $port_data['in_delta'] = $port_data['last_in_delta'];
} }
elseif ($port_data['in_measurement'] >= $port_data['last_in_measurement']) { elseif ($port_data['in_measurement'] >= $port_data['last_in_measurement']) {
@@ -85,7 +85,7 @@ function CollectData($bill_id) {
$port_data['in_delta'] = $port_data['last_in_delta']; $port_data['in_delta'] = $port_data['last_in_delta'];
} }
if ((delta_to_bits($port_data['out_measurement'], $tmp_period)-delta_to_bits($port_data['last_out_measurement'], $tmp_period)) > $port_data['ifSpeed']) { if ($port_data['ifSpeed'] > 0 && (delta_to_bits($port_data['out_measurement'], $tmp_period)-delta_to_bits($port_data['last_out_measurement'], $tmp_period)) > $port_data['ifSpeed']) {
$port_data['out_delta'] = $port_data['last_out_delta']; $port_data['out_delta'] = $port_data['last_out_delta'];
} }
elseif ($port_data['out_measurement'] >= $port_data['last_out_measurement']) { elseif ($port_data['out_measurement'] >= $port_data['last_out_measurement']) {