[Fleet] Add meta:{id} to fleet schemas by criamico · Pull Request #270560 · elastic/kibana

criamico · 2026-05-22T09:22:27Z

Fixes #261258
possibly also #264565 (to be verified)

Summary

Add meta: { id } to Fleet body/response schemas

Files changed:

server/types/models/agent_policy.ts — versioned policy schemas (v3–v6), new_agent_policy, agent_policy, agent_policy_response, full_agent_policy, outputs responses
server/types/rest_spec/agent_policy.ts — bulk get, copy, delete, full policy, K8s manifest, list outputs, cleanup task request/response schemas
server/types/models/enrollment_api_key.ts — enrollment_api_key
server/types/rest_spec/enrollment_api_key.ts — enrollment key CRUD and bulk delete schemas
common/types/models/package_policy_schema.ts — all package policy schemas: new, versioned (v22–v24), simplified, update, response, dry-run, status
server/types/rest_spec/package_policy.ts — bulk get, create, delete, upgrade, dry-run schemas
server/types/rest_spec/epm.ts — ~40 package management schemas (categories, package info/list/stats, install/delete/bulk operations, etc.)
server/types/rest_spec/agent.ts — action_id_response / action_message_response branches of ActionIdOrMessageSchema (resolves items links to styles and js #1 and Change of links to styles and js #2 of [OAS Validation] Fix structural schema issues in Fleet APIs #264565)

Testing

Verified locally with:

node scripts/capture_oas_snapshot --no-serverless --include-path /api/fleet
node scripts/validate_oas_docs
node scripts/check_api_contracts --distribution stack

It looks like there are no Fleet errors left after this change but the final verification step will be ran in the ci for Terraform

infra-vault-gh-plugin-prod · 2026-05-22T09:22:31Z

Pinging @elastic/fleet (Team:Fleet)

…tion_tests/ci_checks

vishaangelova

LGTM from a docs perspective
(Leaving a couple of suggestions to improve some of the description fields. Please ignore if fixing these is out of scope of this PR.)

jloleysens

Nice work @criamico ! Approving to unblock progress.

Would you mind trying to preview the new OAS on bump.sh before merging? From root you should be able to run make -C oas_docs api-docs-preview.

jloleysens · 2026-05-22T14:17:30Z

Note: changed due to added meta. Not due to runtime/behavioural changes.

so I guess I can ignore these failure safely?

criamico · 2026-05-22T14:44:11Z

@jloleysens I generated the preview:

Your preview is visible at: https://bump.sh/preview/4d15bfec-3062-4533-8429-d7d032ae0fe2 (Expires at 2026-05-22T17:10:42+02:00)

jloleysens · 2026-05-22T14:45:58Z

Nice! Does it look as expected?

criamico · 2026-05-22T14:56:08Z

Nice! Does it look as expected?

It looks ok to me and I can see the new descriptions added. I'm not sure if the meta:id fields can be validated from the docs though?

The other thing is that the original ticket said:

We'll run the downstream pipeline (Terraform provider codegen) to make sure the generated types look right, naming, shared types, scalar fields all stay clean.

@jloleysens Can you help me to verify the current changes on this pipeline? I don't know if it's automatically triggered.

…tion_tests/ci_checks

criamico · 2026-05-25T08:12:18Z

@elasticmachine merge upstream

kibanamachine · 2026-05-25T08:32:43Z

Saved Objects CI check failed

4 issue(s) across 1 type(s).

General

[generic] The SO type 'ingest-agent-policies' has mapping fields not present in the latest model version schema: is_preconfigured, revision, schema_version, status, updated_at, updated_by. (docs)
[generic] The SO type 'fleet-agent-policies' has mapping fields not present in the latest model version schema: is_preconfigured, revision, schema_version, status, updated_at, updated_by. (docs)
[generic] The SO type 'ingest-package-policies' has mapping fields not present in the latest model version schema: bump_agent_policy_revision, created_at, created_by, elasticsearch, latest_revision, package.name, package.requires_root, package.title, package.version, revision, secret_references.id, updated_at, updated_by. (docs)
[generic] The SO type 'fleet-package-policies' has mapping fields not present in the latest model version schema: bump_agent_policy_revision, created_at, created_by, elasticsearch, latest_revision, package.name, package.requires_root, package.title, package.version, revision, secret_references.id, updated_at, updated_by. (docs)

Run locally

node scripts/check_saved_objects --baseline 388461351fec95f2bd766f32124dd4705a1a2863

See the Saved Objects troubleshooting guide and the model versions documentation for details.

nchaulet

LGTM 🚀

kibanamachine · 2026-05-26T15:49:23Z

💔 Build Failed

Buildkite Build
Commit: 69cdee6
Build duration: 56 mins

Failed CI Steps

Test Failures

[job] [logs] Jest Tests #11 / Alert table context menu Case actions it render AddToCase context menu item if timelineId === TimelineId.detectionsPage
[job] [logs] FTR Configs #142 / Entity Analytics - Privilege Monitoring @ess @serverless @skipInServerlessMKI Entity Analytics Privileged user monitoring Migrations source_index migration for space default should run the migration when users have source_index field
[job] [logs] Jest Tests #12 / GraphGroupedNodePreviewPanel Pagination Behavior Page Size Changes should reset pageIndex to 0 when changing pageSize to 25
[job] [logs] Scout Lane #46 - serverless-observability_complete / default / local-serverless-observability_complete - Hosts Page - Empty State - should show onboarding page when no data is present

Metrics [docs]

✅ unchanged

History

cc @criamico

github-advanced-security

CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

kibanamachine · 2026-05-27T08:38:05Z

Starting backport for target branches: 9.4

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

kibanamachine · 2026-05-27T08:47:34Z

💔 All backports failed

Status	Branch	Result
❌	9.4	Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 270560

Questions ?

Please refer to the Backport tool documentation

Fixes elastic#261258 possibly also elastic#264565 (to be verified) ## Summary Add `meta: { id }` to Fleet body/response schemas Files changed: - `server/types/models/agent_policy.ts` — versioned policy schemas (v3–v6), `new_agent_policy`, `agent_policy`, `agent_policy_response`, `full_agent_policy`, outputs responses - `server/types/rest_spec/agent_policy.ts` — bulk get, copy, delete, full policy, K8s manifest, list outputs, cleanup task request/response schemas - `server/types/models/enrollment_api_key.ts `— `enrollment_api_key` - `server/types/rest_spec/enrollment_api_key.ts` — enrollment key CRUD and bulk delete schemas - `common/types/models/package_policy_schema.ts `— all package policy schemas: new, versioned (v22–v24), simplified, update, response, dry-run, status - `server/types/rest_spec/package_policy.ts` — bulk get, create, delete, upgrade, dry-run schemas - `server/types/rest_spec/epm.ts `— ~40 package management schemas (categories, package info/list/stats, install/delete/bulk operations, etc.) - `server/types/rest_spec/agent.ts` — `action_id_response` / `action_message_response` branches of `ActionIdOrMessageSchema` (resolves items #1 and #2 of elastic#264565) ### Testing Verified locally with: ``` node scripts/capture_oas_snapshot --no-serverless --include-path /api/fleet node scripts/validate_oas_docs node scripts/check_api_contracts --distribution stack ``` It looks like there are no Fleet errors left after this change but the final verification step will be ran in the ci for Terraform --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

kibanamachine · 2026-05-29T08:49:15Z

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 270560 locally
cc: @criamico

criamico · 2026-05-29T09:57:50Z

💚 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

kibanamachine · 2026-06-01T09:48:56Z

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.
cc: @criamico

[Fleet] Add meta:{id} to fleet schemas

a55c9d5

criamico self-assigned this May 22, 2026

criamico added the release_note:skip Skip the PR/issue when compiling release notes label May 22, 2026

criamico requested a review from a team as a code owner May 22, 2026 09:22

criamico added Team:Fleet Team label for Observability Data Collection Fleet team backport:version Backport to applied version labels v9.4.0 v9.5.0 labels May 22, 2026

criamico requested a review from a team May 22, 2026 09:23

kibanamachine added 2 commits May 22, 2026 09:40

Changes from node scripts/jest_integration -u src/core/server/integra…

a6e7af9

…tion_tests/ci_checks

Changes from make api-docs

4c74cf2

elastic-vault-github-plugin-prod Bot requested a review from a team as a code owner May 22, 2026 10:02

vishaangelova approved these changes May 22, 2026

View reviewed changes

jloleysens approved these changes May 22, 2026

View reviewed changes

Apply code review suggestions

ff67914

criamico and others added 3 commits May 22, 2026 16:58

merge main

8ee93d5

Changes from node scripts/jest_integration -u src/core/server/integra…

64ee584

…tion_tests/ci_checks

Changes from make api-docs

19b095c

Merge branch 'main' into 261258_oas_meta_ids

8d120b9

nchaulet self-requested a review May 25, 2026 15:19

nchaulet approved these changes May 25, 2026

View reviewed changes

criamico and others added 2 commits May 26, 2026 16:59

merge main

ba24239

Changes from make api-docs

69cdee6

github-advanced-security AI found potential problems May 26, 2026

View reviewed changes

criamico merged commit f8da12e into elastic:main May 27, 2026
31 of 32 checks passed

This was referenced May 27, 2026

[OAS Validation] Fix structural schema issues in Fleet APIs #264565

Closed

[OAS Validation] Fix remaining anyOf unions in Fleet paths #271410

Open

This was referenced May 28, 2026

[Fleet] Named OpenAPI components from #270560 silently drop fields (output_id, policy_id, policy_ids, supports_agentless, id, package) #271809

Open

[Fleet] Restore dropped OpenAPI fields by giving extends() schemas distinct meta.id #271812

Open

kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 29, 2026

criamico mentioned this pull request May 29, 2026

[9.4] [Fleet] Add meta:{id} to fleet schemas (#270560) #271863

Open

Conversation

criamico commented May 22, 2026 • edited by kibanamachine Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Testing

Uh oh!

infra-vault-gh-plugin-prod Bot commented May 22, 2026

Uh oh!

vishaangelova left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jloleysens left a comment

Choose a reason for hiding this comment

Uh oh!

jloleysens May 22, 2026

Choose a reason for hiding this comment

Uh oh!

criamico May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

criamico commented May 22, 2026

Uh oh!

jloleysens commented May 22, 2026

Uh oh!

criamico commented May 22, 2026

Uh oh!

criamico commented May 25, 2026

Uh oh!

kibanamachine commented May 25, 2026

Saved Objects CI check failed

General

Run locally

Uh oh!

nchaulet left a comment

Choose a reason for hiding this comment

Uh oh!

kibanamachine commented May 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💔 Build Failed

Failed CI Steps

Test Failures

Metrics [docs]

History

Uh oh!

github-advanced-security AI left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kibanamachine commented May 27, 2026

Uh oh!

kibanamachine commented May 27, 2026

💔 All backports failed

Manual backport

Questions ?

Uh oh!

kibanamachine commented May 29, 2026

Uh oh!

criamico commented May 29, 2026

💚 All backports created successfully

Questions ?

Uh oh!

kibanamachine commented Jun 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

criamico commented May 22, 2026 •

edited by kibanamachine

Loading

criamico May 22, 2026 •

edited

Loading

kibanamachine commented May 26, 2026 •

edited

Loading