New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add F5 Hardware and S/N detection #5797

Merged
merged 4 commits into from Feb 6, 2017

Conversation

Projects
None yet
6 participants
@geordish
Contributor

geordish commented Feb 6, 2017

Fix for #5793 5793

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?
@mention-bot

This comment has been minimized.

mention-bot commented Feb 6, 2017

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

@geordish geordish referenced this pull request Feb 6, 2017

Closed

F5 Platform/Model not being discovered. #5793

1 of 1 task complete
@LibreNMS-CI

This comment has been minimized.

LibreNMS-CI commented Feb 6, 2017

Auto-Deploy finished, Test PR at http://5797.ci.librenms.org or https://5797.ci.librenms.org

@@ -1,2 +1,4 @@
<?php
$version = trim(snmp_get($device, '.1.3.6.1.4.1.3375.2.1.4.2.0', '-OQv', '', ''), '"');
$version = trim(snmp_get($device, '.1.3.6.1.4.1.3375.2.1.4.2.0', '-OQv'), '"');
$hardware = snmp_get($device, '.1.3.6.1.4.1.3375.2.1.3.5.2.0', '-OQv');

This comment has been minimized.

@murrant

murrant Feb 6, 2017

Member

You will need to trim quotes from these as well.

The other way around that is to use the MIB aka
F5-BIGIP-SYSTEM-MIB::sysProductVersion.0
F5-BIGIP-SYSTEM-MIB::sysPlatformInfoMarketingName.0
F5-BIGIP-SYSTEM-MIB::sysGeneralChassisSerialNum.0

You could also combine them into one get request.

This comment has been minimized.

@geordish

geordish Feb 6, 2017

Contributor

Which would you prefer?

@LibreNMS-CI

This comment has been minimized.

LibreNMS-CI commented Feb 6, 2017

Auto-Deploy finished, Test PR at http://5797.ci.librenms.org or https://5797.ci.librenms.org

@LibreNMS-CI

This comment has been minimized.

LibreNMS-CI commented Feb 6, 2017

Auto-Deploy finished, Test PR at http://5797.ci.librenms.org or https://5797.ci.librenms.org

@geordish

This comment has been minimized.

Contributor

geordish commented on b47bf5f Feb 6, 2017

I'm an idiot!

@scrutinizer-notifier

This comment has been minimized.

scrutinizer-notifier commented Feb 6, 2017

The inspection completed: No new issues

@laf laf merged commit a98bfdb into librenms:master Feb 6, 2017

2 checks passed

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

This comment has been minimized.

Member

murrant commented Feb 6, 2017

No worries man, we all make mistakes, especially when you are trying to quick fix something ;)

That is what review is for. Thanks for the PR!

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