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

Fix: nginx module can't handle multiline entries #14499

Merged
merged 3 commits into from
Nov 14, 2019

Conversation

mtojek
Copy link
Contributor

@mtojek mtojek commented Nov 13, 2019

This PR adds missing config definition for multiline log entries.

Seen in #14349, where the setup includes nginx and PHP-FPM.

@mtojek mtojek requested a review from a team as a code owner November 13, 2019 11:18
@ChrsMark ChrsMark added Team:Integrations Label for the Integrations team Filebeat Filebeat labels Nov 13, 2019
@mtojek mtojek force-pushed the 14349-nginx-multiline-entries branch from 79243e3 to f7cb7d1 Compare November 13, 2019 11:22
@exekias exekias added review needs_backport PR is waiting to be backported to other branches. v7.6.0 labels Nov 13, 2019
@mtojek mtojek force-pushed the 14349-nginx-multiline-entries branch from f7cb7d1 to 6b31262 Compare November 13, 2019 11:44
Copy link
Contributor

@exekias exekias left a comment

Choose a reason for hiding this comment

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

This is looking great! Could you please add a new test file under nginx/error/test folder? You should then be able to generate the expected files with

GENERATE=1 INTEGRATION_TESTS=1 BEAT_STRICT_PERMS=false TESTING_FILEBEAT_MODULES=nginx nosetests tests/system/test_modules.py

Also please update CHANGELOG.next.asciidoc

@mtojek
Copy link
Contributor Author

mtojek commented Nov 13, 2019

Thank you @exekias for your hints.

I've updated the PR with an adjusted ingest pipeline, corresponding test case and CHANGELOG.

@mtojek
Copy link
Contributor Author

mtojek commented Nov 14, 2019

jenkins, test this again

@mtojek mtojek force-pushed the 14349-nginx-multiline-entries branch from 38192f8 to 6374e64 Compare November 14, 2019 08:57
@exekias
Copy link
Contributor

exekias commented Nov 14, 2019

This will need backport to 7.x, please use the dev-tools/cherrypick_pr tool to open it, as it will take care of labels for you

@mtojek mtojek merged commit 72f2bf9 into elastic:master Nov 14, 2019
mtojek pushed a commit to mtojek/beats that referenced this pull request Nov 14, 2019
* Fix: nginx module can't handle multiline entries

* Update ingest pipeline and test case

* Update next CHANGELOG

(cherry picked from commit 72f2bf9)
mtojek added a commit that referenced this pull request Nov 14, 2019
* Fix: nginx module can't handle multiline entries

* Update ingest pipeline and test case

* Update next CHANGELOG

(cherry picked from commit 72f2bf9)
@mtojek mtojek removed the needs_backport PR is waiting to be backported to other branches. label Nov 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Filebeat Filebeat review Team:Integrations Label for the Integrations team v7.6.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants