Skip to content

Commit ffe911b

Browse files
committed
Merge main into multi-project
2 parents 08b818a + 2fe6b60 commit ffe911b

File tree

237 files changed

+2575
-938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+2575
-938
lines changed

distribution/src/config/log4j2.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ appender.deprecation_rolling.name = deprecation_rolling
6363
appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.json
6464
appender.deprecation_rolling.layout.type = ECSJsonLayout
6565
# Intentionally follows a different pattern to above
66-
appender.deprecation_rolling.layout.dataset = deprecation.elasticsearch
66+
appender.deprecation_rolling.layout.dataset = elasticsearch.deprecation
6767
appender.deprecation_rolling.filter.rate_limit.type = RateLimitingFilter
6868

6969
appender.deprecation_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation-%i.json.gz

docs/changelog/117792.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 117792
2+
summary: Address mapping and compute engine runtime field issues
3+
area: Mapping
4+
type: bug
5+
issues:
6+
- 117644

docs/changelog/117898.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117898
2+
summary: Limit size of query
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/117914.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117914
2+
summary: Fix for propagating filters from compound to inner retrievers
3+
area: Ranking
4+
type: bug
5+
issues: []

docs/changelog/117917.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117917
2+
summary: Add option to store `sparse_vector` outside `_source`
3+
area: Mapping
4+
type: feature
5+
issues: []

docs/changelog/117933.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
pr: 117933
2+
summary: Change `deprecation.elasticsearch` keyword to `elasticsearch.deprecation`
3+
area: Infra/Logging
4+
type: bug
5+
issues:
6+
- 83251
7+
breaking:
8+
title: Deprecation logging value change for "data_stream.dataset" and "event.dataset"
9+
area: Logging
10+
details: |-
11+
This change modifies the "data_stream.dataset" and "event.dataset" value for deprecation logging
12+
to use the value `elasticsearch.deprecation` instead of `deprecation.elasticsearch`. This is now
13+
consistent with other values where the name of the service is the first part of the key.
14+
impact: |-
15+
If you are directly consuming deprecation logs for "data_stream.dataset" and "event.dataset" and filtering on
16+
this value, you will need to update your filters to use `elasticsearch.deprecation` instead of
17+
`deprecation.elasticsearch`.
18+
notable: false

docs/changelog/117953.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117953
2+
summary: Acquire stats searcher for data stream stats
3+
area: Data streams
4+
type: bug
5+
issues: []

docs/reference/mapping/types/sparse-vector.asciidoc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,23 @@ PUT my-index
2626

2727
See <<semantic-search-elser, semantic search with ELSER>> for a complete example on adding documents to a `sparse_vector` mapped field using ELSER.
2828

29+
[[sparse-vectors-params]]
30+
==== Parameters for `sparse_vector` fields
31+
32+
The following parameters are accepted by `sparse_vector` fields:
33+
34+
[horizontal]
35+
36+
<<mapping-store,store>>::
37+
38+
Indicates whether the field value should be stored and retrievable independently of the <<mapping-source-field,_source>> field.
39+
Accepted values: true or false (default).
40+
The field's data is stored using term vectors, a disk-efficient structure compared to the original JSON input.
41+
The input map can be retrieved during a search request via the <<search-fields-param,`fields` parameter>>.
42+
To benefit from reduced disk usage, you must either:
43+
* Exclude the field from <<source-filtering, _source>>.
44+
* Use <<synthetic-source,synthetic `_source`>>.
45+
2946
[[index-multi-value-sparse-vectors]]
3047
==== Multi-value sparse vectors
3148

docs/reference/search/retriever.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -765,11 +765,11 @@ clauses in a <<query-dsl-bool-query, boolean query>>.
765765
[[retriever-restrictions]]
766766
==== Restrictions on search parameters when specifying a retriever
767767

768-
When a retriever is specified as part of a search, the following elements are not allowed at the top-level.
769-
Instead they are only allowed as elements of specific retrievers:
768+
When a retriever is specified as part of a search, the following elements are not allowed at the top-level:
770769

771770
* <<request-body-search-query, `query`>>
772771
* <<search-api-knn, `knn`>>
773772
* <<search-after, `search_after`>>
774773
* <<request-body-search-terminate-after, `terminate_after`>>
775774
* <<search-sort-param, `sort`>>
775+
* <<rescore, `rescore`>>

libs/entitlement/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
requires static org.elasticsearch.entitlement.bridge; // At runtime, this will be in java.base
1818

1919
exports org.elasticsearch.entitlement.runtime.api;
20+
exports org.elasticsearch.entitlement.runtime.policy;
2021
exports org.elasticsearch.entitlement.instrumentation;
2122
exports org.elasticsearch.entitlement.bootstrap to org.elasticsearch.server;
2223
exports org.elasticsearch.entitlement.initialization to java.base;

0 commit comments

Comments
 (0)