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.11] Beat: Allow setting beat name in configuration (backport #12176) #12185

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2023

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

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

You are currently cherry-picking commit a56c6054d.
  (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/beatcmd/beat.go
	modified:   internal/beatcmd/beat_test.go
	modified:   internal/beatcmd/config.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.asciidoc

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

Uses the beat name if set in the configuration file. Restores what
used to work on 7.x and perhaps prior to #9149 being introduced.

This undoes an unwanted breaking change that caused beat.name to be
ignored.

Signed-off-by: Marc Lopez Rubio <[email protected]>
Co-authored-by: kruskall <[email protected]>
(cherry picked from commit a56c605)

# Conflicts:
#	changelogs/head.asciidoc
@mergify mergify bot requested a review from a team as a code owner December 7, 2023 12:37
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 7, 2023
@mergify mergify bot assigned marclop Dec 7, 2023
@marclop marclop closed this Dec 11, 2023
@mergify mergify bot deleted the mergify/bp/8.11/pr-12176 branch December 11, 2023 03:14
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant