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

fix: Dell N1548 CPU graphs #8280

Merged
merged 2 commits into from Feb 22, 2018

Conversation

Projects
None yet
3 participants
@asteen-nexcess
Copy link
Contributor

asteen-nexcess commented Feb 21, 2018

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.

Testers

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

@@ -62,6 +62,9 @@ public function discoverProcessors()
} elseif (starts_with($device['sysObjectID'], '.1.3.6.1.4.1.674.10895.3024')) {
d_echo("Dell Powerconnect 8024F");
return $this->discoverVxworksProcessors('.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0');
} elseif (starts_with($device['sysObjectID'], '.1.3.6.1.4.1.674.10895.3065')) {

This comment has been minimized.

@laf

laf Feb 22, 2018

Member

starts_with accepts an array as the second arg so seeing as you are just returning the same as the one above then remove the new elseif and change the one above to:

} elseif (starts_with($device['sysObjectID'], ['.1.3.6.1.4.1.674.10895.3024', '.1.3.6.1.4.1.674.10895.3065'])) {

Give that a try and update the PR.

This comment has been minimized.

@asteen-nexcess

asteen-nexcess Feb 22, 2018

Author Contributor

@laf thanks! Updated.

@scrutinizer-notifier

This comment has been minimized.

Copy link

scrutinizer-notifier commented Feb 22, 2018

The inspection completed: No new issues

@laf

laf approved these changes Feb 22, 2018

@laf laf merged commit 445e70c into librenms:master Feb 22, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

wiad pushed a commit to wiad/librenms that referenced this pull request Feb 23, 2018

fix: Dell N1548 CPU graphs (librenms#8280)
* fixed Dell N1548 CPU graphs

* Cleaned up code: merged 8024F and N1548 sysObjectID into single line

inetAnt added a commit to criteo-forks/librenms that referenced this pull request Mar 19, 2018

fix: Dell N1548 CPU graphs (librenms#8280)
* fixed Dell N1548 CPU graphs

* Cleaned up code: merged 8024F and N1548 sysObjectID into single line
@lock

This comment has been minimized.

Copy link

lock bot commented May 16, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

@lock lock bot locked as resolved and limited conversation to collaborators May 16, 2018

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