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.6](backport #33559) Add backup to bucket functionality #34098

Merged
merged 4 commits into from
Mar 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 22, 2022

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

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

You are currently cherry-picking commit 5df1895443.
  (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/_meta/config/filebeat.inputs.reference.xpack.yml.tmpl
	modified:   x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
	modified:   x-pack/filebeat/filebeat.reference.yml
	modified:   x-pack/filebeat/input/awss3/config.go
	modified:   x-pack/filebeat/input/awss3/config_test.go
	modified:   x-pack/filebeat/input/awss3/input_benchmark_test.go
	modified:   x-pack/filebeat/input/awss3/input_integration_test.go
	modified:   x-pack/filebeat/input/awss3/interfaces.go
	modified:   x-pack/filebeat/input/awss3/mock_interfaces_test.go
	modified:   x-pack/filebeat/input/awss3/s3.go
	modified:   x-pack/filebeat/input/awss3/s3_objects.go
	modified:   x-pack/filebeat/input/awss3/s3_objects_test.go
	modified:   x-pack/filebeat/input/awss3/s3_test.go
	modified:   x-pack/filebeat/input/awss3/sqs_s3_event.go
	modified:   x-pack/filebeat/input/awss3/sqs_s3_event_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/awss3/input.go
	both modified:   x-pack/filebeat/input/awss3/metrics.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

* Add backup to bucket functionality

Adds a functionality to backup processed files to another or the same bucket with an optional prefix.
If enabled it will delete files from the source bucket.

* Add documentation for backup_to_bucket configuration parameters

* Add configuration to reference config file

* Revert "Add configuration to reference config file"

This reverts commit da59387.

* Add back reference config changes without whitespace changes

* fix typo that makes linter fail

* change reference config the right way

* Add later finalizing, missing tests for now

* Add code review feedback & unit tests

* Try fix G601 error

* Fix last code review feedback

* Add missing unit test

* add entry to changelog

* rename  to , add permissions required for backup feature in docs

* fix integration tests

Co-authored-by: Andrea Spacca <andrea.spacca@elastic.co>
(cherry picked from commit 5df1895)

# Conflicts:
#	x-pack/filebeat/input/awss3/input.go
#	x-pack/filebeat/input/awss3/metrics.go
@mergify mergify bot requested review from a team as code owners December 22, 2022 14:17
@mergify mergify bot requested review from belimawr and leehinman and removed request for a team December 22, 2022 14:17
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 22, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 22, 2022
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 19 Code Smells

No Coverage information No Coverage information
9.4% 9.4% Duplication

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 22, 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: 2023-03-02T01:24:35.385+0000

  • Duration: 129 min 1 sec

Test stats 🧪

Test Results
Failed 0
Passed 5062
Skipped 350
Total 5412

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@mergify
Copy link
Contributor Author

mergify bot commented Jan 10, 2023

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/8.6/pr-33559 upstream/mergify/bp/8.6/pr-33559
git merge upstream/8.6
git push upstream mergify/bp/8.6/pr-33559

@endorama endorama added the Team:Cloud-Monitoring Label for the Cloud Monitoring team label Mar 1, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 1, 2023
@endorama
Copy link
Member

endorama commented Mar 1, 2023

@aspacca I saw that you reviewed the original PR, may you have a look at this backport too?

@aspacca
Copy link

aspacca commented Mar 2, 2023

@endorama sure thing!

@aspacca aspacca merged commit 702101e into 8.6 Mar 2, 2023
@aspacca aspacca deleted the mergify/bp/8.6/pr-33559 branch March 2, 2023 04:19
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 Team:Cloud-Monitoring Label for the Cloud Monitoring team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants