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

revert change changing mempool/storage format

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3091 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-04-26 16:15:11 +00:00
parent 77d055f9d6
commit 22dad0dae4
11 changed files with 144 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
html/includes/graphs/device/bits.inc.php
View File

@@ -55,7 +55,7 @@ $colours_in ='greens';
$multiplier = "8";
$colours_out = 'blues';
$nototal = 1;
#$nototal = 1;
$ds_in = "INOCTETS";
$ds_out = "OUTOCTETS";
@@ -68,8 +68,7 @@ $colour_area_in = "91B13C";
$colour_area_out = "8080BD";
include("includes/graphs/generic_multi_seperated.inc.php");
#include("includes/graphs/generic_multi_bits_separated.inc.php");
#include("includes/graphs/generic_multi_data.inc.php");
#include("includes/graphs/generic_multi_data_separated.inc.php");
?>

2
html/includes/graphs/device/mempool.inc.php
View File

@@ -18,7 +18,7 @@ foreach (dbFetchRows("SELECT * FROM `mempools` where `device_id` = ?", array($id
$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 22),0,22);
$descr = str_replace(":", "\:", $descr);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempoolX-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempool-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
if (is_file($rrd_filename))
{

2
html/includes/graphs/device/storage.inc.php
View File

@@ -19,7 +19,7 @@ foreach (dbFetchRows("SELECT * FROM storage where device_id = ?", array($id)) as
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("storageX-".$storage['storage_mib']."-".$storage['storage_descr'].".rrd");
$rrd = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("storage-".$storage['storage_mib']."-".$storage['storage_descr'].".rrd");
$rrd_options .= " DEF:$storage[storage_id]used=$rrd:used:AVERAGE";
$rrd_options .= " DEF:$storage[storage_id]free=$rrd:free:AVERAGE";
$rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";