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.17](backport #32767) allow for json/ndjson content type with charset #32834

Merged
merged 2 commits into from
Aug 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2022

This is an automatic backport of pull request #32767 done by Mergify.
Cherry-pick of b40349c has failed:

On branch mergify/bp/7.17/pr-32767
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit b40349ce5a.
  (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/input/awss3/s3_objects.go

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

* allow for json/ndjson content type with charset

* add '; charset=UTF-8' in integration tests

* changelog

* assessing CI

* revert correct behaviour

(cherry picked from commit b40349c)

# Conflicts:
#	x-pack/filebeat/input/awss3/input_integration_test.go
@mergify mergify bot requested a review from a team as a code owner August 25, 2022 06:09
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 25, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 25, 2022
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 25, 2022

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-08-25T06:39:49.986+0000

  • Duration: 120 min 27 sec

Test stats 🧪

Test Results
Failed 0
Passed 5569
Skipped 461
Total 6030

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@aspacca aspacca added the Team:Cloud-Monitoring Label for the Cloud Monitoring team label Aug 25, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 25, 2022
@aspacca aspacca removed the conflicts There is a conflict in the backported pull request label Aug 25, 2022
@aspacca aspacca merged commit a61acd3 into 7.17 Aug 25, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-32767 branch August 25, 2022 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Cloud-Monitoring Label for the Cloud Monitoring team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants