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

more rrdtool_escape goodness

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3230 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-05-23 10:37:23 +00:00
parent 75113e0218
commit cc7f01ee26
19 changed files with 54 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,13 +13,12 @@ $rrd_options .= " COMMENT:' Size Free % Used\\n'";
$hostname = gethostbyid($storage['device_id']);
$colour="CC0000";
$colour_area="ffaaaa";
$colour = "CC0000";
$colour_area = "ffaaaa";
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$descr = rrdtool_escape($storage['storage_descr'], 12);
$percentage = round($storage['storage_perc'], 0);
$percentage = round($storage['storage_perc'], 0);
$background = get_percentage_colours($percentage);
@@ -35,11 +34,10 @@ $rrd_options .= " GPRINT:perc:LAST:%5.2lf%%\\\\n";
if ($_GET['previous'])
{
$descr = substr(str_pad("Prev ".$storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$descr = rrdtool_escape("Prev ".$storage['storage_descr'], 12);
$colour="99999999";
$colour_area="66666666";
$colour = "99999999";
$colour_area = "66666666";
$rrd_options .= " DEF:usedX=$rrd_filename:used:AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:freeX=$rrd_filename:free:AVERAGE:start=".$prev_from.":end=".$from;