[Fleet] Support setting explicit names for ambiguous inputs by jsoriano · Pull Request #262138 · elastic/kibana

jsoriano · 2026-04-08T23:38:28Z

Summary

In integration packages, if multiple inputs in the same policy template have the same type, data streams using them don't have a way to distinguish them. In this case Fleet misbehaves, showing mixed elements in the UI and failing to correctly create policies.

This change supports to explicitly name inputs, so inputs of the same type can be used in the same policy template, and data streams are able to reference them unambiguously.

This change is specially relevant for OTel integration packages, introduced in 9.4.0, see #252949. On these packages it is going to be frequent to have multiple inputs of the otelcol type in the same policy template. Without this change OTel integration packages with multiple data streams can hardly be used.

Code generated with Cursor

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.

See some risk examples
...

elasticmachine · 2026-04-08T23:38:33Z

Pinging @elastic/fleet (Team:Fleet)

macroscopeapp · 2026-04-08T23:42:42Z

Approvability

Verdict: Needs human review

This PR introduces a new feature that changes how Fleet inputs are identified and matched throughout the system (using name ?? type instead of just type). This affects core input handling logic during policy creation, validation, upgrades, and agent configuration. The author does not own any of the changed files (all owned by @elastic/fleet), and there are unresolved reviewer questions about edge cases.

No code changes detected at 3ef5c3e. Prior analysis still applies.

^{You can customize Macroscope's approvability policy. Learn more.}

… into qualified-otelcol-input-names

jsoriano · 2026-04-13T08:53:06Z

/test

elasticmachine · 2026-04-13T09:13:49Z

⏳ Build in-progress, with failures

Buildkite Build
Commit: 3873e08

Failed CI Steps

Test Failures

[job] [logs] Jest Tests #1 / discover responsive sidebar should render buttons in data view picker correctly
[job] [logs] Jest Tests #1 / discover responsive sidebar should render buttons in data view picker correctly
[job] [logs] Jest Tests #8 / FilterLabel should render properly
[job] [logs] Jest Tests #8 / FilterLabel should render properly
[job] [logs] Scout: [ security / entity_store ] plugin / local-stateful-classic - Entity Store Logs Extraction with pagination (max 5 docs per page) - Should extract properly extract host with pagination
[job] [logs] Scout: [ security / entity_store ] plugin / local-stateful-classic - Entity Store Logs Extraction with pagination (max 5 docs per page) - Should extract properly extract host with pagination
[job] [logs] Jest Integration Tests #7 / StepDefineRule query persists kuery when switching between "query" and "eql" rule types
[job] [logs] Jest Integration Tests #7 / StepDefineRule query persists kuery when switching between "query" and "eql" rule types

History

💔 Build #424578 failed b4f156a
💔 Build #424392 failed dd7f642

cc @jsoriano

teresaromero

lgtm. errors on CI seem not related with these changes

jsoriano · 2026-04-14T10:32:25Z

@elastic/experience-docs could you please take a look to this PR? 🙏 It is waiting for your review. Thanks!

nchaulet · 2026-04-14T13:12:45Z

-        ? `${policyTemplate.name}-${input.type}`
-        : input.type;
+      const requiredVarDefKey = buildInputKey(
+        getInputEffectiveName(input),


Will this cause breaking change for the API, or do we do not have input package with name yet?

We don't have inputs with names yet. Support for this hasn't been released.

I mean, this is not supported by the spec yet. This is the change in the spec: elastic/package-spec#1135

nchaulet

LGTM 🚀

kibanamachine · 2026-04-14T18:03:31Z

Starting backport for target branches: 9.4

https://github.com/elastic/kibana/actions/runs/24414940700

…262138) In integration packages, if multiple inputs in the same policy template have the same type, data streams using them don't have a way to distinguish them. In this case Fleet misbehaves, showing mixed elements in the UI and failing to correctly create policies. This change supports to explicitly name inputs, so inputs of the same type can be used in the same policy template, and data streams are able to reference them unambiguously. This change is specially relevant for OTel integration packages. On these packages it is going to be frequent to have multiple inputs of the `otelcol` type in the same policy template. Without this change OTel integration packages with multiple data streams can hardly be used. (cherry picked from commit 911c150)

kibanamachine · 2026-04-14T18:12:20Z

💚 All backports created successfully

Status	Branch	Result
✅	9.4

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

…62138) (#263182) # Backport This will backport the following commits from `main` to `9.4`: - [[Fleet] Support setting explicit names for ambiguous inputs (#262138)](#262138)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

Timing conflict between #262138 and #252345

## Summary Completes propagation of **effective input names** (`name ?? type`, `getInputEffectiveName`) for places that still matched registry `streams[].input` against **`input.type`**. That mismatch caused package policy creation to fail with `Stream template not found, unable to find stream for input <type>` when integration manifests reference streams by **input name** (same agent type, disambiguated names), as exercised by composable/elastic-package dual-input fixtures. **Changes** - **`package_policy.ts`**: `_compilePackageStream` selects the registry stream using `getInputEffectiveName(input)`; error message includes effective name and type. - **`validate_package_policy.ts`**: stream var-def lookup key uses `${dataset}-${getInputEffectiveName(input)}` to match the registry map keyed by `stream.input`. - **`secrets/package_policies.ts`**: stream secret var-def lookup uses the same effective name in the dataset key; import `getInputEffectiveName`. - **`get_template_inputs.ts`**: `buildIndexedPackage` indexes streams and input ids using `getInputEffectiveName(packageInput)` so docs/template indexing matches named stream references. - **`package_policy.test.ts`**: Jest coverage for a manifest whose `streams[].input` is the input **name** while `input.type` remains the real type. Relates to [Fleet: Support setting explicit names for ambiguous inputs](#262138) and composable packages that set `streams[].input` to the input name qualifier. **Related issue:** This gap surfaced while testing work for [elastic/elastic-package#3465](elastic/elastic-package#3465) (composable `requires.input`: input `name` and stream `input` per package-spec qualified inputs). The elastic-package change that implements that issue is still **WIP**; this Kibana PR closes the Fleet side so policies compile when manifests follow the spec (streams reference the input **name** while the policy input keeps the real agent **type**). **Release notes:** Follow-up to #262138; no additional user-facing release note beyond that change. Use label `release_note:skip`. ### Checklist Check the PR satisfies following conditions. Reviewers should verify this PR satisfies this list as well. - [x] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md) - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) 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](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) - [x] 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](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed - [x] The PR description includes the appropriate Release Notes section, and the correct `release_note:*` label is applied per the [guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) (`release_note:skip`, follow-up to #262138). - [ ] Review the [backport guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing) 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. - [ ] [See some risk examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) **Risks** - **Wrong stream match if a package mis-declares `streams[].input`**: Low. Behavior is aligned with `getInputEffectiveName`; packages that still use plain `type` in manifests continue to work because `name` is absent. - **EPM template / comment indexing**: Low. `buildIndexedPackage` now keys by effective name; verify integration detail docs for packages with duplicate types and names if any UI relies on old `type`-only ids.

…64366) (#264634) # Backport This will backport the following commits from `main` to `9.4`: - [[Fleet] Resolve streams and secrets by effective input name (#264366)](#264366)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Tere <teresa.romero@elastic.co>

jsoriano added 3 commits April 9, 2026 00:59

Add initial tests

e24cac6

Use qualified ids for ambiguous inputs

f3ad62b

Self-review

1c50431

jsoriano self-assigned this Apr 8, 2026

jsoriano requested a review from a team as a code owner April 8, 2026 23:38

jsoriano added release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team backport:version Backport to applied version labels v9.4.0 labels Apr 8, 2026

Use name instead of id for the input identifier

dd7f642

jsoriano force-pushed the qualified-otelcol-input-names branch from 9a23fa7 to dd7f642 Compare April 8, 2026 23:49

jsoriano marked this pull request as draft April 8, 2026 23:51

macroscopeapp Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread ...sections/agent_policy/create_package_policy_page/components/steps/step_configure_package.tsx

kibanamachine added 2 commits April 9, 2026 00:16

Changes from make api-docs

3410346

Changes from node scripts/eslint_all_files --no-cache --fix

3e6a1d4