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

Merge pull request #3823 from laf/device-type-discovery

Browse Source
This commit is contained in:
Søren Rosiak
2016-07-21 22:14:00 +02:00
committed by GitHub
parent e9bce1d322 0ec980c1cd
commit 5ca2eab0dc
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,6 +103,13 @@ function discover_device($device, $options = null) {
} }
} }
// Set type to a predefined type for the OS if it's not already set
if ($device['type'] == 'unknown' || $device['type'] == '') {
if ($config['os'][$device['os']]['type']) {
$device['type'] = $config['os'][$device['os']]['type'];
}
}
if ($config['os'][$device['os']]['group']) { if ($config['os'][$device['os']]['group']) {
$device['os_group'] = $config['os'][$device['os']]['group']; $device['os_group'] = $config['os'][$device['os']]['group'];
echo ' (' . $device['os_group'] . ')'; echo ' (' . $device['os_group'] . ')';
@@ -142,13 +149,6 @@ function discover_device($device, $options = null) {
register_mibs($device, $devicemib, "includes/discovery/functions.inc.php"); register_mibs($device, $devicemib, "includes/discovery/functions.inc.php");
} }
// Set type to a predefined type for the OS if it's not already set
if ($device['type'] == 'unknown' || $device['type'] == '') {
if ($config['os'][$device['os']]['type']) {
$device['type'] = $config['os'][$device['os']]['type'];
}
}
$device_end = microtime(true); $device_end = microtime(true);
$device_run = ($device_end - $device_start); $device_run = ($device_end - $device_start);
$device_time = substr($device_run, 0, 5); $device_time = substr($device_run, 0, 5);