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: discovery.php -h all stops working after ping only device (#7593)

Browse Source 
* Temporary array per device in discovery.

* Return at the beginning of discover_device() if snmp_disable.
This commit is contained in:
Zmegolaz
2017-10-31 14:26:25 +01:00
committed by Tony Murray
parent 82ac4f59a4
commit e74b1c3e51
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,6 +110,10 @@ function load_discovery(&$device)
function discover_device(&$device, $options = null)
{
if ($device['snmp_disable'] == '1') {
return;
}
global $valid;
$valid = array();
@@ -145,19 +149,15 @@ function discover_device(&$device, $options = null)
echo "\n";
$force_module = false;
if ($device['snmp_disable'] != '1') {
// If we've specified modules, use them, else walk the modules array
if ($options['m']) {
Config::set('discovery_modules', array());
foreach (explode(',', $options['m']) as $module) {
if (is_file("includes/discovery/$module.inc.php")) {
Config::set("discovery_modules.$module", 1);
$force_module = true;
}
// If we've specified modules, use them, else walk the modules array
if ($options['m']) {
Config::set('discovery_modules', array());
foreach (explode(',', $options['m']) as $module) {
if (is_file("includes/discovery/$module.inc.php")) {
Config::set("discovery_modules.$module", 1);
$force_module = true;
}
}
} else {
Config::set('discovery_modules', array());
}
foreach (Config::get('discovery_modules', array()) as $module => $module_status) {
$os_module_status = Config::getOsSetting($device['os'], "discovery_modules.$module");