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 graphtypes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2615 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-30 13:09:14 +00:00
parent a33404311c
commit 34f2bb8da1
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
html/includes/graphs/device/nfsen_common.inc.php
View File

@ -1,6 +1,7 @@
<?php
include("includes/graphs/common.inc.php");
$device = device_by_id_cache($id);
$simple_rrd = TRUE;
if (!is_array($config['nfsen_rrds'])) { $config['nfsen_rrds'] = array($config['nfsen_rrds']); }

16
html/includes/graphs/generic_multi_line.inc.php
View File

@ -27,8 +27,11 @@ foreach ($rrd_list as $rrd)
$rrd_options .= " DEF:".$id."=$filename:$ds:AVERAGE";
if (!$basicrrd)
if ($simple_rrd || $basicrrd)
{
$rrd_options .= " CDEF:".$id."min=".$id." ";
$rrd_options .= " CDEF:".$id."max=".$id." ";
} else {
$rrd_options .= " DEF:".$id."min=$filename:$ds:MIN";
$rrd_options .= " DEF:".$id."max=$filename:$ds:MAX";
}
@ -45,14 +48,9 @@ foreach ($rrd_list as $rrd)
}
if (!$basicrrd)
{
$rrd_optionsb .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";
$rrd_optionsb .= " GPRINT:".$id."max:MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:'%5.2lf%s\\n'";
} else {
$rrd_optionsb .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id.":MIN:%5.2lf%s";
$rrd_optionsb .= " GPRINT:".$id.":MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:'%5.2lf%s\\n'";
}
$rrd_optionsb .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";
$rrd_optionsb .= " GPRINT:".$id."max:MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:'%5.2lf%s\\n'";
$i++; $iter++;
}

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

@ -24,7 +24,8 @@ foreach ($rrd_list as $i => $rrd)
}
$rrd_options .= " DEF:".$rrd['ds'].$i."=".$rrd['filename'].":".$rrd['ds'].":AVERAGE ";
if($simple_rrd)
if($simple_rrd || $basicrrd)
{
$rrd_options .= " CDEF:".$rrd['ds'].$i."min=".$rrd['ds'].$i." ";
$rrd_options .= " CDEF:".$rrd['ds'].$i."max=".$rrd['ds'].$i." ";