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

Packetbeat, mysql proto, trim SQLs captured from app running #5572

Merged
merged 3 commits into from
Jan 5, 2018

Conversation

timesking
Copy link
Contributor

Packetbeat
Mysql proto

add \r to trim SQLs captured from app running on Windows server. Otherwise method extracted including \r, which is problem. e.g. "SELECT\r\n\t1".

@elasticmachine
Copy link
Collaborator

Can one of the admins verify this patch?

@karmi
Copy link

karmi commented Nov 14, 2017

Hi @timesking, we have found your signature in our records, but it seems like you have signed with a different e-mail than the one used in yout Git commit. Can you please add both of these e-mails into your Github profile (they can be hidden), so we can match your e-mails to your Github profile?

@timesking
Copy link
Contributor Author

@karmi I added that email now.

@ruflin
Copy link
Contributor

ruflin commented Nov 14, 2017

@timesking Thanks for the contribution. It would be great to have some tests to verify this change.

@timesking
Copy link
Contributor Author

@ruflin I saw mysql_test.go including some pcap binary data. Do you mean add a test in that file, also use pcap as input data?

@ruflin
Copy link
Contributor

ruflin commented Nov 14, 2017

@timesking Whatever works best. But I think @urso is probably better to comment here.

@urso
Copy link

urso commented Nov 14, 2017

Change looks reasonable.

Please add a system test to packetbeat/tests/system.

Also add a changelog entry to Changelog.asciidoc

@timesking
Copy link
Contributor Author

@urso Sure, I will learn how to add that python test case.

@timesking
Copy link
Contributor Author

timesking commented Nov 17, 2017

@urso All passed except that triavis-ci.
It seems not about my commit.

No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

@ruflin
Copy link
Contributor

ruflin commented Nov 23, 2017

jenkins, test it

@urso
Copy link

urso commented Nov 23, 2017

@timesking The tests are fine. I checked failures and non are related to your PR.

can you also add a Changelog entry (to Changelog.asciidoc) about fixing newlines on windows? Also rebase before doing so, so not to have merge conflicts on the changelog file.

@timesking timesking force-pushed the sql_from_windows branch 2 times, most recently from b84d3f1 to 5be5c95 Compare November 27, 2017 15:10
@timesking
Copy link
Contributor Author

@urso the changeslog has been added, and all changes rebased on master

@ruflin
Copy link
Contributor

ruflin commented Jan 4, 2018

@timesking I can't see the changelog entry. Did it get lost during rebasing? Can you rebase on master again?

@timesking
Copy link
Contributor Author

@ruflin Sorry for that, I rebased again, fixed missing changelog

@urso urso merged commit 61c5420 into elastic:master Jan 5, 2018
@urso
Copy link

urso commented Jan 5, 2018

Merged. Thanks for contributing the fix!

@monicasarbu monicasarbu changed the title Packetbeat, mysql proto, add \r to trim SQLs captured from app runnin… Packetbeat, mysql proto, trim SQLs captured from app running Jan 8, 2018
@elasticmachine
Copy link
Collaborator

Can one of the admins verify this patch?

adriansr pushed a commit to adriansr/beats that referenced this pull request Apr 6, 2018
elastic#5572)

* Packetbeat, mysql proto, add \r to trim SQLs captured from app running on Windows server. Otherwise method extracted including \r, which is problem. e.g. "SELECT\r\n\t1"

* Packetbeat, test case for windows lineending

* Packetbeat, changelog for windows lineending
andrewkroh pushed a commit that referenced this pull request Apr 6, 2018
#5572)

* Packetbeat, mysql proto, add \r to trim SQLs captured from app running on Windows server. Otherwise method extracted including \r, which is problem. e.g. "SELECT\r\n\t1"

* Packetbeat, test case for windows lineending

* Packetbeat, changelog for windows lineending
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