newdevice: Added extrahop detection #6097

Merged
merged 4 commits into from Mar 6, 2017

Conversation

Projects
None yet
5 participants
@geordish
Contributor

geordish commented Mar 5, 2017

Fix for #6080

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

  • Have you signed the Contributors agreement - please do NOT submit a pull request unless you have (signing the agreement in the same pull request is fine). Your commit message for signing the agreement must appear as per the docs.
  • Have you followed our code guidelines?

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Mar 5, 2017

Thank you for submitting a PR @geordish! We have found the following @crcro, @laf and @murrant based on the history of these files to review this PR.

Thank you for submitting a PR @geordish! We have found the following @crcro, @laf and @murrant based on the history of these files to review this PR.

@geordish geordish referenced this pull request Mar 5, 2017

Closed

Add Extrahop Appliance as a Supported Device. #6080

2 of 2 tasks complete
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment

@laf laf changed the title from Initial extrahop detection to newdevice: Added extrahop detection Mar 5, 2017

includes/discovery/os/linux.inc.php
@@ -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) {

This comment has been minimized.

@laf

laf Mar 5, 2017

Member

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')

@laf

laf Mar 5, 2017

Member

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
+ * the source code distribution for details.
+ */
+
+$version = snmp_get($device, 'EXTRAHOP-MIB::extrahopInfoVersionString', '-Oqv');

This comment has been minimized.

@laf

laf Mar 5, 2017

Member

snmp_get($device, 'extrahopInfoVersionString', '-Oqv', 'EXTRAHOP-MIB')

@laf

laf Mar 5, 2017

Member

snmp_get($device, 'extrahopInfoVersionString', '-Oqv', 'EXTRAHOP-MIB')

@laf

Can you move the MIB info mibs/extrahop

The html/images/os/extrahop.svg has part transparent background part white.

@geordish

This comment has been minimized.

Show comment
Hide comment
@geordish

geordish Mar 5, 2017

Contributor

Don't think I can easily move the MIB, or the discovery doesn't work :(

Contributor

geordish commented Mar 5, 2017

Don't think I can easily move the MIB, or the discovery doesn't work :(

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Mar 6, 2017

Member

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).

Member

laf commented Mar 6, 2017

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).

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier Mar 6, 2017

The inspection completed: 1 updated code elements

The inspection completed: 1 updated code elements

@laf laf merged commit 2a211e8 into librenms:master Mar 6, 2017

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@geordish geordish deleted the geordish:issue-6080 branch Mar 6, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment