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,25 +5,56 @@
*
* 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
*
*/
if (!is_array($vars['id'])) { $vars['id'] = array($vars['id']); }
$is_permitted = FALSE;
//r($vars);
// Populate $vars['id'] with group entities if we got a group
if (isset($vars['group_id'])) {
if ($group = get_group_by_id($vars['group_id'])) {
// Guard clause to bail if we've been given a non-sensor group.
if ($group['entity_type'] != "sensor") {
unset($vars['group_id']);
unset($vars['id']);
}
$auth = TRUE;
$vars['id'] = get_group_entities($group['group_id']);
$title_array[] = ['text' => 'Sensors Group'];
$title_array[] = ['text' => $group['group_name'], 'url' => generate_url(['page' => 'group', 'group_id' => $group['group_id']])];
}
} else {
if (!is_array($vars['id'])) {
$vars['id'] = [$vars['id']];
}
$title_array = [];
$title_array[] = ['text' => 'Multiple Sensors'];
foreach ($vars['id'] as $sensor_id)
{
if (!$auth && !is_sensor_permitted('sensor', $sensor_id))
$auth = FALSE;
}
$title = "Multi Sensor :: ";
if ($auth || $is_permitted || $_SESSION['userlevel'] >= 5) {
$auth = TRUE;
foreach ($vars['id'] as $sensor_id) {
if (is_numeric($sensor_id) && is_entity_permitted('sensor', $sensor_id)) {
$is_permitted = TRUE;
} else {
$is_permitted = FALSE;
// Bail on first reject.
break;
}
}
$title_array[] = ['text' => safe_count($vars['id']) . ' sensors'];
}
unset($is_permitted);
// EOF

View File

@ -4,44 +4,43 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage graphs
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2020 Observium Limited
* @package observium
* @subpackage graphs
* @copyright (C) Adam Armstrong
*
*/
$units = '';
$unit_text = 'Value';
$units = '';
$unit_text = 'Value';
$total_units = '';
$i = 1;
$rrd_list = array();
$rrd_list = [];
foreach ($vars['id'] as $port_id)
{
foreach ($vars['id'] as $port_id) {
$sensor = dbFetchRow("SELECT * FROM `sensors` WHERE `sensor_id` = ?", array($port_id));
$sensor = dbFetchRow("SELECT * FROM `sensors` WHERE `sensor_id` = ?", [$port_id]);
$device = device_by_id_cache($sensor['device_id']);
$device = device_by_id_cache($sensor['device_id']);
$rrd_filename = get_rrd_path($device, get_sensor_rrd($device, $sensor));
$rrd_filename = get_rrd_path($device, get_sensor_rrd($device, $sensor));
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = rewrite_entity_name($sensor['sensor_descr'], 'sensor');
$rrd_list[$i]['ds'] = 'sensor';
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = rewrite_entity_name($sensor['sensor_descr'], 'sensor');
$rrd_list[$i]['ds'] = 'sensor';
$i++;
$i++;
}
$colours='mixed';
$colours = 'mixed';
$scale_min = "0";
$nototal = 1;
$scale_min = "0";
$nototal = 1;
$simple_rrd = TRUE;
include($config['html_dir']."/includes/graphs/generic_multi_line.inc.php");
include($config['html_dir'] . "/includes/graphs/generic_multi_line.inc.php");
// EOF

View File

@ -5,45 +5,44 @@
*
* 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
*
*/
$units = '';
$unit_text = 'Value';
$units = '';
$unit_text = 'Value';
$total_units = '';
$i = 1;
$rrd_list = array();
$rrd_list = [];
foreach ($vars['id'] as $port_id)
{
foreach ($vars['id'] as $port_id) {
$sensor = dbFetchRow("SELECT * FROM `sensors` WHERE `sensor_id` = ?", array($port_id));
$sensor = dbFetchRow("SELECT * FROM `sensors` WHERE `sensor_id` = ?", [$port_id]);
$device = device_by_id_cache($sensor['device_id']);
$device = device_by_id_cache($sensor['device_id']);
$rrd_filename = get_rrd_path($device, get_sensor_rrd($device, $sensor));
$rrd_filename = get_rrd_path($device, get_sensor_rrd($device, $sensor));
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $sensor['sensor_descr'];
$rrd_list[$i]['ds'] = 'sensor';
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $sensor['sensor_descr'];
$rrd_list[$i]['ds'] = 'sensor';
$i++;
$i++;
}
$colours='mixed';
$colours = 'mixed';
$scale_min = "0";
$nototal = 1;
$scale_min = "0";
$nototal = 1;
$show_aggregate = TRUE;
$simple_rrd = FALSE;
$simple_rrd = FALSE;
include($config['html_dir']."/includes/graphs/generic_multi_simplex_separated.inc.php");
include($config['html_dir'] . "/includes/graphs/generic_multi_simplex_separated.inc.php");
// EOF