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

fix: Add extra check to Junos DOM discovery (#5582)

Browse Source
This commit is contained in:
Søren Rosiak
2017-01-25 21:41:56 +01:00
committed by Neil Lathwood
parent 599e1c4b25
commit 7bae2cf0a7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/sensors/current/junos.inc.php
View File

@@ -16,7 +16,7 @@ if ($device['os'] == 'junos' || $device['os_group'] == 'junos') {
$multiplier = 1;
$divisor = 1000000;
foreach ($junos_oids as $index => $entry) {
if (is_numeric($entry['jnxDomCurrentTxLaserBiasCurrent'])) {
if (is_numeric($entry['jnxDomCurrentTxLaserBiasCurrent']) && $entry['jnxDomCurrentTxLaserBiasCurrent'] != 0 && $entry['jnxDomCurrentTxLaserBiasCurrentLowAlarmThreshold'] != 0) {
$oid = '.1.3.6.1.4.1.2636.3.60.1.1.1.1.6.'.$index;
$descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Rx Current';
$limit_low = $entry['jnxDomCurrentTxLaserBiasCurrentLowAlarmThreshold']/$divisor;

4
includes/discovery/sensors/dbm/junos.inc.php
View File

@@ -16,7 +16,7 @@ if ($device['os'] == 'junos' || $device['os_group'] == 'junos') {
$multiplier = 1;
$divisor = 100;
foreach ($junos_oids as $index => $entry) {
if (is_numeric($entry['jnxDomCurrentRxLaserPower'])) {
if (is_numeric($entry['jnxDomCurrentRxLaserPower']) && $entry['jnxDomCurrentRxLaserPower'] != 0 && $entry['jnxDomCurrentTxLaserOutputPower'] != 0) {
$oid = '.1.3.6.1.4.1.2636.3.60.1.1.1.1.5.'.$index;
$descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Rx Power';
$limit_low = $entry['jnxDomCurrentRxLaserPowerLowAlarmThreshold']/$divisor;
@@ -29,7 +29,7 @@ if ($device['os'] == 'junos' || $device['os_group'] == 'junos') {
discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-'.$index, 'junos', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
}
if (is_numeric($entry['jnxDomCurrentTxLaserOutputPower'])) {
if (is_numeric($entry['jnxDomCurrentTxLaserOutputPower']) && $entry['jnxDomCurrentTxLaserOutputPower'] && $entry['jnxDomCurrentRxLaserPower']) {
$oid = '.1.3.6.1.4.1.2636.3.60.1.1.1.1.7.'.$index;
$descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Tx Power';
$limit_low = $entry['jnxDomCurrentTxLaserOutputPowerLowAlarmThreshold']/$divisor;

2
includes/discovery/sensors/temperatures/junos.inc.php
View File

@@ -28,7 +28,7 @@ if ($device['os'] == 'junos' || $device['os_group'] == 'junos') {
$multiplier = 1;
$divisor = 1;
foreach ($junos_oids as $index => $entry) {
if (is_numeric($entry['jnxDomCurrentModuleTemperature'])) {
if (is_numeric($entry['jnxDomCurrentModuleTemperature']) && $entry['jnxDomCurrentModuleTemperature'] != 0 && $entry['jnxDomCurrentModuleTemperatureLowAlarmThreshold']) {
$oid = '.1.3.6.1.4.1.2636.3.60.1.1.1.1.8.'.$index;
$descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Temperature';
$limit_low = $entry['jnxDomCurrentModuleTemperatureLowAlarmThreshold']/$divisor;