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

106
includes/polling/graphs.inc.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage poller
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @copyright (C) Adam Armstrong
*
*/
@ -17,65 +17,67 @@ include("includes/include-dir-mib.inc.php");
// Merge in mib definitions with $table_defs
foreach (get_device_mibs_permitted($device) as $mib) {
// Detect sensors by definitions
if (isset($config['mibs'][$mib]['graphs']) && is_array($config['mibs'][$mib]['graphs'])) {
if (isset($table_defs[$mib])) {
$table_defs[$mib] = array_merge($table_defs[$mib], $config['mibs'][$mib]['graphs']);
} else {
$table_defs[$mib] = $config['mibs'][$mib]['graphs'];
// Detect sensors by definitions
if (isset($config['mibs'][$mib]['graphs']) && is_array($config['mibs'][$mib]['graphs'])) {
if (isset($table_defs[$mib])) {
$table_defs[$mib] = array_merge($table_defs[$mib], $config['mibs'][$mib]['graphs']);
} else {
$table_defs[$mib] = $config['mibs'][$mib]['graphs'];
}
}
}
}
$check_vrfs = (safe_empty($device['snmp_context']) && // Device not already with context
isset($config['os'][$device['os']]['snmp']['virtual']) && $config['os'][$device['os']]['snmp']['virtual'] && // Context permitted for os
$vrf_contexts = safe_json_decode(get_entity_attrib('device', $device, 'vrf_contexts')));
// FIXME. Polling graphs in VRF disabled, while troubles for polling time on Cisco IOSXR (CISCO-AAA-SESSION-MIB)
// NOTE. Need mib definition key for allow polling in vrf (per mib)
// NOTE 2. I do not found MIB where really used polling graphs in VRF.
//$vrf_contexts = get_device_vrf_contexts($device); // SNMP VRF context discovered for device
$vrf_contexts = FALSE;
foreach ($table_defs as $mib => $mib_tables) {
print_cli_data_field("$mib", 2);
foreach ($mib_tables as $table_name => $table_def) {
// Compat with old table format
if (!isset($table_def['mib'])) {
$table_def['mib'] = $mib;
}
// Polling NG (with tables and indexed)
$graphs_ng = FALSE && is_numeric($table_name); // WiP
if ($graphs_ng) {
// WIP.
echo("NEW GRAPHS polling ");
collect_table_ng($device, $table_def, $graphs);
} else {
// CLEANME. remove after migrating to collect_table_ng()
echo("$table_name ");
collect_table($device, $table_def, $graphs);
}
// Poll same in vrfs if possible
if ($check_vrfs) {
// Keep original device array
$device_original = $device;
foreach ($vrf_contexts as $vrf_name => $snmp_virtual) {
echo("[Virtual Routing $vrf_name] ");
$device = snmp_virtual_device($device_original, $snmp_virtual);
//$device['snmp_context'] = $snmp_context;
if ($graphs_ng) {
echo("NEW GRAPHS polling ");
collect_table_ng($device, $table_def, $graphs);
} else {
// CLEANME. remove after migrating to collect_table_ng()
collect_table($device, $table_def, $graphs);
print_cli_data_field("$mib", 2);
foreach ($mib_tables as $table_name => $table_def) {
// Compat with old table format
if (!isset($table_def['mib'])) {
$table_def['mib'] = $mib;
}
}
// Clean
$device = $device_original;
unset($device_original);
// Polling NG (with tables and indexed)
$graphs_ng = FALSE && is_numeric($table_name); // WiP
if ($graphs_ng) {
// WIP.
echo("NEW GRAPHS polling ");
collect_table_ng($device, $table_def, $graphs);
} else {
// CLEANME. remove after migrating to collect_table_ng()
echo("$table_name ");
collect_table($device, $table_def, $graphs);
}
// Poll same in vrfs if possible
if ($vrf_contexts) {
// Keep original device array
$device_original = $device;
foreach ($vrf_contexts as $vrf_name => $snmp_virtual) {
echo("[Virtual Routing $vrf_name] ");
$device = snmp_virtual_device($device_original, $snmp_virtual);
//$device['snmp_context'] = $snmp_context;
if ($graphs_ng) {
echo("NEW GRAPHS polling ");
collect_table_ng($device, $table_def, $graphs);
} else {
// CLEANME. remove after migrating to collect_table_ng()
collect_table($device, $table_def, $graphs);
}
}
// Clean
$device = $device_original;
unset($device_original);
}
}
}
echo PHP_EOL;
echo PHP_EOL;
}
// EOF