[Entity Store] Make schema properties nullable by orouz · Pull Request #264509 · elastic/kibana

orouz · 2026-04-20T18:52:36Z

reverts #263087, which fixed error clearing via read-modify-write (updateWith) - introduced a race condition causing flaky tests (diagnosed in #264303).

fix: make error (and logExtractionState fields) nullable and set them to null directly. works correctly with mergeAttributes: true, which treats undefined as "leave unchanged" but does writes null explicitly

3 flaky runs in this PR failed on unrelated tests. targeted flaky tests all passed: #264475, #264372, #264303, #264299

orouz · 2026-04-20T18:53:11Z

/flaky scoutConfig:x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts:30

kibanamachine · 2026-04-20T18:53:27Z

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11758

x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts x30

kibanamachine · 2026-04-20T20:34:49Z

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11758

[❌] x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts: 28/30 tests passed.

see run history

orouz · 2026-04-21T09:46:47Z

/flaky scoutConfig:x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts:30

kibanamachine · 2026-04-21T09:47:04Z

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11769

x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts x30

kibanamachine · 2026-04-21T11:51:43Z

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11769

[❌] x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts: 28/30 tests passed.

see run history

orouz · 2026-04-21T12:10:42Z

/flaky scoutConfig:x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts:30

kibanamachine · 2026-04-21T12:10:57Z

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11772

x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts x30

kibanamachine · 2026-04-21T13:47:53Z

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11772

[❌] x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts: 29/30 tests passed.

see run history

orouz · 2026-04-21T14:23:44Z

/flaky scoutConfig:x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts:30

kibanamachine · 2026-04-21T14:23:59Z

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11779

x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts x30

kibanamachine · 2026-04-21T16:03:32Z

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11779

[❌] x-pack/solutions/security/plugins/entity_store/test/scout/api/playwright.config.ts: 28/30 tests passed.

see run history

kubasobon

Just two nit-picks.

orouz · 2026-04-26T08:39:01Z

LGTM. Just a small question, has error.action always been init | extractLogs?

yes, but that that schema change is now reverted. thanks!

uri-weisman · 2026-04-26T09:26:07Z

@coderabbitai full review

coderabbitai · 2026-04-26T09:26:14Z

✅ Actions performed

Full review triggered.

orouz · 2026-04-26T09:55:33Z

@coderabbitai full review

coderabbitai · 2026-04-26T09:55:39Z

✅ Actions performed

Full review triggered.

coderabbitai · 2026-04-26T09:56:14Z

✅ Actions performed

Full review triggered.

coderabbitai · 2026-04-26T10:06:18Z

📝 Walkthrough

Walkthrough

Engine descriptor log-extraction fields are made explicitly nullable with default null. A new engine_descriptor model version 5 is added with a data backfill that maps existing optional fields into the new runtime cursor fields and normalizes error to null. The EngineDescriptorClient.updateWith API was removed; persistence now uses update(entityType, state, { mergeAttributes }). Code, fixtures, snapshots, and tests were updated to persist cleared pagination/cursor fields as null and to treat paginationId: null as undefined when building recovery queries. The public status mapper converts a null lastExecutionTimestamp to undefined.

🚥 Pre-merge checks | ✅ 2

✅ Passed checks (2 passed)

Check name	Status	Explanation
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

🛠️ Update Documentation: Commit on current branch
🛠️ Update Documentation: Create PR

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai · 2026-04-26T10:25:40Z

✅ Actions performed

Full review triggered.

coderabbitai · 2026-04-26T10:26:15Z

✅ Actions performed

Full review triggered.

coderabbitai · 2026-04-26T10:55:40Z

✅ Actions performed

Full review triggered.

orouz · 2026-04-26T11:21:57Z

@coderabbitai full review

coderabbitai · 2026-04-26T11:22:03Z

✅ Actions performed

Full review triggered.

…tion_tests/ci_checks

coderabbitai · 2026-04-26T11:52:04Z

✅ Actions performed

Full review triggered.

coderabbitai · 2026-04-26T12:22:04Z

✅ Actions performed

Full review triggered.

kibanamachine · 2026-04-26T13:22:46Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: feac50e

Failed CI Steps

Test Failures

[job] [logs] affected Scout: [ observability / apm ] plugin / local-serverless-observability_complete - Custom links template validation - Create custom link with template URL and filters

Metrics [docs]

✅ unchanged

History

💔 Build #433899 failed a75d0a8
💔 Build #433898 failed a95b418

coderabbitai

♻️ Duplicate comments (1)

x-pack/solutions/security/plugins/entity_store/server/domain/saved_objects/engine_descriptor/types.ts (1)
246-253: ⚠️ Potential issue | 🟠 Major

Normalize legacy empty-string paginationId during the v5 backfill.

Line 252 still preserves '' from the v2 migration (paginationId ?? ''), so preexisting descriptors will not actually move to the new null sentinel after upgrading. That leaves migrated docs with mixed cursor semantics and can keep recovery logic on the legacy empty-string path.
🐛 Proposed fix
-              paginationId: logExtractionState?.paginationId ?? null,
+              paginationId:
+                logExtractionState?.paginationId === ''
+                  ? null
+                  : logExtractionState?.paginationId ?? null,
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In
`@x-pack/solutions/security/plugins/entity_store/server/domain/saved_objects/engine_descriptor/types.ts`
around lines 246 - 253, The backfillFn currently preserves the legacy
empty-string sentinel for paginationId, so update the v5 backfill to normalize
'' to null: inside backfillFn (and the logExtractionState handling) compute
paginationId from document.attributes.logExtractionState and if it's exactly the
empty string set it to null, otherwise keep its value or default to null;
reference the backfillFn, logExtractionState, and paginationId identifiers when
making this change.

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Duplicate comments:
In
`@x-pack/solutions/security/plugins/entity_store/server/domain/saved_objects/engine_descriptor/types.ts`:
- Around line 246-253: The backfillFn currently preserves the legacy
empty-string sentinel for paginationId, so update the v5 backfill to normalize
'' to null: inside backfillFn (and the logExtractionState handling) compute
paginationId from document.attributes.logExtractionState and if it's exactly the
empty string set it to null, otherwise keep its value or default to null;
reference the backfillFn, logExtractionState, and paginationId identifiers when
making this change.

ℹ️ Review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: c10dabf1-4268-4604-a13e-48e38c2659bd

📥 Commits

Reviewing files that changed from the base of the PR and between b670aab and feac50e.

📒 Files selected for processing (8)

packages/kbn-check-saved-objects-cli/src/migrations/__fixtures__/entity-engine-descriptor-v2/10.5.0.json
src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
x-pack/solutions/security/plugins/entity_store/server/domain/logs_extraction/logs_extraction_client.test.ts
x-pack/solutions/security/plugins/entity_store/server/domain/logs_extraction/logs_extraction_client.ts
x-pack/solutions/security/plugins/entity_store/server/domain/saved_objects/engine_descriptor/constants.ts
x-pack/solutions/security/plugins/entity_store/server/domain/saved_objects/engine_descriptor/index.ts
x-pack/solutions/security/plugins/entity_store/server/domain/saved_objects/engine_descriptor/types.ts
x-pack/solutions/security/plugins/entity_store/server/routes/apis/status.ts

kibanamachine · 2026-04-26T13:52:22Z

Starting backport for target branches: 9.4

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

kibanamachine · 2026-04-26T14:01:00Z

💚 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

# Backport This will backport the following commits from `main` to `9.4`: - [[Entity Store] Make schema properties nullable (#264509)](#264509)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: orouz <or.ouziel@elastic.co>

orouz added release_note:skip Skip the PR/issue when compiling release notes backport:skip This PR does not require backporting Entity Store (Next) Team:Core Analysis Security Solution labels Apr 20, 2026

macroscopeapp Bot reviewed Apr 20, 2026

View reviewed changes

Comment thread ...lutions/security/plugins/entity_store/server/domain/saved_objects/engine_descriptor/types.ts

orouz force-pushed the entity_store_flk_fix2 branch from eb717be to a35b9a7 Compare April 21, 2026 12:10

orouz force-pushed the entity_store_flk_fix2 branch from a35b9a7 to 4a69d89 Compare April 21, 2026 14:23

orouz force-pushed the entity_store_flk_fix2 branch from 4a69d89 to 9ca5665 Compare April 21, 2026 14:36

orouz marked this pull request as ready for review April 23, 2026 08:46

orouz requested review from a team as code owners April 23, 2026 08:46

infra-vault-gh-plugin-prod Bot deleted a comment from elasticmachine Apr 23, 2026

kubasobon approved these changes Apr 23, 2026

View reviewed changes

Comment thread ...s/security/plugins/entity_store/server/domain/logs_extraction/logs_extraction_client.test.ts

Comment thread ...utions/security/plugins/entity_store/server/domain/logs_extraction/logs_extraction_client.ts Outdated

orouz force-pushed the entity_store_flk_fix2 branch from 7371004 to c43f925 Compare April 23, 2026 10:07

orouz added backport:version Backport to applied version labels v9.4.0 and removed backport:skip This PR does not require backporting labels Apr 23, 2026

remove error schema oneOf changes

a95b418

orouz force-pushed the entity_store_flk_fix2 branch from 1afb2cf to a95b418 Compare April 26, 2026 08:06

update SO type snapshots

a75d0a8

orouz force-pushed the entity_store_flk_fix2 branch from 8351e52 to a75d0a8 Compare April 26, 2026 09:54

schema fix

2f58c1c

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

feac50e

…tion_tests/ci_checks

coderabbitai Bot reviewed Apr 26, 2026

View reviewed changes

orouz merged commit 135ed57 into elastic:main Apr 26, 2026
18 checks passed

kibanamachine added the v9.5.0 label Apr 26, 2026

kibanamachine mentioned this pull request Apr 26, 2026

[9.4] [Entity Store] Make schema properties nullable (#264509) #265675

Merged

rbrtj pushed a commit to walterra/kibana that referenced this pull request Apr 27, 2026

[Entity Store] Make schema properties nullable (elastic#264509)

e9dbb7b

SoniaSanzV pushed a commit to SoniaSanzV/kibana that referenced this pull request Apr 27, 2026

[Entity Store] Make schema properties nullable (elastic#264509)

254e91d

Conversation

orouz commented Apr 20, 2026 • edited by kibanamachine Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

orouz commented Apr 20, 2026

Uh oh!

kibanamachine commented Apr 20, 2026

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11758

Uh oh!

Uh oh!

kibanamachine commented Apr 20, 2026

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11758

Uh oh!

orouz commented Apr 21, 2026

Uh oh!

kibanamachine commented Apr 21, 2026

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11769

Uh oh!

kibanamachine commented Apr 21, 2026

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11769

Uh oh!

orouz commented Apr 21, 2026

Uh oh!

kibanamachine commented Apr 21, 2026

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11772

Uh oh!

kibanamachine commented Apr 21, 2026

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11772

Uh oh!

orouz commented Apr 21, 2026

Uh oh!

kibanamachine commented Apr 21, 2026

Flaky Test Runner

✅ Build triggered - kibana-flaky-test-suite-runner#11779

Uh oh!

kibanamachine commented Apr 21, 2026

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#11779

Uh oh!

kubasobon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

orouz commented Apr 26, 2026

Uh oh!

uri-weisman commented Apr 26, 2026

Uh oh!

coderabbitai Bot commented Apr 26, 2026

Uh oh!

orouz commented Apr 26, 2026

Uh oh!

coderabbitai Bot commented Apr 26, 2026

Uh oh!

coderabbitai Bot commented Apr 26, 2026

Uh oh!

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

Uh oh!

Walkthrough

Uh oh!

coderabbitai Bot commented Apr 26, 2026

Uh oh!

coderabbitai Bot commented Apr 26, 2026

Uh oh!

coderabbitai Bot commented Apr 26, 2026

Uh oh!

orouz commented Apr 26, 2026

Uh oh!

coderabbitai Bot commented Apr 26, 2026

Uh oh!

coderabbitai Bot commented Apr 26, 2026

Uh oh!

coderabbitai Bot commented Apr 26, 2026

Uh oh!

orouz commented Apr 20, 2026 •

edited by kibanamachine

Loading

coderabbitai Bot commented Apr 26, 2026 •

edited

Loading