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

Sanity check the in/out_delta value, if it's out of the range of the

Browse Source 
ifSpeed then we use the previous value
This commit is contained in:
laf
2016-06-15 16:25:14 +00:00
parent 66f8a7e071
commit e5e1e89331
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/billing-graph.php
View File

@@ -131,8 +131,8 @@ foreach (dbFetch('SELECT *, UNIX_TIMESTAMP(timestamp) AS formatted_date FROM bil
$period = $row['period'];
$in_delta = $row['in_delta'];
$out_delta = $row['out_delta'];
$in_value = round(($in_delta * 8 / $period), 2);
$out_value = round(($out_delta * 8 / $period), 2);
$in_value = delta_to_bits($in_delta, $period);
$out_value = delta_to_bits($out_delta, $period);;
$last = $timestamp;

5
includes/billing.php
View File

@@ -63,7 +63,7 @@ function getDates($dayofmonth, $months=0) {
}//end getDates()
function getValue($host, $port, $id, $inout) {
function getValue($host, $port, $id, $inout, $port_data=array()) {
global $config;
$oid = 'IF-MIB::ifHC'.$inout.'Octets.'.$id;
@@ -81,8 +81,9 @@ function getValue($host, $port, $id, $inout) {
function getLastPortCounter($port_id) {
$return = array();
$row = dbFetchRow("SELECT in_counter, in_delta, out_counter, out_delta FROM bill_port_counters WHERE `port_id` = ?", array($port_id));
$row = dbFetchRow("SELECT timestamp, in_counter, in_delta, out_counter, out_delta FROM bill_port_counters WHERE `port_id` = ?", array($port_id));
if (!is_null($row)) {
$return[timestamp] = $row['timestamp'];
$return[in_counter] = $row['in_counter'];
$return[in_delta] = $row['in_delta'];
$return[out_counter] = $row['out_counter'];

4
includes/functions.php
View File

@@ -1534,3 +1534,7 @@ function create_sensor_to_state_index($device, $state_name, $index)
dbInsert($insert, 'sensors_to_state_indexes');
}
}
function delta_to_bits($delta,$period) {
return round(($_delta * 8 / $period), 2);
}

14
poll-billing.php
View File

@@ -73,14 +73,22 @@ function CollectData($bill_id) {
$port_data['last_out_measurement'] = $last_counters[out_counter];
$port_data['last_out_delta'] = $last_counters[out_delta];
if ($port_data['in_measurement'] >= $port_data['last_in_measurement']) {
$tmp_period = dbFetchCell("SELECT UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) - UNIX_TIMESTAMP('".mres($last_counters['timestamp'])."')");
if (delta_to_bits($port_data['in_delta'], $tmp_period) > $port_data['ifSpeed']) {
$port_data['in_delta'] = $port_data['last_in_delta'];
}
elseif ($port_data['in_measurement'] >= $port_data['last_in_measurement']) {
$port_data['in_delta'] = ($port_data['in_measurement'] - $port_data['last_in_measurement']);
}
else {
$port_data['in_delta'] = $port_data['last_in_delta'];
}
if ($port_data['out_measurement'] >= $port_data['last_out_measurement']) {
if (delta_to_bits($port_data['out_delta'], $tmp_period) > $port_data['ifSpeed']) {
$port_data['out_delta'] = $port_data['last_out_delta'];
}
elseif ($port_data['out_measurement'] >= $port_data['last_out_measurement']) {
$port_data['out_delta'] = ($port_data['out_measurement'] - $port_data['last_out_measurement']);
}
else {
@@ -91,7 +99,7 @@ function CollectData($bill_id) {
$port_data['in_delta'] = '0';
$port_data['out_delta'] = '0';
}
$fields = array('timestamp' => $now, 'in_counter' => $port_data['in_measurement'], 'out_counter' => $port_data['out_measurement'], 'in_delta' => $port_data['in_delta'], 'out_delta' => $port_data['out_delta']);
if (dbUpdate($fields, 'bill_port_counters', "`port_id`='" . mres($port_id) . "'") == 0) {
$fields['port_id'] = $port_id;