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.

Sign up for GitHub

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

Jump to bottom

[APM] Fleet support for merging input.config values with other nested properties in the policy input #101690

Merged
merged 4 commits into from
Jun 10, 2021
Merged

[APM] Fleet support for merging input.config values with other nested properties in the policy input #101690

merged 4 commits into from
Jun 10, 2021

Conversation

ogupte
Copy link
Contributor

@ogupte ogupte commented Jun 9, 2021

Improves on #95501.

Adds support for setting package policy input config values which can be merged with other compiled_input values when the agent.yml is rendered with the full policy input.

Example resulting yaml:
Screen Shot 2021-06-08 at 8 15 45 PM

from merging input.config with the full policy including compiled_input:
Screen Shot 2021-06-08 at 8 18 52 PM

@ogupte ogupte requested review from a team as code owners June 9, 2021 00:26
@botelastic botelastic bot added Team:APM All issues that need APM UI Team support Team:Fleet Team label for Observability Data Collection Fleet team labels Jun 9, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@elasticmachine
Copy link
Contributor

Pinging @elastic/apm-ui (Team:apm)

@ogupte ogupte force-pushed the apm-95501-agent-config-fleet-sync-improvements branch from 03bf7d5 to b975480 Compare June 9, 2021 00:31
jen-huang
jen-huang approved these changes Jun 9, 2021
View reviewed changes
Copy link
Contributor

@jen-huang jen-huang left a comment

Choose a reason for hiding this comment

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

Left one request but otherwise LGTM 🚀

x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts
@@ -56,6 +53,14 @@ export const storedPackagePoliciesToAgentInputs = (
: {}),
};

merge(
Copy link
Contributor

Choose a reason for hiding this comment

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

could you add a comment explaining this logic?

cauemarcondes
cauemarcondes approved these changes Jun 9, 2021
View reviewed changes
Copy link
Contributor

@cauemarcondes cauemarcondes left a comment

Choose a reason for hiding this comment

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

LGTM

@ogupte ogupte enabled auto-merge (squash) June 10, 2021 16:21
@ogupte
Copy link
Contributor Author

ogupte commented Jun 10, 2021

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
fleet 434.8KB 434.8KB +65.0B

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@ogupte ogupte merged commit befd30f into elastic:master Jun 10, 2021
@jen-huang jen-huang added the auto-backport Deprecated - use backport:version if exact versions are needed label Jun 10, 2021
@kibanamachine kibanamachine mentioned this pull request Jun 10, 2021
Merged
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jun 10, 2021
@ogupte @kibanamachine
[APM] Fleet support for merging input.config values with other nested…
9883d40 
… 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
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
✅ 7.x

This backport PR will be merged automatically after passing CI.

kibanamachine added a commit that referenced this pull request Jun 10, 2021
@kibanamachine @ogupte
[APM] Fleet support for merging input.config values with other nested…
a6bd1ec 
… properties in the policy input (#101690) (#101955)

* [APM] Improvments in the APM fleet integration (#95501)

* added unit test and line comment

* fixes eslint issues

Co-authored-by: Oliver Gupte <ogupte@users.noreply.github.com>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jun 14, 2021
@gmmorris
Merge branch 'master' into task-manager/capacity-estimation
4b96500 
* 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)
  ...
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

@stuartnelson3 stuartnelson3 stuartnelson3 approved these changes

@jen-huang jen-huang jen-huang approved these changes

@cauemarcondes cauemarcondes cauemarcondes approved these changes

Assignees
No one assigned
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:enhancement Team:APM All issues that need APM UI Team support Team:Fleet Team label for Observability Data Collection Fleet team v7.14.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ogupte @elasticmachine @kibanamachine @axw @stuartnelson3 @jen-huang @cauemarcondes