Commit 8919361
authored
[Entity Resolution] unflatten dotted keys in bulkUpdateEntityDocs (elastic#260651)
## Summary
Fixes elastic#260551
Entity Resolution's `bulkUpdateEntityDocs` sent flat dotted keys (for
example `entity.relationships.resolution.resolved_to`) straight to
Elasticsearch bulk `update`. The entity store latest index has a
`dot_expander` ingest pipeline configured as `default_pipeline`, but
**ES bulk partial `update` with `doc` does not run `default_pipeline`**
— this is a known upstream ES bug
([elastic/elasticsearch#105804](elastic/elasticsearch#105804),
fix PR [elastic#105805](elastic/elasticsearch#105805)
targeted for ES v9.4.0).
As a result, fields were stored as literal flat keys in `_source` next
to the nested `entity` object. That dual shape could surface as
`ChainResolutionError` when the automated resolution maintainer races
with manual or CSV resolution.
This change runs each bulk partial `doc` through `unflattenObject` from
`@kbn/object-utils` — the same pattern used by entity store CRUD routes
(e.g., `bulk_update.ts` line 23) — so updates merge into the nested
`entity` tree correctly. Once the upstream ES fix lands, this becomes a
harmless no-op.
### Checklist
- [ ] 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)
- [ ] 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)
- [x] Review the [backport
guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)
and apply applicable `backport:*` labels.
### Identify risks
- **Regression for callers that intentionally pass flat keys:** Low
severity. `unflattenObject` is the same helper used elsewhere in
entity_store for API payloads; nested-only docs pass through unchanged.
- **Bulk update shape:** Low severity. ES merge behavior improves
(nested merge vs literal dotted field names).1 parent d0c0abb commit 8919361
3 files changed
Lines changed: 54 additions & 6 deletions
File tree
- x-pack/solutions/security/plugins/entity_store
- server
- domain/resolution
- infra/elasticsearch
- test/scout/api/tests
Lines changed: 47 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
114 | 152 | | |
115 | 153 | | |
116 | 154 | | |
| |||
313 | 351 | | |
314 | 352 | | |
315 | 353 | | |
316 | | - | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
317 | 363 | | |
318 | 364 | | |
319 | 365 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
109 | 110 | | |
110 | 111 | | |
111 | 112 | | |
112 | | - | |
| 113 | + | |
113 | 114 | | |
114 | 115 | | |
115 | 116 | | |
| |||
Lines changed: 5 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
79 | 80 | | |
80 | 81 | | |
81 | 82 | | |
82 | | - | |
| 83 | + | |
83 | 84 | | |
84 | 85 | | |
85 | | - | |
| 86 | + | |
86 | 87 | | |
87 | 88 | | |
88 | 89 | | |
| |||
215 | 216 | | |
216 | 217 | | |
217 | 218 | | |
218 | | - | |
| 219 | + | |
219 | 220 | | |
220 | 221 | | |
221 | | - | |
| 222 | + | |
222 | 223 | | |
223 | 224 | | |
224 | 225 | | |
| |||
0 commit comments