[APM] Fleet support for merging input.config values with other nested properties in the policy input#101690
Merged
ogupte merged 4 commits intoelastic:masterfrom Jun 10, 2021
Conversation
ogupte
requested review from
a team,
axw,
cauemarcondes,
jen-huang and
stuartnelson3
botelastic
bot
added
Team:APM - DEPRECATED
Contributor
|
Pinging @elastic/fleet (Team:Fleet) |
Contributor
|
Pinging @elastic/apm-ui (Team:apm) |
ogupte
force-pushed
the
apm-95501-agent-config-fleet-sync-improvements
branch
from
03bf7d5 to
b975480
Compare
axw
approved these changes
Jun 9, 2021
stuartnelson3
approved these changes
Jun 9, 2021
jen-huang
approved these changes
Jun 9, 2021
Contributor
jen-huang
left a comment
jen-huang
left a comment
There was a problem hiding this comment.
Left one request but otherwise LGTM 🚀
| : {}), | ||
| }; | ||
|
|
||
| merge( |
Contributor
There was a problem hiding this comment.
could you add a comment explaining this logic?
Contributor
Author
|
@elasticmachine merge upstream |
Contributor
💚 Build SucceededMetrics [docs]Page load bundle
History
To update your PR or re-run it, just comment with: |
jen-huang
added
the
auto-backport
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jun 10, 2021
… properties in the policy input (elastic#101690) * [APM] Improvments in the APM fleet integration (elastic#95501) * added unit test and line comment * fixes eslint issues
Contributor
💚 Backport successful
This backport PR will be merged automatically after passing CI. |
gmmorris
added a commit
to gmmorris/kibana
that referenced
this pull request
Jun 14, 2021
* master: (68 commits) skip flaky suite (elastic#94043) skip flaky suite (elastic#102012) [esArchive] Persists updates for management/saved_objects/* (elastic#101992) skip flaky suite (elastic#101449) remove unnecessary hack (elastic#101909) [Exploratory View] Use human readable formats (elastic#101520) [Expressions] Refactor expression functions to use observables underneath (elastic#100409) [esArchives] Persist migrated Kibana archives (elastic#101950) [kbnArchiver] fix save to non-existent file (elastic#101974) [Enterprise Search] Add owner and description properties to kibana.json (elastic#101957) [DOCS] Fixes terminology in Stack Monitoring:Kibana alerts (elastic#101696) [Observability] [Cases] Cases in the observability app (elastic#101487) [Alerting][Docs] Combine rule creation and management pages (elastic#101498) temporarily disable build-buddy [Fleet] Fix fleet server collector in case settings are not set (elastic#101752) [Event Log] Populated rule.* ECS fields for alert events. (elastic#101132) [APM] Fleet support for merging input.config values with other nested properties in the policy input (elastic#101690) Add comments to some alerting plugin public API items (elastic#101551) [Alerting][Docs] Moving alerting setup to its own page (elastic#101323) remove uptime public API, it's not used. (elastic#101799) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Improves on #95501.
Adds support for setting package policy input
configvalues which can be merged with othercompiled_inputvalues when the agent.yml is rendered with the full policy input.Example resulting yaml:
from merging
input.configwith the full policy includingcompiled_input: