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

55
includes/discovery/oids.inc.php
View File

@ -5,53 +5,48 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage poller
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @package observium
* @subpackage poller
* @copyright (C) Adam Armstrong
*
*/
$table_rows = array();
$table_rows = [];
$sql = "SELECT *";
$sql = "SELECT *";
$sql .= " FROM `oids_entries`";
$sql .= " LEFT JOIN `oids` USING(`oid_id`)";
$sql .= " WHERE `device_id` = ?";
//print_vars($sql);
$entries_db = dbFetchRows($sql, array($device['device_id']));
$entries_db = dbFetchRows($sql, [$device['device_id']]);
foreach($entries_db as $entry_db)
{
$entries[$entry_db['oid_id']] = $entry_db['oid_entry_id'];
foreach ($entries_db as $entry_db) {
$entries[$entry_db['oid_id']] = $entry_db['oid_entry_id'];
}
$oids_db = dbFetchRows("SELECT * FROM `oids` WHERE `oid_autodiscover` = '1'");
// FIXME - removal and blacklisting
foreach($oids_db as $oid)
{
$value = snmp_get($device, $oid['oid'], "-OUQtnv");
if (is_numeric($value) && $value != '4294967295' && $value != '2147483647' && $value != '-2147483647') // Don't discover stuff which is returning min/max 32 bit values
{
if(!isset($entries[$oid['oid_id']]))
foreach ($oids_db as $oid) {
$value = snmp_get($device, $oid['oid'], "-OUQtnv");
if (is_numeric($value) && $value != '4294967295' && $value != '2147483647' && $value != '-2147483647') // Don't discover stuff which is returning min/max 32 bit values
{
// Auto-add this OID.
if ($oid_entry_id = dbInsert(array('oid_id' => $oid['oid_id'], 'device_id' => $device['device_id']), 'oids_entries'))
{
print_debug("SUCCESS: Added OID entry (id: $oid_entry_id)");
} else {
print_warning("ERROR: Unable to add OID entry for ".$oid['oid_name']);
}
}
} else {
if(isset($entries[$oid['oid_id']]))
{
// Mark this OID as deleted from the host.
dbUpdate(array('deleted' => '1'), 'oids_entries', '`oid_entry_id` = ?', array($oid['oid_entry_id']));
}
if (!isset($entries[$oid['oid_id']])) {
// Auto-add this OID.
if ($oid_entry_id = dbInsert(['oid_id' => $oid['oid_id'], 'device_id' => $device['device_id']], 'oids_entries')) {
print_debug("SUCCESS: Added OID entry (id: $oid_entry_id)");
} else {
print_warning("ERROR: Unable to add OID entry for " . $oid['oid_name']);
}
}
} else {
if (isset($entries[$oid['oid_id']])) {
// Mark this OID as deleted from the host.
dbUpdate(['deleted' => '1'], 'oids_entries', '`oid_entry_id` = ?', [$oid['oid_entry_id']]);
}
}
}
}