Skip to content

[fleet integration] Support all apm-server config options and adapt defaults.#5444

Merged
simitt merged 6 commits intoelastic:masterfrom
simitt:integration-settings
Jun 18, 2021
Merged

[fleet integration] Support all apm-server config options and adapt defaults.#5444
simitt merged 6 commits intoelastic:masterfrom
simitt:integration-settings

Conversation

@simitt
Copy link
Copy Markdown
Contributor

@simitt simitt commented Jun 14, 2021 •
edited
Loading

Motivation/summary

  • Add missing apm-server.* settings that should be supported to the APM Server Integration.
  • Adapt default values to be aligned with cloud values where possible.

Checklist

How to test these changes

Before merging the PR:

  • Spin up a local package registry and copy over the apmpackage information to a new version 0.3.0.
  • Spin up an elastic-agent
  • Add an apm-integration and ensure the new config values are there

With BC:

  • Add an apm-integration to an agent policy and ensure the new config values are there
  • Enroll an elastic-agent, and ensure APM Server is started and reachable
  • Change config settings for the APM integration, and ensure they are applied to APM Server

Related issues

implements #4528

Preview

Screenshot 2021-06-14 at 09 59 39

Screenshot 2021-06-14 at 09 59 46

@simitt
Support all apm-server config options and adapt defaults.
adae905 
* Add missing settings that should be supported for APM Server Integration.
* Adapt default values to be aligned with cloud values where possible.

implements elastic#4528
@ghost
Copy link
Copy Markdown

ghost commented Jun 14, 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 #5444 updated

  • Start Time: 2021-06-18T09:38:24.745+0000

  • Duration: 37 min 47 sec

  • Commit: ed2d57a

Test stats 🧪

Test Results
Failed 0
Passed 6138
Skipped 120
Total 6258

Trends 🧪

Image of Build Times

Image of Tests

@simitt simitt requested a review from a team June 15, 2021 07:18
axw
axw approved these changes Jun 15, 2021
View reviewed changes
simitt
simitt commented Jun 15, 2021
View reviewed changes
@axw axw mentioned this pull request Jun 16, 2021
Merged
2 tasks
jalvz
jalvz approved these changes Jun 16, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@jalvz jalvz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Closes 4528, right?

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jun 16, 2021

This pull request is now in conflicts. Could you fix it @simitt? 🙏
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 integration-settings upstream/integration-settings
git merge upstream/master
git push upstream integration-settings

@simitt simitt merged commit 17166cd into elastic:master Jun 18, 2021
mergify bot pushed a commit that referenced this pull request Jun 18, 2021
@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 mentioned this pull request Jun 18, 2021
Merged
simitt pushed a commit that referenced this pull request Jun 24, 2021
@mergify
[7.x] [fleet integration] Support all apm-server config options and a…
154e6e0 
…dapt defaults. (backport #5444) (#5495)

* [fleet integration] Support apm-server config options and adapt defaults. (#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)
@stuartnelson3
Copy link
Copy Markdown
Contributor

stuartnelson3 commented Jul 9, 2021

Tested with BC2 snapshot from ~11 hours ago. It lists its apm package version as 0.3.0 and includes all options in the preview screenshot except for "passphrase for decrypting the certificate key".

I followed the steps listed:

  • package registry: mage build`, copied over apmpackage to 0.3.0 to the registry, and ran it
  • started BC2 of kibana with xpack.fleet.registryUrl: http://localhost:8080 in the config
  • started elastic-agent BC2, went to add the integration, but "passphrase for decrypting the certificate" still wasn't there

@axw
Copy link
Copy Markdown
Member

axw commented Jul 12, 2021

The TLS key passphrase config was intentionally removed in 3668362. We'll follow up on that later

mergify bot pushed a commit that referenced this pull request Jul 12, 2021
@simitt
[fleet integration] Support apm-server config options and adapt defau…
bb7a2c0 
…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:
#	apmpackage/apm/agent/input/template.yml.hbs
#	apmpackage/apm/manifest.yml
#	changelogs/head.asciidoc
@mergify mergify bot mentioned this pull request Jul 12, 2021
Closed
@simitt simitt deleted the integration-settings branch August 18, 2021 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@axw axw axw approved these changes

+1 more reviewer

@jalvz jalvz jalvz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

fleet test-plan test-plan-ok v7.14.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@simitt @stuartnelson3 @axw @jalvz