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

SnmpQuery fix mib directory order (#14580)

Browse Source
This commit is contained in:
Tony Murray
2022-11-04 23:12:56 -05:00
committed by GitHub
parent 1f1efa55f2
commit 35bea945ba
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
LibreNMS/Data/Source/NetSnmpQuery.php
View File

@@ -420,13 +420,6 @@ class NetSnmpQuery implements SnmpQueryInterface
$base = Config::get('mib_dir');
$dirs = [$base];
// os directory
if ($os_mibdir = Config::get("os.{$this->device->os}.mib_dir")) {
$dirs[] = "$base/$os_mibdir";
} elseif (file_exists($base . '/' . $this->device->os)) {
$dirs[] = $base . '/' . $this->device->os;
}
// os group
if ($os_group = Config::get("os.{$this->device->os}.group")) {
if (file_exists("$base/$os_group")) {
@@ -434,6 +427,13 @@ class NetSnmpQuery implements SnmpQueryInterface
}
}
// os directory
if ($os_mibdir = Config::get("os.{$this->device->os}.mib_dir")) {
$dirs[] = "$base/$os_mibdir";
} elseif (file_exists($base . '/' . $this->device->os)) {
$dirs[] = $base . '/' . $this->device->os;
}
if ($this->mibDir) {
$dirs[] = "$base/$this->mibDir";
}