Skip to content

[7.x] [fleet integration] Support all apm-server config options and adapt defaults. (backport #5444)#5495

Merged
simitt merged 3 commits into7.xfrom
mergify/bp/7.x/pr-5444
Jun 24, 2021
Merged

[7.x] [fleet integration] Support all apm-server config options and adapt defaults. (backport #5444)#5495
simitt merged 3 commits into7.xfrom
mergify/bp/7.x/pr-5444

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 18, 2021

This is an automatic backport of pull request #5444 done by Mergify.
Cherry-pick of 17166cd has failed:

On branch mergify/bp/7.x/pr-5444
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 17166cdb.
  (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:   apmpackage/apm/agent/input/template.yml.hbs
	modified:   apmpackage/apm/manifest.yml

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://help.github.com/articles/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/

@simitt
[fleet integration] Support apm-server config options and adapt defau…
68259b3 
…lts. (#5444)

* Add missing settings that should be supported for APM Server Integration.
* Adapt default values to be aligned with cloud values where possible.

closes #4528

(cherry picked from commit 17166cd)

# Conflicts:
#	changelogs/head.asciidoc
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 18, 2021
@mergify mergify bot assigned simitt Jun 18, 2021
@ghost
Copy link
Copy Markdown

ghost commented Jun 18, 2021 •
edited by ghost
Loading

💚 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #5495 updated

  • Start Time: 2021-06-24T07:28:10.364+0000

  • Duration: 42 min 38 sec

  • Commit: b1677c4

Test stats 🧪

Test Results
Failed 0
Passed 4708
Skipped 120
Total 4828

Trends 🧪

Image of Build Times

Image of Tests

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 23, 2021

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
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/7.x/pr-5444 upstream/mergify/bp/7.x/pr-5444
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-5444

@simitt simitt merged commit 154e6e0 into 7.x Jun 24, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-5444 branch June 24, 2021 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@simitt simitt

Labels

conflicts There is a conflict in the backported pull request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@simitt