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

Fixed socket scanning for tcp6 #4442

Merged
merged 4 commits into from
Jun 8, 2017

Conversation

tomaszrichert
Copy link
Contributor

Fixed issue with /proc/net/tcp6 not being scanned due to simple bug

@elasticmachine
Copy link
Collaborator

Can one of the admins verify this patch?

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically on build-eu-00. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@exekias
Copy link
Contributor

exekias commented Jun 2, 2017

LGTM @tomaszrichert, can you add a bugfix line to CHANGELOG.asciidoc file?

jenkins test it please

@exekias
Copy link
Contributor

exekias commented Jun 2, 2017

BTW, thank you so much for taking the time to research and fix this! 💯

@tomaszrichert
Copy link
Contributor Author

Fixed 2 bugs:

  • enabled scanning of /proc/net/tcp6
  • fixed parsing ip v6

@exekias exekias added bug in progress Pull request is currently in progress. Packetbeat labels Jun 2, 2017
@tomaszrichert
Copy link
Contributor Author

Updated changelog.
ps: Is there a release roadmap somewhere ?

@exekias
Copy link
Contributor

exekias commented Jun 2, 2017

We don't publish roadmaps, but as soon as this is merged it should make it to the next release

@exekias
Copy link
Contributor

exekias commented Jun 2, 2017

jenkins test it

@tsg tsg added needs_backport PR is waiting to be backported to other branches. v5.5.0 labels Jun 2, 2017
Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

LGTM, but would be nice to add a test case for this to prevent a regression.

@exekias exekias merged commit 1426260 into elastic:master Jun 8, 2017
exekias added a commit to exekias/beats that referenced this pull request Jun 8, 2017
@exekias exekias removed in progress Pull request is currently in progress. needs_backport PR is waiting to be backported to other branches. labels Jun 8, 2017
exekias pushed a commit to exekias/beats that referenced this pull request Jun 9, 2017
* Fixed socket scanning for tcp6

* Fixed ip6 parsing
(cherry picked from commit 1426260)
tsg pushed a commit that referenced this pull request Jun 9, 2017
* Fixed socket scanning for tcp6

* Fixed ip6 parsing
(cherry picked from commit 1426260)
andrewkroh pushed a commit that referenced this pull request Jun 12, 2017
* Add tests for latest ipv6 related fixes

Add tests for #4442

* Fix error message

We don't really know what file we are reading from, as it could be
`/proc/net/tcp` or `/proc/net/tcp6`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants