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

move percentage colour mappings to function. make graphs for memory/storage match percentage colours (should we do this for others?)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2160 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-25 17:15:36 +00:00
parent e5fe2fb0ec
commit efd9d30ee7
18 changed files with 82 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/functions.inc.php
+14 -1
View File
@@ -1,5 +1,18 @@
<?php
function get_percentage_colours($percentage)
{
if ($percentage > '90') { $background['left']='c4323f'; $background['right']='C96A73'; }
elseif ($percentage > '75') { $background['left']='bf5d5b'; $background['right']='d39392'; }
elseif ($percentage > '50') { $background['left']='bf875b'; $background['right']='d3ae92'; }
elseif ($percentage > '25') { $background['left']='5b93bf'; $background['right']='92b7d3'; }
else { $background['left']='9abf5b'; $background['right']='bbd392'; }
return($background);
}
function generate_device_link($device, $text=0, $linksuffix="", $start=0, $end=0)
{
global $twoday, $day, $now, $config;
@@ -388,4 +401,4 @@ function getlocations()
return $locations;
}
?>
?>
html/includes/graphs/mempool/usage.inc.php
+15 -13
View File
@@ -8,21 +8,23 @@ $iter = "1";
$rrd_options .= " COMMENT:' Used\\n'";
if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; }
elseif ($iter=="7") { $colour="FF0084"; unset($iter); }
$colour="CC0000";
$colour_area="ffaaaa";
$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 24),0,24);
$descr = str_replace(":", "\:", $descr);
$rrd_options .= " DEF:mempoolfree=$rrd_filename:free:AVERAGE ";
$rrd_options .= " DEF:mempoolused=$rrd_filename:used:AVERAGE ";
$rrd_options .= " CDEF:mempooltotal=mempoolused,mempoolfree,+ ";
$rrd_options .= " CDEF:mempoolperc=mempoolused,mempoolused,mempoolfree,+,/,100,* ";
$rrd_options .= " LINE1:mempoolperc#" . $colour . ":'" . $descr . "' ";
$rrd_options .= " GPRINT:mempoolused:LAST:%6.2lf%sB";
#$rrd_options .= " GPRINT:mempooltotal:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:mempoolperc:LAST:%3.0lf%%\\\\n";
#$rrd_options .= " GPRINT:mempoolperc:MAX:%3.0lf";
$perc = round($mempool['mempool_perc'], 0);
$background = get_percentage_colours($perc);
?>
$rrd_options .= " DEF:$mempool[mempool_id]used=$rrd_filename:used:AVERAGE";
$rrd_options .= " DEF:$mempool[mempool_id]free=$rrd_filename:free:AVERAGE";
$rrd_options .= " CDEF:$mempool[mempool_id]size=$mempool[mempool_id]used,$mempool[mempool_id]free,+";
$rrd_options .= " CDEF:$mempool[mempool_id]perc=$mempool[mempool_id]used,$mempool[mempool_id]size,/,100,*";
$rrd_options .= " AREA:$mempool[mempool_id]perc#" . $background['right'] . ":";
$rrd_options .= " LINE1.25:$mempool[mempool_id]perc#" . $background['left'] . ":'$descr'";
$rrd_options .= " GPRINT:$mempool[mempool_id]size:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$mempool[mempool_id]free:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$mempool[mempool_id]perc:LAST:%5.2lf%%\\\\n";
?>
html/includes/graphs/storage/usage.inc.php
+9 -6
View File
@@ -13,21 +13,24 @@ $rrd_options .= " COMMENT:' Size Free % Used\\n'";
$hostname = gethostbyid($storage['device_id']);
if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; }
elseif ($iter=="7") { $colour="FF0084"; $iter = "0"; }
$colour="CC0000";
$colour_area="ffaaaa";
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$percentage = round($storage['storage_perc'], 0);
$background = get_percentage_colours($percentage);
$rrd_options .= " DEF:$storage[storage_id]used=$rrd_filename:used:AVERAGE";
$rrd_options .= " DEF:$storage[storage_id]free=$rrd_filename:free:AVERAGE";
$rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";
$rrd_options .= " CDEF:$storage[storage_id]perc=$storage[storage_id]used,$storage[storage_id]size,/,100,*";
$rrd_options .= " LINE1.25:$storage[storage_id]perc#" . $colour . ":'$descr'";
$rrd_options .= " AREA:$storage[storage_id]perc#" . $background['right'] . ":";
$rrd_options .= " LINE1.25:$storage[storage_id]perc#" . $background['left'] . ":'$descr'";
$rrd_options .= " GPRINT:$storage[storage_id]size:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$storage[storage_id]free:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$storage[storage_id]perc:LAST:%5.2lf%%\\\\n";
$iter++;
?>
?>