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

Really allow dividing as well as multiplying

Browse Source
This commit is contained in:
Paul Gear
2015-07-11 18:15:15 +10:00
parent 249707e2c6
commit 51ff0df11b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/generic_simplex.inc.php
+2 -2
View File
@@ -19,7 +19,7 @@ if ($multiplier)
$rrd_options .= " DEF:".$ds."_max_o=".$rrd_filename.":".$ds.":MAX";
$rrd_options .= " DEF:".$ds."_min_o=".$rrd_filename.":".$ds.":MIN";
if (!isset($multiplier_action)) {
if (empty($multiplier_action)) {
$multiplier_action = "*";
}
$rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,$multiplier_action";
@@ -48,7 +48,7 @@ if($_GET['previous'] == "yes")
$rrd_options .= " DEF:".$ds."_max_oX=".$rrd_filename.":".$ds.":MAX:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$ds."_oX:$period";
$rrd_options .= " SHIFT:".$ds."_max_oX:$period";
if (!isset($multiplier_action)) {
if (empty($multiplier_action)) {
$multiplier_action = "*";
}
$rrd_options .= " CDEF:".$ds."X=".$ds."_oX,$multiplier,$multiplier_action";
html/includes/graphs/old_generic_simplex.inc.php
+7 -1
View File
@@ -10,8 +10,11 @@ $line_text = str_pad(truncate($line_text,12,''),12);
if ($multiplier)
{
if (empty($multiplier_action)) {
$multiplier_action = "*";
}
$rrd_options .= " DEF:".$ds."_o=".$rrd_filename.":".$ds.":AVERAGE";
$rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,*";
$rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,$multiplier_action";
} else {
$rrd_options .= " DEF:".$ds."=".$rrd_filename.":".$ds.":AVERAGE";
}
@@ -29,6 +32,9 @@ if($_GET['previous'] == "yes")
{
if ($multiplier)
{
if (empty($multiplier_action)) {
$multiplier_action = "*";
}
$rrd_options .= " DEF:".$ds."_oX=".$rrd_filename.":".$ds.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$ds."_oX:$period";
$rrd_options .= " CDEF:".$ds."X=".$ds."_oX,$multiplier,*";