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

Cherry-pick #25482 to 7.x: [Filebeat] Additional parsing for haproxy.http.request.raw_request_line #25496

Merged
merged 2 commits into from
May 3, 2021

Conversation

legoguy1000
Copy link
Contributor

Cherry-pick of PR #25482 to 7.x branch. Original message:

What does this PR do?

Parses the haproxy.http.request.raw_request_line field into url.original,http.request.method,http.version

Why is it important?

Allows for better correlation between other logs.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

cd beats/filebeat
TESTING_FILEBEAT_MODULES=haproxy mage -v pythonIntegTest

Related issues

Use cases

Screenshots

Logs

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 3, 2021
@botelastic
Copy link

botelastic bot commented May 3, 2021

This pull request doesn't have a Team:<team> label.

@mergify
Copy link
Contributor

mergify bot commented May 3, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b backport_25482_7.x upstream/backport_25482_7.x
git merge upstream/7.x
git push upstream backport_25482_7.x

@legoguy1000
Copy link
Contributor Author

@P1llus I think i used the chery_pick_pr script properly.

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 3, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: P1llus commented: run tests

  • Start Time: 2021-05-03T14:27:13.420+0000

  • Duration: 116 min 45 sec

  • Commit: 04b40fb

Test stats 🧪

Test Results
Failed 0
Passed 13676
Skipped 2299
Total 15975

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 13676
Skipped 2299
Total 15975

@P1llus
Copy link
Member

P1llus commented May 3, 2021

run tests

@P1llus
Copy link
Member

P1llus commented May 3, 2021

From what I can see, everything went just fine @legoguy1000 :) Once the CI passes I will merge it directly, as CP's don't require another review.

@P1llus P1llus merged commit 8d792d1 into elastic:7.x May 3, 2021
@legoguy1000 legoguy1000 deleted the backport_25482_7.x branch May 4, 2021 11:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants