Skip to content

[Fleet] Resolve and merge templates listed in template_paths#257730

Merged
jsoriano merged 11 commits intoelastic:mainfrom
jsoriano:merge-templates
Mar 20, 2026
Merged

[Fleet] Resolve and merge templates listed in template_paths#257730
jsoriano merged 11 commits intoelastic:mainfrom
jsoriano:merge-templates

Conversation

@jsoriano
Copy link
Copy Markdown
Member

Summary

When an integration package contains multiple configuration templates, resolve and merge them in a single configuration.

Fixes #252939.
Package Spec change in elastic/package-spec#1084.
Template bundle for composable packages in elastic/elastic-package#3329.

Checklist

Check the PR satisfies following conditions.

Reviewers should verify this PR satisfies this list as well.

  • Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support
  • Documentation was added for features that require explanation or tutorials
  • Unit or functional tests were updated or added to match the most common scenarios
  • If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the docker list
  • This was checked for breaking HTTP API changes, and any breaking changes have been approved by the breaking-change committee. The release_note:breaking label should be applied in these situations.
  • Flaky Test Runner was used on any tests changed
  • The PR description includes the appropriate Release Notes section, and the correct release_note:* label is applied per the guidelines
  • Review the backport guidelines and apply applicable backport:* labels.

Identify risks

Does this PR introduce any risks? For example, consider risks like hard to test bugs, performance regression, potential of data loss.

Describe the risk, its severity, and mitigation for each identified risk. Invite stakeholders and evaluate how to proceed before merging.

@jsoriano jsoriano self-assigned this Mar 13, 2026
@jsoriano jsoriano requested a review from a team as a code owner March 13, 2026 16:30
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Mar 13, 2026
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/fleet (Team:Fleet)

@jsoriano jsoriano added backport:skip This PR does not require backporting v9.4.0 9.4.0 release_note:feature Makes this part of the condensed release notes labels Mar 13, 2026
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

it would be great to cover this change with integration tests too

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Added in 9ac2610

Copy link
Copy Markdown
Contributor

@juliaElastic juliaElastic left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Contributor

@teresaromero teresaromero left a comment

Choose a reason for hiding this comment

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

👍🏻

@jsoriano jsoriano enabled auto-merge (squash) March 18, 2026 18:13
@jsoriano jsoriano disabled auto-merge March 20, 2026 09:40
@jsoriano jsoriano enabled auto-merge (squash) March 20, 2026 09:41
@jsoriano jsoriano disabled auto-merge March 20, 2026 12:22
@jsoriano jsoriano enabled auto-merge (squash) March 20, 2026 12:23
@elasticmachine
Copy link
Copy Markdown
Contributor

⏳ Build in-progress, with failures

Failed CI Steps

History

cc @jsoriano

@jsoriano jsoriano merged commit 27aca1a into elastic:main Mar 20, 2026
19 checks passed
jeramysoucy pushed a commit to jeramysoucy/kibana that referenced this pull request Mar 26, 2026
…#257730)

When an integration package contains multiple configuration templates,
resolve and merge them in a single configuration.

Fixes elastic#252939.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

9.4.0 backport:skip This PR does not require backporting release_note:feature Makes this part of the condensed release notes Team:Fleet Team label for Observability Data Collection Fleet team v9.4.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Fleet] Support package inputs and streams with multiple template paths

4 participants