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

Storage RRD - descriptionlength fix - percent column fix (#10607)

Browse Source 
* Storage RRD - descriptionlength fix - percent column fix

* changed percentage column description

* increase also column length on furhter graphs

* fix column title length
This commit is contained in:
SourceDoctor
2019-09-26 04:51:07 +02:00
committed by Tony Murray
parent 71f7323550
commit ee2a847c0b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ $scale_max = '100';
require 'includes/html/graphs/common.inc.php';
$iter = '1';
$rrd_options .= " COMMENT:' Size Used %age\\l'";
$rrd_options .= " COMMENT:' Size Used % Used\\l'";
foreach (dbFetchRows('SELECT * FROM storage where device_id = ?', array($device['device_id'])) as $storage) {
// FIXME generic colour function
@@ -27,7 +27,7 @@ foreach (dbFetchRows('SELECT * FROM storage where device_id = ?', array($device[
$iter = '0';
}
$descr = rrdtool_escape($storage['storage_descr'], 12);
$descr = rrdtool_escape($storage['storage_descr'], 16);
$rrd = rrd_name($device['hostname'], array('storage', $storage['storage_mib'], $storage['storage_descr']));
$rrd_options .= " DEF:{$storage['storage_id']}used=$rrd:used:AVERAGE";
$rrd_options .= " DEF:{$storage['storage_id']}free=$rrd:free:AVERAGE";

6
includes/html/graphs/storage/usage.inc.php
View File

@@ -9,14 +9,14 @@ $rrd_options .= ' -b 1024';
$iter = '1';
$rrd_options .= " COMMENT:' Size Free % Used\\n'";
$rrd_options .= " COMMENT:' Size Free % Used\\n'";
$hostname = gethostbyid($storage['device_id']);
$colour = 'CC0000';
$colour_area = 'ffaaaa';
$descr = rrdtool_escape($storage['storage_descr'], 12);
$descr = rrdtool_escape($storage['storage_descr'], 16);
$percentage = round($storage['storage_perc'], 0);
@@ -33,7 +33,7 @@ $rrd_options .= ' GPRINT:free:LAST:%6.2lf%sB';
$rrd_options .= " GPRINT:perc:LAST:%5.2lf%%\\n";
if ($_GET['previous']) {
$descr = rrdtool_escape('Prev '.$storage['storage_descr'], 12);
$descr = rrdtool_escape('Prev '.$storage['storage_descr'], 16);
$colour = '99999999';
$colour_area = '66666666';