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

fix apache graph. allow custom colours passed to generic_multi_simplex_seperated

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2533 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-21 10:53:08 +00:00
parent 242c749330
commit 86c6a817ad
2 changed files with 41 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
html/includes/graphs/generic_multi_simplex_seperated.inc.php
View File

@@ -2,7 +2,6 @@
include("includes/graphs/common.inc.php");
$descrlen = "18";
$unitlen = "10";
if($nototal) { $descrlen += "2"; $unitlen += "2";}
@@ -15,11 +14,17 @@ $rrd_options .= " COMMENT:'\\n'";
$colour_iter=0;
foreach ($rrd_list as $i => $rrd)
{
if (!$config['graph_colours'][$colours][$colour_iter]) { $colour_iter = 0; }
$colour = $config['graph_colours'][$colours][$colour_iter];
$colour_iter++;
if($rrd['colour'])
{
$colour = $rrd['colour'];
} else {
if (!$config['graph_colours'][$colours][$colour_iter]) { $colour_iter = 0; }
$colour = $config['graph_colours'][$colours][$colour_iter];
$colour_iter++;
}
$rrd_options .= " DEF:".$rrd['rra'].$i."=".$rrd['filename'].":".$rrd['rra'].":AVERAGE ";
$rrd_options .= " DEF:".$rrd['rra'].$i."min=".$rrd['filename'].":".$rrd['rra'].":MIN ";
$rrd_options .= " DEF:".$rrd['rra'].$i."max=".$rrd['filename'].":".$rrd['rra'].":MAX ";
## Suppress totalling?