nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 16:08:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

billing improvements from codekiller.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2715 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-11-05 14:55:08 +00:00
parent f3de72be89
commit f7eb392298
9 changed files with 508 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/billing.php
+15 -2
View File
@@ -171,8 +171,13 @@ function getRates($bill_id,$datefrom,$dateto)
$a_95th = dbFetchColumn($q_95_sql);
$m_95th = $a_95th[$measurement_95th];
$mtot = getTotal($bill_id,$datefrom,$dateto);
$ptot = getPeriod($bill_id,$datefrom,$dateto);
$sum_data = getSum($bill_id,$datefrom,$dateto);
# $mtot = getTotal($bill_id,$datefrom,$dateto);
$mtot = $sum_data['total'];
$mtot_in = $sum_data['inbound'];
$mtot_out = $sum_data['outbound'];
# $ptot = getPeriod($bill_id,$datefrom,$dateto);
$ptot = $sum_data['period'];
$data['rate_95th_in'] = get95thIn($bill_id,$datefrom,$dateto);
$data['rate_95th_out'] = get95thOut($bill_id,$datefrom,$dateto);
@@ -187,6 +192,8 @@ function getRates($bill_id,$datefrom,$dateto)
}
$data['total_data'] = round($mtot / 1000 / 1000, 2);
$data['total_data_in'] = round($mtot_in / 1000 / 1000, 2);
$data['total_data_out'] = round($mtot_out / 1000 / 1000, 2);
$data['rate_average'] = round($mtot / $ptot / 1000 * 8, 2);
# print_r($data);
@@ -200,6 +207,12 @@ function getTotal($bill_id,$datefrom,$dateto)
return($mtot);
}
function getSum($bill_id,$datefrom,$dateto)
{
$sum = dbFetchRow("SELECT SUM(period) as period, SUM(delta) as total, SUM(in_delta) as inbound, SUM(out_delta) as outbound FROM bill_data WHERE bill_id = '".mres($bill_id)."' AND timestamp > '".mres($datefrom)."' AND timestamp <= '".mres($dateto)."'");
return($sum);
}
function getPeriod($bill_id,$datefrom,$dateto)
{
$ptot = dbFetchCell("SELECT SUM(period) FROM bill_data WHERE bill_id = '".mres($bill_id)."' AND timestamp > '".mres($datefrom)."' AND timestamp <= '".mres($dateto)."'");