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,9 +5,9 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @package observium
* @subpackage discovery
* @copyright (C) Adam Armstrong
*
*/
@ -30,84 +30,77 @@ foreach ($cache_discovery['DKSF-60-4-X-X-X']['pwr'] as $index => $entry)
}
*/
$cache_discovery['DKSF-60-4-X-X-X']['loop'] = snmpwalk_cache_oid($device, 'npCurLoopTable', array(), 'DKSF-60-4-X-X-X');
foreach ($cache_discovery['DKSF-60-4-X-X-X']['loop'] as $index => $entry)
{
if ($entry['npCurLoopPower'] == 'off' || $entry['npCurLoopStatus'] == 'notPowered') { continue; }
$cache_discovery['DKSF-60-4-X-X-X']['loop'] = snmpwalk_cache_oid($device, 'npCurLoopTable', [], 'DKSF-60-4-X-X-X');
foreach ($cache_discovery['DKSF-60-4-X-X-X']['loop'] as $index => $entry) {
if ($entry['npCurLoopPower'] == 'off' || $entry['npCurLoopStatus'] == 'notPowered') {
continue;
}
$descr = 'Analog Smoke '.$index;
$descr = 'Analog Smoke ' . $index;
// Loop state
$oid = '.1.3.6.1.4.1.25728.8300.1.1.2.'.$index;
$value = $entry['npCurLoopStatus'];
// Loop state
$oid = '.1.3.6.1.4.1.25728.8300.1.1.2.' . $index;
$value = $entry['npCurLoopStatus'];
if ($value)
{
discover_status($device, $oid, 'npCurLoopStatus.'.$index, 'dskf-mib-loop-state', $descr, $value, array('entPhysicalClass' => 'other'));
}
if ($value) {
discover_status($device, $oid, 'npCurLoopStatus.' . $index, 'dskf-mib-loop-state', $descr, $value, ['entPhysicalClass' => 'other']);
}
// Loop current
$oid = '.1.3.6.1.4.1.25728.8300.1.1.3.'.$index;
$value = $entry['npCurLoopI'];
// Loop current
$oid = '.1.3.6.1.4.1.25728.8300.1.1.3.' . $index;
$value = $entry['npCurLoopI'];
if ($value)
{
discover_sensor('current', $device, $oid, 'npCurLoopI.'.$index, 'dskf-mib-loop', $descr, 0.001, $value);
}
if ($value) {
discover_sensor('current', $device, $oid, 'npCurLoopI.' . $index, 'dskf-mib-loop', $descr, 0.001, $value);
}
// Loop voltage
$oid = '.1.3.6.1.4.1.25728.8300.1.1.4.'.$index;
$value = $entry['npCurLoopV'];
// Loop voltage
$oid = '.1.3.6.1.4.1.25728.8300.1.1.4.' . $index;
$value = $entry['npCurLoopV'];
if ($value)
{
discover_sensor('voltage', $device, $oid, 'npCurLoopV.'.$index, 'dskf-mib-loop', $descr, 0.001, $value);
}
if ($value) {
discover_sensor('voltage', $device, $oid, 'npCurLoopV.' . $index, 'dskf-mib-loop', $descr, 0.001, $value);
}
// Loop resistance
$oid = '.1.3.6.1.4.1.25728.8300.1.1.5.'.$index;
$value = $entry['npCurLoopR'];
// Loop resistance
$oid = '.1.3.6.1.4.1.25728.8300.1.1.5.' . $index;
$value = $entry['npCurLoopR'];
if ($value && $value < 99999)
{
discover_sensor('resistance', $device, $oid, 'npCurLoopR.'.$index, 'dskf-mib-loop', $descr, 1, $value);
}
if ($value && $value < 99999) {
discover_sensor('resistance', $device, $oid, 'npCurLoopR.' . $index, 'dskf-mib-loop', $descr, 1, $value);
}
}
//DKSF-60-4-X-X-X::npRelHumSensorValueH.0 = INTEGER: 0
//DKSF-60-4-X-X-X::npRelHumSensorStatus.0 = INTEGER: ok(1)
//DKSF-60-4-X-X-X::npRelHumSensorValueT.0 = INTEGER: 0
$cache_discovery['DKSF-60-4-X-X-X']['temphum'] = snmpwalk_cache_oid($device, 'npRelHumSensorValueH', array(), 'DKSF-60-4-X-X-X');
$cache_discovery['DKSF-60-4-X-X-X']['temphum'] = snmpwalk_cache_oid($device, 'npRelHumSensorValueH', [], 'DKSF-60-4-X-X-X');
$cache_discovery['DKSF-60-4-X-X-X']['temphum'] = snmpwalk_cache_oid($device, 'npRelHumSensorValueT', $cache_discovery['DKSF-60-4-X-X-X']['temphum'], 'DKSF-60-4-X-X-X');
$cache_discovery['DKSF-60-4-X-X-X']['temphum'] = snmpwalk_cache_oid($device, 'npRelHumSensorStatus', $cache_discovery['DKSF-60-4-X-X-X']['temphum'], 'DKSF-60-4-X-X-X');
foreach ($cache_discovery['DKSF-60-4-X-X-X']['temphum'] as $index => $entry)
{
// Temperature
$descr = 'Temperature '.$index;
foreach ($cache_discovery['DKSF-60-4-X-X-X']['temphum'] as $index => $entry) {
// Temperature
$descr = 'Temperature ' . $index;
$value = $entry['npRelHumSensorValueT'];
if ($value)
{
$oid = '.1.3.6.1.4.1.25728.8400.2.4.'.$index;
discover_sensor('temperature', $device, $oid, "npRelHumSensorValueT.$index", 'dskf-mib', $descr, 1, $value);
}
$value = $entry['npRelHumSensorValueT'];
if ($value) {
$oid = '.1.3.6.1.4.1.25728.8400.2.4.' . $index;
discover_sensor('temperature', $device, $oid, "npRelHumSensorValueT.$index", 'dskf-mib', $descr, 1, $value);
}
// Humidity
$descr = 'Humidity '.$index;
// Humidity
$descr = 'Humidity ' . $index;
$value = $entry['npRelHumSensorValueH'];
if ($value)
{
$oid = '.1.3.6.1.4.1.25728.8400.2.2.'.$index;
discover_sensor('humidity', $device, $oid, "npRelHumSensorValueH.$index", 'dskf-mib', $descr, 1, $value);
}
$value = $entry['npRelHumSensorStatus'];
if ($value)
{
$oid = '.1.3.6.1.4.1.25728.8400.2.3.'.$index;
discover_status($device, $oid, 'npRelHumSensorStatus.'.$index, 'dskf-mib-hum-state', $descr, $value, array('entPhysicalClass' => 'humidity'));
}
$value = $entry['npRelHumSensorValueH'];
if ($value) {
$oid = '.1.3.6.1.4.1.25728.8400.2.2.' . $index;
discover_sensor('humidity', $device, $oid, "npRelHumSensorValueH.$index", 'dskf-mib', $descr, 1, $value);
}
$value = $entry['npRelHumSensorStatus'];
if ($value) {
$oid = '.1.3.6.1.4.1.25728.8400.2.3.' . $index;
discover_status($device, $oid, 'npRelHumSensorStatus.' . $index, 'dskf-mib-hum-state', $descr, $value, ['entPhysicalClass' => 'humidity']);
}
}
/* Moved to DEF
@ -127,18 +120,19 @@ foreach ($cache_discovery['DKSF-60-4-X-X-X']['thermo'] as $index => $entry)
}
*/
$cache_discovery['DKSF-60-4-X-X-X']['io'] = snmpwalk_cache_oid($device, 'npIoTable', array(), 'DKSF-60-4-X-X-X');
foreach ($cache_discovery['DKSF-60-4-X-X-X']['io'] as $index => $entry)
{
if ($entry['npIoLevelIn'] == '0') { continue; }
$cache_discovery['DKSF-60-4-X-X-X']['io'] = snmpwalk_cache_oid($device, 'npIoTable', [], 'DKSF-60-4-X-X-X');
foreach ($cache_discovery['DKSF-60-4-X-X-X']['io'] as $index => $entry) {
if ($entry['npIoLevelIn'] == '0') {
continue;
}
$descr = ($entry['npIoMemo'] ? $entry['npIoMemo'] : 'Pulse Counter '.$index);
$descr .= ' (' . $entry['npIoSinglePulseDuration'] . 'ms)';
$oid_name = 'npIoPulseCounter';
$value = $entry['npIoPulseCounter'];
$oid = '.1.3.6.1.4.1.25728.8900.1.1.9.'.$index;
//discover_sensor('counter', $device, $oid, "npIoPulseCounter.$index", 'dskf-mib', $descr, 1, $value);
discover_counter($device, 'counter', $mib, $oid_name, $oid, $index, $descr, 1, $value);
$descr = ($entry['npIoMemo'] ? $entry['npIoMemo'] : 'Pulse Counter ' . $index);
$descr .= ' (' . $entry['npIoSinglePulseDuration'] . 'ms)';
$oid_name = 'npIoPulseCounter';
$value = $entry['npIoPulseCounter'];
$oid = '.1.3.6.1.4.1.25728.8900.1.1.9.' . $index;
//discover_sensor('counter', $device, $oid, "npIoPulseCounter.$index", 'dskf-mib', $descr, 1, $value);
discover_counter($device, 'counter', $mib, $oid_name, $oid, $index, $descr, 1, $value);
}
print_debug_vars($cache_discovery['DKSF-60-4-X-X-X']);