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

@ -1,5 +1,4 @@
<?php
/**
* Observium
*
@ -7,7 +6,7 @@
*
* @package observium
* @subpackage graphs
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/
@ -17,39 +16,41 @@ $multiplier = 8;
//r($vars['data']);
foreach($vars['data'] as $entry)
{
$rrds = array();
foreach (get_group_entities($entry['group_id']) as $port)
{
$port = get_port_by_id_cache($port);
$device = device_by_id_cache($port['device_id']);
$filename = get_port_rrdfilename($port, NULL, TRUE);
foreach ($vars['data'] as $entry) {
$rrds = [];
foreach (get_group_entities($entry['group_id'], 'port') as $port_id) {
$port = get_port_by_id_cache($port_id);
$device = device_by_id_cache($port['device_id']);
$filename = get_port_rrdfilename($port, NULL, TRUE);
if (rrd_is_file($filename))
{
$rrds[] = array('file' => $filename,
'descr' => $device['hostname'] . " " . $port['port_label_short'],
'ds_in' => 'INOCTETS',
'ds_out' => 'OUTOCTETS');
if (rrd_is_file($filename)) {
$rrds[] = ['file' => $filename,
'descr' => $device['hostname'] . " " . $port['port_label_short'],
'ds_in' => 'INOCTETS',
'ds_out' => 'OUTOCTETS'];
}
}
}
if (safe_count($rrds))
{
$this_data = array('rrds' => $rrds,
'colour_in' => $entry['colour'],
'colour_out' => adjust_colour_brightness($entry['colour'], 32),
'descr' => $entry['descr']);
if (safe_count($rrds)) {
$this_data = ['rrds' => $rrds,
'colour_in' => $entry['colour'],
'colour_out' => adjust_colour_brightness($entry['colour'], 32),
'descr' => $entry['descr']];
if($entry['colours']) { $this_data['colours'] = $entry['colours']; }
if($entry['colours_in']) { $this_data['colours_in'] = $entry['colours_in']; }
if($entry['colours_out']) { $this_data['colours_out'] = $entry['colours_out']; }
if ($entry['colours']) {
$this_data['colours'] = $entry['colours'];
}
if ($entry['colours_in']) {
$this_data['colours_in'] = $entry['colours_in'];
}
if ($entry['colours_out']) {
$this_data['colours_out'] = $entry['colours_out'];
}
$data[] = $this_data;
$data[] = $this_data;
}
}
}
include($config['html_dir']."/includes/graphs/generic_multi_group_bits.inc.php");
include($config['html_dir'] . "/includes/graphs/generic_multi_group_bits.inc.php");