Skip to content
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

netstat: return nothing when /proc/net/snmp6 not found #718

Merged
merged 1 commit into from
Oct 31, 2017

Conversation

mdlayher
Copy link
Contributor

Fixes #717.

The return map is ranged over, but since it's nil, nothing will happen: https://play.golang.org/p/Sft1zxlRA5.

Copy link
Member

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@juliusv juliusv merged commit f6556e6 into master Oct 31, 2017
@juliusv juliusv deleted the mdl-netstat-ipv6 branch October 31, 2017 21:01
@mdlayher
Copy link
Contributor Author

mdlayher commented Nov 6, 2017

Hi, can you please move this to #717? Pull requests aren't great for issue tracking. Thanks.

@SuperQ SuperQ mentioned this pull request Nov 7, 2017
@SuperQ SuperQ mentioned this pull request Nov 7, 2017
SuperQ added a commit that referenced this pull request Nov 7, 2017
* [BUGFIX] netstat: return nothing when /proc/net/snmp6 not found #718
* [BUGFIX] Fix off by one in Linux interrupts collector #721
* [BUGFIX] Add and use sysReadFile in hwmon collector #728
SuperQ added a commit that referenced this pull request Nov 8, 2017
* netstat: return nothing when /proc/net/snmp6 not found

* Fix off by one in Linux interrupts collector (#721)

* Fix off by one in Linux interrupts collector

* Fix off by one in CPU column handler.
* Add test.

* Enable interrupts in end-to-end test.

* Add and use sysReadFile in hwmon collector (#728)

* xfs: expose correct fields, fix metric names

* Correct buffer_bytes > INT_MAX on BSD/amd64. (#712)

* Correct buffer_bytes > INT_MAX on BSD/amd64.

The sysctl vfs.bufspace returns either an int or a long, depending on
the value.  Large values of vfs.bufspace will result in error messages
like:

  couldn't get meminfo: cannot allocate memory

This will detect the returned data type, and cast appropriately.

* Added explicit length checks per feedback.

* Flatten Value() to make it easier to read.

* Simplify per feedback.

* Fix style.

* Doc updates.

* Release v0.15.1

* [BUGFIX] netstat: return nothing when /proc/net/snmp6 not found #718
* [BUGFIX] Fix off by one in Linux interrupts collector #721
* [BUGFIX] Add and use sysReadFile in hwmon collector #728
othatbrian pushed a commit to othatbrian/node_exporter that referenced this pull request Feb 6, 2018
* [BUGFIX] netstat: return nothing when /proc/net/snmp6 not found prometheus#718
* [BUGFIX] Fix off by one in Linux interrupts collector prometheus#721
* [BUGFIX] Add and use sysReadFile in hwmon collector prometheus#728
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants