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: Check for ifHCInOctets and ifHighSpeed before falling back to if… #6777

Merged
merged 2 commits into from Jun 10, 2017

Conversation

Projects
None yet
5 participants
@laf
Member

laf commented Jun 3, 2017

…Entry

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

Fixes: #6372

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Jun 3, 2017

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

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

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@murrant

This comment has been minimized.

Show comment
Hide comment
Member

murrant commented Jun 5, 2017

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Jun 5, 2017

Member

Anything specific from that issue? This won't fix the issue you see there though.

Member

laf commented Jun 5, 2017

Anything specific from that issue? This won't fix the issue you see there though.

@murrant

This comment has been minimized.

Show comment
Hide comment
@murrant

murrant Jun 6, 2017

Member

It seems like it will. Sorry, the title is misleading on that issue.

Basically, the device doesn't have ifHighSpeed, but ifSpeed was never walked by LibreNMS.

Member

murrant commented Jun 6, 2017

It seems like it will. Sorry, the title is misleading on that issue.

Basically, the device doesn't have ifHighSpeed, but ifSpeed was never walked by LibreNMS.

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Jun 6, 2017

Member

So this fixes if we don't have both ifHSpeed and ifHCInOctets so if that's the case then yes it will.

Member

laf commented Jun 6, 2017

So this fixes if we don't have both ifHSpeed and ifHCInOctets so if that's the case then yes it will.

Show outdated Hide outdated includes/polling/ports.inc.php
@@ -199,7 +199,8 @@
$port_stats = snmpwalk_cache_oid($device, 'ifXEntry', $port_stats, 'IF-MIB');
}
$hc_test = array_slice($port_stats, 0, 1);
if (!isset($hc_test[0]['ifHCInOctets']) && !is_numeric($hc_test[0]['ifHCInOctets'])) {
if ((!isset($hc_test[0]['ifHCInOctets']) && !is_numeric($hc_test[0]['ifHCInOctets'])) &&

This comment has been minimized.

@murrant

murrant Jun 9, 2017

Member

Are you sure you don't want || here? When you use or, it fixes devices missing ifHighSpeed...

@murrant

murrant Jun 9, 2017

Member

Are you sure you don't want || here? When you use or, it fixes devices missing ifHighSpeed...

This comment has been minimized.

@laf

laf Jun 9, 2017

Member

We can switch to ||.

@laf

laf Jun 9, 2017

Member

We can switch to ||.

This comment has been minimized.

@laf

laf Jun 9, 2017

Member

Pushed

@laf

laf Jun 9, 2017

Member

Pushed

@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 Jun 9, 2017

The inspection completed: No new issues

The inspection completed: No new issues

@murrant murrant merged commit 3bf7e20 into librenms:master Jun 10, 2017

3 checks passed

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

@laf laf deleted the laf:fix/issue-6372 branch Jun 10, 2017

@sorano sorano referenced this pull request Jun 13, 2017

Closed

Fix incorrect graphing on 3650 / 3850 since #6372 #6825

1 of 1 task complete
@lock

This comment has been minimized.

Show comment
Hide comment
@lock

lock bot May 17, 2018

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

lock bot commented May 17, 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 17, 2018

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