newdevice: Added extrahop detection #6097
Conversation
|
Auto-Deploy finished, Test PR at http://6097.ci.librenms.org or https://6097.ci.librenms.org |
includes/discovery/os/linux.inc.php
Outdated
| @@ -12,6 +12,8 @@ | |||
| } elseif (snmp_get($device, 'fwVersion.1', '-Osqnv', 'UBNT-AirFIBER-MIB', 'ubnt') !== false) { | |||
| $os = 'airos-af'; | |||
| } | |||
| } elseif (snmp_get($device, 'EXTRAHOP-MIB::extrahopInfoVersionString', '-Osqnv') !== false) { | |||
There was a problem hiding this comment.
I know the other gets are like this but can you shift the EXTRAHOP-MIB to the end of the function:
snmp_get($device, 'extrahopInfoVersionString', '-Osqnv', 'EXTRAHOP-MIB')
includes/polling/os/extrahop.inc.php
Outdated
| * the source code distribution for details. | ||
| */ | ||
|
|
||
| $version = snmp_get($device, 'EXTRAHOP-MIB::extrahopInfoVersionString', '-Oqv'); |
There was a problem hiding this comment.
snmp_get($device, 'extrahopInfoVersionString', '-Oqv', 'EXTRAHOP-MIB')
|
Don't think I can easily move the MIB, or the discovery doesn't work :( |
|
Auto-Deploy finished, Test PR at http://6097.ci.librenms.org or https://6097.ci.librenms.org |
|
Auto-Deploy finished, Test PR at http://6097.ci.librenms.org or https://6097.ci.librenms.org |
|
For the MIB dir, you just need to specify the dir to look in for OS detection using the extra param in snmp_get() (any other detection will be fine as it will know the OS and therefore look in the correct dir). |
|
Auto-Deploy finished, Test PR at http://6097.ci.librenms.org or https://6097.ci.librenms.org |
|
The inspection completed: 1 updated code elements |
Fix for #6080
DO NOT DELETE THIS TEXT
Please note
Testers
If you would like to test this pull request then please run:
./scripts/github-apply <pr_id>, i.e./scripts/github-apply 5926