WebApps/Observium_CE
1
0
Fork 0
Code Pull Requests Activity

Commit version 24.12.13800

Browse Source
This commit is contained in:
Chris Hammer
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
html/includes/graphs/location/auth.inc.php
View File

@ -1,28 +1,27 @@
<?php
/**
* Observium
*
* 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
*
*/
// FIXME : bit hacky, I think.
if($vars['id'] == OBS_VAR_UNSET) { $vars['id'] = ''; }
if ($vars['id'] == OBS_VAR_UNSET) {
$vars['id'] = '';
}
foreach (dbFetchRows("SELECT * FROM `devices` WHERE `location` = ?", array($vars['id'])) as $device)
{
if ($auth || device_permitted($device_id))
{
foreach (dbFetchRows("SELECT * FROM `devices` WHERE `location` = ?", [$vars['id']]) as $device) {
if ($auth || device_permitted($device_id)) {
$devices[] = $device;
$title = $vars['id'];
$auth = TRUE;
//$title = $vars['id'];
$auth = TRUE;
}
}
?>
// EOF

78
html/includes/graphs/location/bits.inc.php
View File

@ -4,9 +4,9 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage graphs
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @package observium
* @subpackage graphs
* @copyright (C) Adam Armstrong
*
*/
@ -16,60 +16,60 @@ $ds_in = "INOCTETS";
$ds_out = "OUTOCTETS";
// init
$i = 0;
$rrd_list = [];
$i = 0;
$rrd_list = [];
$rrd_filenames = [];
foreach ($devices as $device) {
foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` != ?", [ $device['device_id'], 1 ]) as $port) {
foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` != ?", [$device['device_id'], 1]) as $port) {
if (is_array($config['device_traffic_iftype'])) {
foreach ($config['device_traffic_iftype'] as $iftype) {
if (preg_match($iftype ."i", $port['ifType'])) {
continue 2;
if (is_array($config['device_traffic_iftype'])) {
foreach ($config['device_traffic_iftype'] as $iftype) {
if (preg_match($iftype . "i", $port['ifType'])) {
continue 2;
}
}
}
}
}
if (!$config['os'][$device['os']]['ports_unignore_descr'] && is_array($config['device_traffic_descr'])) {
foreach ($config['device_traffic_descr'] as $ifdescr) {
if (preg_match($ifdescr."i", $port['ifDescr']) ||
preg_match($ifdescr."i", $port['ifName']) ||
preg_match($ifdescr."i", $port['port_label'])) {
continue 2;
if (!$config['os'][$device['os']]['ports_unignore_descr'] && is_array($config['device_traffic_descr'])) {
foreach ($config['device_traffic_descr'] as $ifdescr) {
if (preg_match($ifdescr . "i", $port['ifDescr']) ||
preg_match($ifdescr . "i", $port['ifName']) ||
preg_match($ifdescr . "i", $port['port_label'])) {
continue 2;
}
}
}
}
}
$rrdfile = get_port_rrdfilename($port, NULL, TRUE);
if (rrd_is_file($rrdfile)) {
$rrd_filenames[] = $rrdfile;
$rrd_list[$i]['filename'] = $rrdfile;
$rrd_list[$i]['descr'] = $port['port_label_short']; // Options sets for skip htmlentities
$rrd_list[$i]['descr_in'] = $device['hostname'];
$rrd_list[$i]['descr_out'] = $port['ifAlias'];
$rrd_list[$i]['ds_in'] = $ds_in;
$rrd_list[$i]['ds_out'] = $ds_out;
$i++;
}
$rrdfile = get_port_rrdfilename($port, NULL, TRUE);
if (rrd_is_file($rrdfile)) {
$rrd_filenames[] = $rrdfile;
$rrd_list[$i]['filename'] = $rrdfile;
$rrd_list[$i]['descr'] = $port['port_label_short']; // Options sets for skip htmlentities
$rrd_list[$i]['descr_in'] = $device['hostname'];
$rrd_list[$i]['descr_out'] = $port['ifAlias'];
$rrd_list[$i]['ds_in'] = $ds_in;
$rrd_list[$i]['ds_out'] = $ds_out;
$i++;
}
}
}
}
$units ='b';
$total_units ='B';
$colours_in ='greens';
$multiplier = "8";
$units = 'b';
$total_units = 'B';
$colours_in = 'greens';
$multiplier = "8";
$colours_out = 'blues';
$nototal = 1;
$graph_title .= "::bits";
$colour_line_in = "006600";
$colour_line_in = "006600";
$colour_line_out = "000099";
$colour_area_in = "CDEB8B";
$colour_area_in = "CDEB8B";
$colour_area_out = "C3D9FF";
include($config['html_dir']."/includes/graphs/generic_multi_bits_separated.inc.php");
include($config['html_dir'] . "/includes/graphs/generic_multi_bits_separated.inc.php");
// EOF