clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 02:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix sensor type/class confusion (#11608)

Browse Source
This commit is contained in:
PipoCanaja 2020-05-15 04:06:50 +02:00 committed by GitHub
parent b573c9ef73
commit 1b05f435ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
includes/discovery/functions.inc.php
View File

@ -210,7 +210,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
if (!is_numeric($divisor)) {
$divisor = 1;
}
if (can_skip_sensor($device, $type, $descr)) {
if (can_skip_sensor($device, $class, $descr)) {
return false;
}
@ -990,18 +990,18 @@ function ignore_storage($os, $descr)
* @param $sensor_type
* @param $pre_cache
*/
function discovery_process(&$valid, $device, $sensor_type, $pre_cache)
function discovery_process(&$valid, $device, $sensor_class, $pre_cache)
{
if ($device['dynamic_discovery']['modules']['sensors'][$sensor_type] && ! can_skip_sensor($device, $sensor_type, '')) {
if ($device['dynamic_discovery']['modules']['sensors'][$sensor_class] && ! can_skip_sensor($device, $sensor_class, '')) {
$sensor_options = array();
if (isset($device['dynamic_discovery']['modules']['sensors'][$sensor_type]['options'])) {
$sensor_options = $device['dynamic_discovery']['modules']['sensors'][$sensor_type]['options'];
if (isset($device['dynamic_discovery']['modules']['sensors'][$sensor_class]['options'])) {
$sensor_options = $device['dynamic_discovery']['modules']['sensors'][$sensor_class]['options'];
}
d_echo("Dynamic Discovery ($sensor_type): ");
d_echo($device['dynamic_discovery']['modules']['sensors'][$sensor_type]);
d_echo("Dynamic Discovery ($sensor_class): ");
d_echo($device['dynamic_discovery']['modules']['sensors'][$sensor_class]);
foreach ($device['dynamic_discovery']['modules']['sensors'][$sensor_type]['data'] as $data) {
foreach ($device['dynamic_discovery']['modules']['sensors'][$sensor_class]['data'] as $data) {
$tmp_name = $data['oid'];
$raw_data = (array)$pre_cache[$tmp_name];
@ -1018,7 +1018,7 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache)
$snmp_value = $snmp_data[$data_name];
if (!is_numeric($snmp_value)) {
if ($sensor_type === 'temperature') {
if ($sensor_class === 'temperature') {
// For temp sensors, try and detect fahrenheit values
if (Str::endsWith($snmp_value, array('f', 'F'))) {
$user_function = 'fahrenheit_to_celsius';
@ -1032,7 +1032,7 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache)
if (is_numeric($snmp_value)) {
$value = $snmp_value;
} elseif ($sensor_type === 'state') {
} elseif ($sensor_class === 'state') {
// translate string states to values (poller does this as well)
$states = array_column($data['states'], 'value', 'descr');
$value = isset($states[$snmp_value]) ? $states[$snmp_value] : false;
@ -1076,7 +1076,7 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache)
$sensor_name = $device['os'];
if ($sensor_type === 'state') {
if ($sensor_class === 'state') {
$sensor_name = $data['state_name'] ?: $data['oid'];
create_state_index($sensor_name, $data['states']);
} else {
@ -1090,9 +1090,9 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache)
}
$uindex = str_replace('{{ $index }}', $index, isset($data['index']) ? $data['index'] : $index);
discover_sensor($valid['sensor'], $sensor_type, $device, $oid, $uindex, $sensor_name, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_function, $group);
discover_sensor($valid['sensor'], $sensor_class, $device, $oid, $uindex, $sensor_name, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_function, $group);
if ($sensor_type === 'state') {
if ($sensor_class === 'state') {
create_sensor_to_state_index($device, $sensor_name, $uindex);
}
}