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 #36681) Enable compression by default for Elasticsearch outputs #36708

Merged
merged 2 commits into from
Oct 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 29, 2023

This is an automatic backport of pull request #36681 done by Mergify.
Cherry-pick of 231e93a has failed:

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

You are currently cherry-picking commit 231e93a6d2.
  (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:   auditbeat/auditbeat.reference.yml
	modified:   filebeat/filebeat.reference.yml
	modified:   heartbeat/heartbeat.reference.yml
	modified:   libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl
	modified:   libbeat/outputs/elasticsearch/config.go
	modified:   libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc
	modified:   metricbeat/metricbeat.reference.yml
	modified:   packetbeat/packetbeat.reference.yml
	modified:   winlogbeat/winlogbeat.reference.yml
	modified:   x-pack/auditbeat/auditbeat.reference.yml
	modified:   x-pack/filebeat/filebeat.reference.yml
	modified:   x-pack/functionbeat/functionbeat.reference.yml
	modified:   x-pack/heartbeat/heartbeat.reference.yml
	modified:   x-pack/metricbeat/metricbeat.reference.yml
	modified:   x-pack/osquerybeat/osquerybeat.reference.yml
	modified:   x-pack/packetbeat/packetbeat.reference.yml
	modified:   x-pack/winlogbeat/winlogbeat.reference.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/outputs/elasticsearch/config_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

* Enable compression by default for Elasticsearch outputs

* update config template

* update changelog

* regenerate config templates

* update docs

* make check

(cherry picked from commit 231e93a)

# Conflicts:
#	libbeat/outputs/elasticsearch/config_test.go
@mergify mergify bot requested review from a team as code owners September 29, 2023 17:03
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 29, 2023
@mergify mergify bot requested review from rdner and fearful-symmetry and removed request for a team September 29, 2023 17:03
@mergify mergify bot assigned faec Sep 29, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 29, 2023
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 29, 2023

💚 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

  • Duration: 108 min 44 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 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!)

@cmacknz cmacknz added the Team:Elastic-Agent Label for the Agent team label Sep 29, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 29, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 2, 2023

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

@jlind23
Copy link
Collaborator

jlind23 commented Oct 2, 2023

We got all the performance testing results we were looking and thus are able to merge this.

@jlind23 jlind23 merged commit eef25a2 into 7.17 Oct 2, 2023
22 checks passed
@jlind23 jlind23 deleted the mergify/bp/7.17/pr-36681 branch October 2, 2023 17:56
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:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants