Skip to content

[Fleet] Fix reusable integration multiplespace validation#236428

Merged
nchaulet merged 6 commits intomainfrom
fix-reusable-integrations-multi-space-validation
Sep 25, 2025
Merged

[Fleet] Fix reusable integration multiplespace validation#236428
nchaulet merged 6 commits intomainfrom
fix-reusable-integrations-multi-space-validation

Conversation

@nchaulet
Copy link
Member

@nchaulet nchaulet commented Sep 25, 2025 •
edited by kibanamachine
Loading

Summary

Resolve #236419

Fix a bug that was blocking the package policy edition for any package policy used in a multi space agent policy.

Test

You can create an agent policy in multiple space, add a package policy, and edit it => it should work

I added missing API test that would have catch this.

@nchaulet nchaulet self-assigned this Sep 25, 2025
@nchaulet nchaulet added release_note:skip Skip the PR/issue when compiling release notes backport:skip This PR does not require backporting Team:Fleet Team label for Observability Data Collection Fleet team backport:prev-minor labels Sep 25, 2025
@nchaulet nchaulet marked this pull request as ready for review September 25, 2025 14:05
@nchaulet nchaulet requested a review from a team as a code owner September 25, 2025 14:05
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 25, 2025

Pinging @elastic/fleet (Team:Fleet)

juliaElastic
juliaElastic approved these changes Sep 25, 2025
View reviewed changes
Copy link
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

@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 25, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #78 / Dataset Quality Dataset quality alerting User can create rules "before all" hook for "page shows create rule button"

Metrics [docs]

✅ unchanged

History

cc @nchaulet

@nchaulet nchaulet merged commit dbcae6c into main Sep 25, 2025
13 checks passed
@nchaulet nchaulet deleted the fix-reusable-integrations-multi-space-validation branch September 25, 2025 20:18
VladimirFilonov pushed a commit to VladimirFilonov/kibana that referenced this pull request Sep 26, 2025
@nchaulet @VladimirFilonov
[Fleet] Fix reusable integration multiplespace validation (elastic#23…
5e52ac1 
…6428)
niros1 pushed a commit that referenced this pull request Sep 30, 2025
@nchaulet @niros1
[Fleet] Fix reusable integration multiplespace validation (#236428)
6743671
rylnd pushed a commit to rylnd/kibana that referenced this pull request Oct 17, 2025
@nchaulet
[Fleet] Fix reusable integration multiplespace validation (elastic#23…
630b3e3 
…6428)
@nchaulet nchaulet added backport:version Backport to applied version labels v9.1.7 labels Oct 28, 2025
@kibanamachine kibanamachine mentioned this pull request Oct 29, 2025
Merged
@kpollich kpollich removed backport:skip This PR does not require backporting backport:version Backport to applied version labels labels Jan 7, 2026
@kibanamachine
Copy link
Contributor

kibanamachine commented Jan 7, 2026

Starting backport for target branches: 9.1, 9.2, 9.3

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

@kpollich kpollich added backport:version Backport to applied version labels v9.1.10 and removed v9.4.0 labels Jan 7, 2026
@kibanamachine
Copy link
Contributor

kibanamachine commented Jan 7, 2026

Starting backport for target branches: 9.1, 9.2, 9.3

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

@kibanamachine
Copy link
Contributor

kibanamachine commented Jan 7, 2026

💔 All backports failed

Status Branch Result
❌ 9.1 Backport failed because of merge conflicts
❌ 9.2 Backport failed because of merge conflicts
❌ 9.3 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 236428

Questions ?

Please refer to the Backport tool documentation

1 similar comment
@kibanamachine
Copy link
Contributor

kibanamachine commented Jan 7, 2026

💔 All backports failed

Status Branch Result
❌ 9.1 Backport failed because of merge conflicts
❌ 9.2 Backport failed because of merge conflicts
❌ 9.3 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 236428

Questions ?

Please refer to the Backport tool documentation

@kpollich kpollich mentioned this pull request Jan 7, 2026
Closed
kpollich pushed a commit to kpollich/kibana that referenced this pull request Jan 7, 2026
@nchaulet
[Fleet] Fix reusable integration multiplespace validation (elastic#23…
c1a7864 
…6428)

(cherry picked from commit dbcae6c)

# Conflicts:
#	x-pack/platform/plugins/shared/fleet/server/services/package_policy.ts
#	x-pack/platform/test/fleet_api_integration/apis/space_awareness/api_helper.ts
#	x-pack/platform/test/fleet_api_integration/apis/space_awareness/helpers.ts
#	x-pack/platform/test/fleet_api_integration/apis/space_awareness/index.js
#	x-pack/platform/test/fleet_api_integration/apis/space_awareness/package_policies.ts
kpollich pushed a commit to kpollich/kibana that referenced this pull request Jan 7, 2026
@nchaulet
[Fleet] Fix reusable integration multiplespace validation (elastic#23…
9f3c63c 
…6428)

(cherry picked from commit dbcae6c)

# Conflicts:
#	x-pack/platform/plugins/shared/fleet/server/services/package_policy.ts
#	x-pack/platform/test/fleet_api_integration/apis/space_awareness/api_helper.ts
#	x-pack/platform/test/fleet_api_integration/apis/space_awareness/helpers.ts
#	x-pack/platform/test/fleet_api_integration/apis/space_awareness/index.js
#	x-pack/platform/test/fleet_api_integration/apis/space_awareness/package_policies.ts
@kpollich kpollich mentioned this pull request Jan 7, 2026
Closed
@kpollich
Copy link
Member

kpollich commented Jan 7, 2026

💔 Some backports could not be created

Status Branch Result
✅ 9.3
❌ 9.1 Conflict resolution was aborted by the user

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

Manual backport

To create the backport manually run:

node scripts/backport --pr 236428

Questions ?

Please refer to the Backport tool documentation

@kpollich kpollich removed the v9.1.7 label Jan 7, 2026
@kpollich kpollich mentioned this pull request Jan 7, 2026
Merged
kpollich added a commit that referenced this pull request Jan 8, 2026
@kpollich
[Fleet] [9.1] Fix multi space validation for reusable integration pol…
9286c78 
…icies (#248191)

## Summary

A manual recreation of #236428
against the 9.1 branch.
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jan 8, 2026
@kibanamachine
Copy link
Contributor

kibanamachine commented Jan 8, 2026

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 236428 locally
cc: @nchaulet

@nchaulet nchaulet added the backport:skip This PR does not require backporting label Jan 8, 2026
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jan 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@juliaElastic juliaElastic juliaElastic approved these changes

Assignees

@nchaulet nchaulet

Labels

backport:skip This PR does not require backporting backport:version Backport to applied version labels release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v9.1.10 v9.2.0 v9.3.0 v9.4.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Fleet] Unable to edit package policy for multiple space agent policies

5 participants

@nchaulet @elasticmachine @kibanamachine @kpollich @juliaElastic