Skip to content

[7.14] fix direct agent configuration (backport #5380)#5648

Closed
mergify[bot] wants to merge 1 commit into7.14from
mergify/bp/7.14/pr-5380
Closed

[7.14] fix direct agent configuration (backport #5380)#5648
mergify[bot] wants to merge 1 commit into7.14from
mergify/bp/7.14/pr-5380

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2021

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

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

You are currently cherry-picking commit 99802961.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   apmpackage/apm/0.3.0/agent/input/template.yml.hbs

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/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.io/

* disable kibana if running in managed mode

* remove agent_config service validation

selecting "all" for service name or environment in
the kibana ui marshals service.name and
service.environment as empty strings, which is
valid

* remove kibana api key

this was used temporarily to support central
config via kibana, which is not necessary for 7.14

(cherry picked from commit 9980296)

# Conflicts:
#	apmpackage/apm/0.3.0/agent/input/template.yml.hbs
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 9, 2021
@axw axw closed this Jul 9, 2021
@axw axw deleted the mergify/bp/7.14/pr-5380 branch July 9, 2021 08:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants