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

[8.17](backport #42306) x-pack/filebeat/docs - document gzip S3 object handling #42342

Merged
merged 2 commits into from
Jan 21, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 17, 2025

Proposed commit message

Document how compressed objects are handled by the aws-s3 input.

This is an automatic backport of pull request #42306 done by [Mergify](https://mergify.com).

Document how compressed objects are handled by the aws-s3 input.

(cherry picked from commit 7fd2d46)

# Conflicts:
#	x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 17, 2025
Copy link
Contributor Author

mergify bot commented Jan 17, 2025

Cherry-pick of 7fd2d46 has failed:

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

You are currently cherry-picking commit 7fd2d46de.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 17, 2025
@botelastic
Copy link

botelastic bot commented Jan 17, 2025

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

@andrewkroh andrewkroh added docs Filebeat Filebeat and removed conflicts There is a conflict in the backported pull request labels Jan 17, 2025
@andrewkroh andrewkroh enabled auto-merge (squash) January 17, 2025 15:15
Copy link
Contributor Author

mergify bot commented Jan 20, 2025

This pull request has not been merged yet. Could you please review and merge it @andrewkroh? 🙏

@andrewkroh andrewkroh merged commit 4e5407e into 8.17 Jan 21, 2025
22 checks passed
@andrewkroh andrewkroh deleted the mergify/bp/8.17/pr-42306 branch January 21, 2025 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport docs Filebeat Filebeat needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant