refactor: Tidy up sensor discovery (#5550)

* refactor: Tidy up sensor discovery

* more files

* removed uneeded files

* updated array check

* updates for linux/supermicro

* small changes

* Update linux.inc.php

* Add supermicro temps back to linux.inc.php

* No need for is_file on rfc1628.inc.php, it exists

* Revert rfc1628 change

* Fix whitespace...

* rebased

* fixed $valid data not being passed to new sensors() function
This commit is contained in:
Neil Lathwood
2017-02-03 12:39:38 +00:00
committed by Tony Murray
parent 008af4cea0
commit d4e8c54516
252 changed files with 6669 additions and 7323 deletions

View File

@@ -1,37 +1,35 @@
<?php
if ($device['os'] == 'datacom') {
echo 'Datacom';
echo 'Datacom';
$multiplier = 1;
$divisor = 100;
foreach ($datacom_oids as $index => $entry) {
if (is_numeric(str_replace('dBm', '', $entry['ddTransceiversRxPower']))) {
$oid = '.1.3.6.1.4.1.3709.3.5.201.1.28.1.1.4.' . $index;
$descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Rx Power';
/* Basic default values */
$limit_low = -30;
$warn_limit_low = -12.3;
$limit = 2.5;
$warn_limit = -3;
$current = $entry['ddTransceiversRxPower'];
$entPhysicalIndex = $index;
$entPhysicalIndex_measured = 'ports';
discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
}
$multiplier = 1;
$divisor = 100;
foreach ($pre_cache['datacom_oids'] as $index => $entry) {
if (is_numeric(str_replace('dBm', '', $entry['ddTransceiversRxPower']))) {
$oid = '.1.3.6.1.4.1.3709.3.5.201.1.28.1.1.4.' . $index;
$descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Rx Power';
/* Basic default values */
$limit_low = -30;
$warn_limit_low = -12.3;
$limit = 2.5;
$warn_limit = -3;
$current = $entry['ddTransceiversRxPower'];
$entPhysicalIndex = $index;
$entPhysicalIndex_measured = 'ports';
discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
}
if (is_numeric(str_replace('dBm', '', $entry['ddTransceiversTxPower']))) {
$oid = '.1.3.6.1.4.1.3709.3.5.201.1.28.1.1.5.' . $index;
$descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Tx Power';
/* Basic default values */
$limit_low = -30;
$warn_limit_low = -12.3;
$limit = 2.5;
$warn_limit = -3;
$current = $entry['ddTransceiversTxPower'];
$entPhysicalIndex = $index;
$entPhysicalIndex_measured = 'ports';
discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
}
if (is_numeric(str_replace('dBm', '', $entry['ddTransceiversTxPower']))) {
$oid = '.1.3.6.1.4.1.3709.3.5.201.1.28.1.1.5.' . $index;
$descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Tx Power';
/* Basic default values */
$limit_low = -30;
$warn_limit_low = -12.3;
$limit = 2.5;
$warn_limit = -3;
$current = $entry['ddTransceiversTxPower'];
$entPhysicalIndex = $index;
$entPhysicalIndex_measured = 'ports';
discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
}
}