Skip to content

Commit 21e3dfb

Browse files
Merge branch '8.x' into 8-x-backport-114337
2 parents 52f0943 + c6d59e8 commit 21e3dfb

File tree

64 files changed

+1964
-414
lines changed

Some content is hidden

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

64 files changed

+1964
-414
lines changed

docs/changelog/111336.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 111336
2+
summary: Use the same chunking configurations for models in the Elasticsearch service
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

docs/changelog/114109.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114109
2+
summary: Update cluster stats for retrievers
3+
area: Search
4+
type: enhancement
5+
issues: []

docs/changelog/114321.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114321
2+
summary: Stream Anthropic Completion
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

docs/changelog/114358.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114358
2+
summary: "ESQL: Use less memory in listener"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/114375.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114375
2+
summary: Handle `InternalSendException` inline for non-forking handlers
3+
area: Distributed
4+
type: bug
5+
issues: []

docs/reference/cluster/stats.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,10 @@ Queries are counted once per search request, meaning that if the same query type
762762
(object) Search sections used in selected nodes.
763763
For each section, name and number of times it's been used is reported.
764764

765+
`retrievers`::
766+
(object) Retriever types that were used in selected nodes.
767+
For each retriever, name and number of times it's been used is reported.
768+
765769
=====
766770
767771
`dense_vector`::

docs/reference/ingest/processors.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ Executes another pipeline.
185185
<<reroute-processor, `reroute` processor>>::
186186
Reroutes documents to another target index or data stream.
187187

188+
<<terminate-processor, `terminate` processor>>::
189+
Terminates the current ingest pipeline, causing no further processors to be run.
190+
188191
[discrete]
189192
[[ingest-process-category-array-json-handling]]
190193
=== Array/JSON handling processors
@@ -258,6 +261,7 @@ include::processors/set.asciidoc[]
258261
include::processors/set-security-user.asciidoc[]
259262
include::processors/sort.asciidoc[]
260263
include::processors/split.asciidoc[]
264+
include::processors/terminate.asciidoc[]
261265
include::processors/trim.asciidoc[]
262266
include::processors/uppercase.asciidoc[]
263267
include::processors/url-decode.asciidoc[]

modules/data-streams/src/test/java/org/elasticsearch/datastreams/MetadataIndexTemplateServiceTests.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.cluster.ClusterState;
1414
import org.elasticsearch.cluster.metadata.ComponentTemplate;
1515
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
16-
import org.elasticsearch.cluster.metadata.DataStreamFactoryRetention;
1716
import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
1817
import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
1918
import org.elasticsearch.cluster.metadata.MetadataCreateIndexService;
@@ -217,10 +216,7 @@ private MetadataIndexTemplateService getMetadataIndexTemplateService() {
217216
xContentRegistry(),
218217
EmptySystemIndices.INSTANCE,
219218
indexSettingProviders,
220-
DataStreamGlobalRetentionSettings.create(
221-
ClusterSettings.createBuiltInClusterSettings(),
222-
DataStreamFactoryRetention.emptyFactoryRetention()
223-
)
219+
DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings())
224220
);
225221
}
226222

modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsActionTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.elasticsearch.cluster.ClusterName;
1313
import org.elasticsearch.cluster.ClusterState;
1414
import org.elasticsearch.cluster.metadata.DataStream;
15-
import org.elasticsearch.cluster.metadata.DataStreamFactoryRetention;
1615
import org.elasticsearch.cluster.metadata.DataStreamGlobalRetention;
1716
import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
1817
import org.elasticsearch.cluster.metadata.DataStreamTestHelper;
@@ -47,8 +46,7 @@ public class TransportGetDataStreamsActionTests extends ESTestCase {
4746
private final IndexNameExpressionResolver resolver = TestIndexNameExpressionResolver.newInstance();
4847
private final SystemIndices systemIndices = new SystemIndices(List.of());
4948
private final DataStreamGlobalRetentionSettings dataStreamGlobalRetentionSettings = DataStreamGlobalRetentionSettings.create(
50-
ClusterSettings.createBuiltInClusterSettings(),
51-
DataStreamFactoryRetention.emptyFactoryRetention()
49+
ClusterSettings.createBuiltInClusterSettings()
5250
);
5351

5452
public void testGetDataStream() {
@@ -356,8 +354,7 @@ public void testPassingGlobalRetention() {
356354
)
357355
.put(DataStreamGlobalRetentionSettings.DATA_STREAMS_MAX_RETENTION_SETTING.getKey(), globalRetention.maxRetention())
358356
.build()
359-
),
360-
DataStreamFactoryRetention.emptyFactoryRetention()
357+
)
361358
);
362359
response = TransportGetDataStreamsAction.innerOperation(
363360
state,

modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.elasticsearch.cluster.block.ClusterBlock;
3838
import org.elasticsearch.cluster.block.ClusterBlocks;
3939
import org.elasticsearch.cluster.metadata.DataStream;
40-
import org.elasticsearch.cluster.metadata.DataStreamFactoryRetention;
4140
import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
4241
import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
4342
import org.elasticsearch.cluster.metadata.DataStreamLifecycle.Downsampling;
@@ -142,8 +141,7 @@ public class DataStreamLifecycleServiceTests extends ESTestCase {
142141
private DoExecuteDelegate clientDelegate;
143142
private ClusterService clusterService;
144143
private final DataStreamGlobalRetentionSettings globalRetentionSettings = DataStreamGlobalRetentionSettings.create(
145-
ClusterSettings.createBuiltInClusterSettings(),
146-
DataStreamFactoryRetention.emptyFactoryRetention()
144+
ClusterSettings.createBuiltInClusterSettings()
147145
);
148146

149147
@Before

0 commit comments

Comments
 (0)