Commit version 24.12.13800

This commit is contained in:
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions

View File

@ -5,91 +5,109 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage graphs
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @package observium
* @subpackage graphs
* @copyright (C) Adam Armstrong
*
*/
include_once($config['html_dir']."/includes/graphs/common.inc.php");
include_once($config['html_dir'] . "/includes/graphs/common.inc.php");
// Here we scale the number of numerical columns shown to make sure we keep the text.
if($width > "400") {
$data_len = "33";
$data_show = array('lst', 'avg', 'min', 'max');
} elseif($width > "300") {
$data_len = "24";
$data_show = array('lst', 'avg', 'max');
if ($width > "400") {
$data_len = "33";
$data_show = ['lst', 'avg', 'min', 'max'];
} elseif ($width > "300") {
$data_len = "24";
$data_show = ['lst', 'avg', 'max'];
} else {
$data_len = "16";
$data_show = array('lst', 'avg');
$data_len = "16";
$data_show = ['lst', 'avg'];
}
// Here we scale the length of the description to make sure we keep the numbers
if($width > "800")
{
$descr_len = "82";
} elseif($width > "300") {
$descr_len = round(($width + 0) / 7) - $data_len;
if ($width > "800") {
$descr_len = "82";
} elseif ($width > "300") {
$descr_len = round(($width + 0) / 7) - $data_len;
} else {
$descr_len = round(($width + 16) / 6) - $data_len;
$descr_len = round(($width + 16) / 6) - $data_len;
}
// Build the legend headers using the length values previously calculated
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+2),0,$descr_len+2)."'";
if(in_array("lst", $data_show)) { $rrd_options .= " COMMENT:' Last '"; }
if(in_array("min", $data_show)) { $rrd_options .= " COMMENT:' Min '"; }
if(in_array("max", $data_show)) { $rrd_options .= " COMMENT:' Max '"; }
if(in_array("avg", $data_show)) { $rrd_options .= " COMMENT:' Avg '"; }
$rrd_options .= " COMMENT:'" . substr(str_pad($unit_text, $descr_len + 2), 0, $descr_len + 2) . "'";
if (in_array("lst", $data_show)) {
$rrd_options .= " COMMENT:' Last '";
}
if (in_array("min", $data_show)) {
$rrd_options .= " COMMENT:' Min '";
}
if (in_array("max", $data_show)) {
$rrd_options .= " COMMENT:' Max '";
}
if (in_array("avg", $data_show)) {
$rrd_options .= " COMMENT:' Avg '";
}
$rrd_options .= " COMMENT:'\\l'";
$iter = 0;
$iter = 0;
foreach ($rrd_list as $i => $rrd)
{
if (!$config['graph_colours'][$colours][$iter]) { $iter = 0; }
$colour=$config['graph_colours'][$colours][$iter];
foreach ($rrd_list as $i => $rrd) {
if (!$config['graph_colours'][$colours][$iter]) {
$iter = 0;
}
$colour = $config['graph_colours'][$colours][$iter];
$ds = $rrd['ds'];
$filename = rrdtool_escape($rrd['filename']);
$ds = $rrd['ds'];
$filename = rrdtool_escape($rrd['filename']);
$descr = rrdtool_escape($rrd['descr'], $descr_len);
$descr = rrdtool_escape($rrd['descr'], $descr_len);
$id = "ds".$i;
$id = "ds" . $i;
$rrd_options .= " DEF:".$id."=$filename:$ds:AVERAGE";
$rrd_options .= " DEF:" . $id . "=$filename:$ds:AVERAGE";
if ($simple_rrd)
{
$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";
$rrd_options .= " CDEF:".$id."mmin=".$id."min,60,*";
$rrd_options .= " CDEF:".$id."mmax=".$id."max,60,*";
}
if ($simple_rrd) {
$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";
$rrd_options .= " CDEF:" . $id . "mmin=" . $id . "min,60,*";
$rrd_options .= " CDEF:" . $id . "mmax=" . $id . "max,60,*";
}
if ($rrd['invert'])
{
$rrd_options .= " CDEF:".$id."i=".$id.",-1,*";
$rrd_optionsb .= " LINE1.25:".$id."i#".$colour.":'$descr'";
if (!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."i#" . $rrd['areacolour']; }
} else {
$rrd_options .= " CDEF:".$id."m=".$id.",60,*";
$rrd_optionsb .= " LINE1.25:".$id."m#".$colour.":'$descr'";
if (!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."#" . $rrd['areacolour']; }
}
if ($rrd['invert']) {
$rrd_options .= " CDEF:" . $id . "i=" . $id . ",-1,*";
$rrd_optionsb .= " LINE1.25:" . $id . "i#" . $colour . ":'$descr'";
if (!empty($rrd['areacolour'])) {
$rrd_optionsb .= " AREA:" . $id . "i#" . $rrd['areacolour'];
}
} else {
$rrd_options .= " CDEF:" . $id . "m=" . $id . ",60,*";
$rrd_optionsb .= " LINE1.25:" . $id . "m#" . $colour . ":'$descr'";
if (!empty($rrd['areacolour'])) {
$rrd_optionsb .= " AREA:" . $id . "#" . $rrd['areacolour'];
}
}
if (in_array("lst", $data_show)) { $rrd_optionsb .= " GPRINT:".$id."m:LAST:%6.1lf%s"; }
if (in_array("min", $data_show)) { $rrd_optionsb .= " GPRINT:".$id."mmin:MIN:%6.1lf%s"; }
if (in_array("max", $data_show)) { $rrd_optionsb .= " GPRINT:".$id."mmax:MAX:%6.1lf%s"; }
if (in_array("avg", $data_show)) { $rrd_optionsb .= " GPRINT:".$id."m:AVERAGE:%6.1lf%s"; }
if (in_array("lst", $data_show)) {
$rrd_optionsb .= " GPRINT:" . $id . "m:LAST:%6.1lf%s";
}
if (in_array("min", $data_show)) {
$rrd_optionsb .= " GPRINT:" . $id . "mmin:MIN:%6.1lf%s";
}
if (in_array("max", $data_show)) {
$rrd_optionsb .= " GPRINT:" . $id . "mmax:MAX:%6.1lf%s";
}
if (in_array("avg", $data_show)) {
$rrd_optionsb .= " GPRINT:" . $id . "m:AVERAGE:%6.1lf%s";
}
$rrd_optionsb .= " COMMENT:'\\l'";
$iter++;
$rrd_optionsb .= " COMMENT:'\\l'";
$iter++;
}