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

sensors sometime not clean up (#10611)

Browse Source 
* do not discover dbm sensors on shutdown ports

* rename confusing name from $sensor_type to $sensor_class

* Revert "do not discover dbm sensors on shutdown ports"

This reverts commit 46963f746a.
This commit is contained in:
Vitali Kari
2019-09-18 14:29:58 +02:00
committed by Tony Murray
parent ccfd32457a
commit 87d3fc7285
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1159,9 +1159,9 @@ function dynamic_discovery_get_value($name, $index, $discovery_data, $pre_cache,
*/
function sensors($types, $device, $valid, $pre_cache = array())
{
foreach ((array)$types as $sensor_type) {
echo ucfirst($sensor_type) . ': ';
$dir = Config::get('install_dir') . '/includes/discovery/sensors/' . $sensor_type .'/';
foreach ((array)$types as $sensor_class) {
echo ucfirst($sensor_class) . ': ';
$dir = Config::get('install_dir') . '/includes/discovery/sensors/' . $sensor_class .'/';
if (is_file($dir . $device['os_group'] . '.inc.php')) {
include $dir . $device['os_group'] . '.inc.php';
@@ -1174,9 +1174,9 @@ function sensors($types, $device, $valid, $pre_cache = array())
include $dir . '/rfc1628.inc.php';
}
}
discovery_process($valid, $device, $sensor_type, $pre_cache);
d_echo($valid['sensor'][$sensor_type]);
check_valid_sensors($device, $sensor_type, $valid['sensor']);
discovery_process($valid, $device, $sensor_class, $pre_cache);
d_echo($valid['sensor'][$sensor_class]);
check_valid_sensors($device, $sensor_class, $valid['sensor']);
echo "\n";
}
}