Skip to content

Commit 1bcaa06

Browse files
authored
Merge branch '8.x' into 8x-inference-index-fix
2 parents a85b6c3 + 16b472c commit 1bcaa06

File tree

21 files changed

+1122
-247
lines changed

21 files changed

+1122
-247
lines changed

docs/changelog/113588.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 113588
2+
summary: Add asset criticality indices for `kibana_system_user`
3+
area: Security
4+
type: enhancement
5+
issues: []

docs/changelog/114742.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114742
2+
summary: Adding support for additional mapping to simulate ingest API
3+
area: Ingest Node
4+
type: enhancement
5+
issues: []

docs/changelog/114774.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114774
2+
summary: "ESQL: Add support for multivalue fields in Arrow output"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/reference/ingest/apis/simulate-ingest.asciidoc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,14 @@ POST /_ingest/_simulate
108108
"index_patterns": ["my-index-*"],
109109
"composed_of": ["component_template_1", "component_template_2"]
110110
}
111+
},
112+
"mapping_addition": { <4>
113+
"dynamic": "strict",
114+
"properties": {
115+
"foo": {
116+
"type": "keyword"
117+
}
118+
}
111119
}
112120
}
113121
----
@@ -117,6 +125,7 @@ POST /_ingest/_simulate
117125
These templates can be used to change the pipeline(s) used, or to modify the mapping that will be used to validate the result.
118126
<3> This replaces the existing `my-index-template` index template with the contents given here for the duration of this request.
119127
These templates can be used to change the pipeline(s) used, or to modify the mapping that will be used to validate the result.
128+
<4> This mapping is merged into the index's final mapping just before validation. It is used only for the duration of this request.
120129

121130
[[simulate-ingest-api-request]]
122131
==== {api-request-title}
@@ -246,6 +255,10 @@ include::{es-ref-dir}/indices/put-index-template.asciidoc[tag=request-body]
246255
247256
====
248257

258+
`mapping_addition`::
259+
(Optional, <<mapping,mapping object>>)
260+
Definition of a mapping that will be merged into the index's mapping for validation during the course of this request.
261+
249262
[[simulate-ingest-api-example]]
250263
==== {api-examples-title}
251264

muted-tests.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,9 @@ tests:
309309
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
310310
method: test {categorize.Categorize ASYNC}
311311
issue: https://github.com/elastic/elasticsearch/issues/113721
312+
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
313+
method: test {categorize.Categorize SYNC}
314+
issue: https://github.com/elastic/elasticsearch/issues/113722
312315
- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
313316
method: testMinimumVersionSameAsNewVersion
314317
issue: https://github.com/elastic/elasticsearch/issues/114593
@@ -371,6 +374,11 @@ tests:
371374
- class: org.elasticsearch.reservedstate.service.FileSettingsServiceTests
372375
method: testProcessFileChanges
373376
issue: https://github.com/elastic/elasticsearch/issues/115280
377+
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
378+
issue: https://github.com/elastic/elasticsearch/issues/115315
379+
- class: org.elasticsearch.upgrades.UpgradeClusterClientYamlTestSuiteIT
380+
method: test {p0=mixed_cluster/80_transform_jobs_crud/Test GET, start, and stop old cluster batch transforms}
381+
issue: https://github.com/elastic/elasticsearch/issues/115319
374382

375383
# Examples:
376384
#

0 commit comments

Comments
 (0)