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

[7.x](backport #25710) Add multiline support to awss3 input #25740

Merged
merged 1 commit into from
May 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2021

This is an automatic backport of pull request #25710 done by Mergify.
Cherry-pick of 5f242e3 has failed:

On branch mergify/bp/7.x/pr-25710
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 5f242e3c3d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
	modified:   x-pack/filebeat/input/awss3/collector_test.go
	modified:   x-pack/filebeat/input/awss3/config.go
	new file:   x-pack/filebeat/input/awss3/ftest/sample2.txt
	modified:   x-pack/filebeat/input/awss3/s3_integration_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/awss3/collector.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 17, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 17, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 17, 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: Pull request #25740 updated

  • Start Time: 2021-05-18T15:56:11.020+0000

  • Duration: 111 min 49 sec

  • Commit: e4b5c1d

Test stats 🧪

Test Results
Failed 0
Passed 7002
Skipped 1193
Total 8195

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 7002
Skipped 1193
Total 8195

@leehinman leehinman force-pushed the mergify/bp/7.x/pr-25710 branch 2 times, most recently from e55ada8 to b601a2c Compare May 17, 2021 19:44
@mergify
Copy link
Contributor Author

mergify bot commented May 18, 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 mergify/bp/7.x/pr-25710 upstream/mergify/bp/7.x/pr-25710
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-25710

@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 18, 2021
@andrewkroh
Copy link
Member

@Mergifyio rebase

* Add multiline support to awss3 input

- only applies to non JSON logs

Closes #25249

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
(cherry picked from commit 5f242e3)
@cachedout cachedout force-pushed the mergify/bp/7.x/pr-25710 branch from b601a2c to e4b5c1d Compare May 18, 2021 15:55
@mergify
Copy link
Contributor Author

mergify bot commented May 18, 2021

Command rebase: success

Branch has been successfully rebased

@leehinman leehinman merged commit e2c06ff into 7.x May 18, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-25710 branch May 18, 2021 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants