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

Fixed Quick Graphs bug w/ Aggregate 95th code (#10269)

Browse Source 
* Added configuration options to aggregate input and output bits before making 95th percentile billing calculations

* Changed aggregate to per-bill instead of global.  Added config options for making aggregate the default selected option.  Refactored out mres() calls in touched files.  Changed to Config::get where appropriate.

* Fixed documentation typo

* Fixed scope of aggregate default config option to be under billing

* Fixed getRates issue in Quick Graphs section of 95th percentile bill

* Added configuration options to aggregate input and output bits before making 95th percentile billing calculations

* Changed aggregate to per-bill instead of global.  Added config options for making aggregate the default selected option.  Refactored out mres() calls in touched files.  Changed to Config::get where appropriate.

* Fixed documentation typo

* Fixed scope of aggregate default config option to be under billing

* Fixed getRates issue in Quick Graphs section of 95th percentile bill

* Fixed formatting
This commit is contained in:
Llarian
2019-05-28 21:39:31 -07:00
committed by Tony Murray
parent 824bcb7f16
commit 0e36e52a63
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/html/graphs/bill/bits.inc.php
View File

@@ -3,7 +3,7 @@
$datefrom = date('YmdHis', $vars['from']);
$dateto = date('YmdHis', $vars['to']);
$rates = getRates($vars['id'], $datefrom, $dateto);
$rates = getRates($vars['id'], $datefrom, $dateto, $vars['dir']);
$ports = dbFetchRows('SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D WHERE B.bill_id = ? AND P.port_id = B.port_id AND D.device_id = P.device_id', array($vars['id']));

8
includes/html/pages/bill.inc.php
View File

@@ -240,19 +240,19 @@ if ($vars['view'] == 'accurate') {
} else {
$bi = "<img src='graph.php?type=bill_bits&amp;id=".$bill_id;
$bi .= '&amp;from='.$unixfrom.'&amp;to='.$unixto;
$bi .= "&amp;width=1000&amp;height=200&amp;total=1'>";
$bi .= "&amp;width=1000&amp;height=200&amp;total=1&amp;dir=".$dir_95th."'>";
$li = "<img src='graph.php?type=bill_bits&amp;id=".$bill_id;
$li .= '&amp;from='.$unix_prev_from.'&amp;to='.$unix_prev_to;
$li .= "&amp;width=1000&amp;height=200&amp;total=1'>";
$li .= "&amp;width=1000&amp;height=200&amp;total=1&amp;dir=".$dir_95th."'>";
$di = "<img src='graph.php?type=bill_bits&amp;id=".$bill_id;
$di .= '&amp;from='.$config['time']['day'].'&amp;to='.$config['time']['now'];
$di .= "&amp;width=1000&amp;height=200&amp;total=1'>";
$di .= "&amp;width=1000&amp;height=200&amp;total=1&amp;dir=".$dir_95th."'>";
$mi = "<img src='graph.php?type=bill_bits&amp;id=".$bill_id;
$mi .= '&amp;from='.$lastmonth.'&amp;to='.$rightnow;
$mi .= "&amp;width=1000&amp;height=200&amp;total=1'>";
$mi .= "&amp;width=1000&amp;height=200&amp;total=1&amp;dir=".$dir_95th."'>";
}//end if
?>