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.9] Handle queue.* config for libbeat outputs (backport #11534) #11536

Merged
merged 2 commits into from
Aug 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 31, 2023

This is an automatic backport of pull request #11534 done by Mergify.
Cherry-pick of 3771a5f has failed:

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

You are currently cherry-picking commit 3771a5fe7.
  (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:   internal/beater/beater.go
	modified:   systemtest/apmservertest/config.go
	new file:   systemtest/logstash_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/8.10.asciidoc
	both modified:   systemtest/go.mod
	both modified:   systemtest/go.sum

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

We were ignoring queue.* config when using libbeat
outputs, such as logstash and kafka.

(cherry picked from commit 3771a5f)

# Conflicts:
#	changelogs/8.10.asciidoc
#	systemtest/go.mod
#	systemtest/go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 31, 2023
@mergify mergify bot assigned axw Aug 31, 2023
@axw axw removed the conflicts There is a conflict in the backported pull request label Aug 31, 2023
@axw axw enabled auto-merge (squash) August 31, 2023 05:35
@mergify mergify bot merged commit 07b7932 into 8.9 Aug 31, 2023
9 checks passed
@mergify mergify bot deleted the mergify/bp/8.9/pr-11534 branch August 31, 2023 05:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant