mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not discover dbm sensors on shutdown ports

Browse Source
This commit is contained in:
Vitali Kari
2019-09-17 20:31:10 +02:00
parent ccfd32457a
commit 46963f746a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
includes/discovery/sensors/dbm/raisecom.inc.php
View File

@@ -9,8 +9,8 @@ foreach ($pre_cache['raisecomOpticalTransceiverDDMTable'] as $index => $data) {
if (($key == 'txPower') && is_numeric($value['raisecomOpticalTransceiverParameterValue']) && ($value['raisecomOpticalTransceiverDDMValidStatus'] == 1)) { if (($key == 'txPower') && is_numeric($value['raisecomOpticalTransceiverParameterValue']) && ($value['raisecomOpticalTransceiverDDMValidStatus'] == 1)) {
$oid = '.1.3.6.1.4.1.8886.1.18.2.2.1.1.2.'.$index.'.3'; $oid = '.1.3.6.1.4.1.8886.1.18.2.2.1.1.2.'.$index.'.3';
$sensor_type = 'raisecomOpticalTransceiverTxPower'; $sensor_type = 'raisecomOpticalTransceiverTxPower';
$port_descr = get_port_by_index_cache($device['device_id'], str_replace('1.', '', $index)); $port = get_port_by_index_cache($device['device_id'], str_replace('1.', '', $index));
$descr = $port_descr['ifDescr'] . ' Transmit Power'; $descr = $port['ifDescr'] . ' Transmit Power';
$low_limit = $value['raisecomOpticalTransceiverParamLowAlarmThresh'] / $divisor; $low_limit = $value['raisecomOpticalTransceiverParamLowAlarmThresh'] / $divisor;
$low_warn_limit = $value['raisecomOpticalTransceiverParamLowWarningThresh'] / $divisor; $low_warn_limit = $value['raisecomOpticalTransceiverParamLowWarningThresh'] / $divisor;
$warn_limit = $value['raisecomOpticalTransceiverParamHighWarningThresh'] / $divisor; $warn_limit = $value['raisecomOpticalTransceiverParamHighWarningThresh'] / $divisor;
@@ -18,13 +18,15 @@ foreach ($pre_cache['raisecomOpticalTransceiverDDMTable'] as $index => $data) {
$current = $value['raisecomOpticalTransceiverParameterValue'] / $divisor; $current = $value['raisecomOpticalTransceiverParameterValue'] / $divisor;
$entPhysicalIndex = $index; $entPhysicalIndex = $index;
$entPhysicalIndex_measured = 'ports'; $entPhysicalIndex_measured = 'ports';
discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-'.$index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); if ($port['ifAdminStatus'] == 'up') {
discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-'.$index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
}
} }
if (($key == 'rxPower') && is_numeric($value['raisecomOpticalTransceiverParameterValue']) && ($value['raisecomOpticalTransceiverDDMValidStatus'] != 0)) { if (($key == 'rxPower') && is_numeric($value['raisecomOpticalTransceiverParameterValue']) && ($value['raisecomOpticalTransceiverDDMValidStatus'] != 0)) {
$oid = '.1.3.6.1.4.1.8886.1.18.2.2.1.1.2.'.$index.'.4'; $oid = '.1.3.6.1.4.1.8886.1.18.2.2.1.1.2.'.$index.'.4';
$sensor_type = 'raisecomOpticalTransceiverRxPower'; $sensor_type = 'raisecomOpticalTransceiverRxPower';
$port_descr = get_port_by_index_cache($device['device_id'], str_replace('1.', '', $index)); $port = get_port_by_index_cache($device['device_id'], str_replace('1.', '', $index));
$descr = $port_descr['ifDescr'] . ' Receive Power'; $descr = $port['ifDescr'] . ' Receive Power';
$low_limit = $value['raisecomOpticalTransceiverParamLowAlarmThresh'] / $divisor; $low_limit = $value['raisecomOpticalTransceiverParamLowAlarmThresh'] / $divisor;
$low_warn_limit = $value['raisecomOpticalTransceiverParamLowWarningThresh'] / $divisor; $low_warn_limit = $value['raisecomOpticalTransceiverParamLowWarningThresh'] / $divisor;
$warn_limit = $value['raisecomOpticalTransceiverParamHighWarningThresh'] / $divisor; $warn_limit = $value['raisecomOpticalTransceiverParamHighWarningThresh'] / $divisor;
@@ -32,7 +34,9 @@ foreach ($pre_cache['raisecomOpticalTransceiverDDMTable'] as $index => $data) {
$current = $value['raisecomOpticalTransceiverParameterValue'] / $divisor; $current = $value['raisecomOpticalTransceiverParameterValue'] / $divisor;
$entPhysicalIndex = $index; $entPhysicalIndex = $index;
$entPhysicalIndex_measured = 'ports'; $entPhysicalIndex_measured = 'ports';
discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-'.$index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); if ($port['ifAdminStatus'] == 'up') {
discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-'.$index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
}
} }
} }
} }