Skip to content

Commit b321464

Browse files
ivanceaivancea
committed
Merge branch 'main' into fix-sample-operator-serialization
# Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java
2 parents 5af1d5e + a692cbd commit b321464

File tree

161 files changed

+6678
-615
lines changed

Some content is hidden

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

161 files changed

+6678
-615
lines changed

‎docs/changelog/130092.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130092
2+
summary: "Added Llama provider support to the Inference Plugin"
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/131395.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131395
2+
summary: Enable failure store for newly created OTel data streams
3+
area: Data streams
4+
type: enhancement
5+
issues: []

‎docs/changelog/131426.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 131426
2+
summary: Disallow remote enrich after lu join
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 129372

‎docs/changelog/131442.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131442
2+
summary: Track inference deployments
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/131510.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131510
2+
summary: Upgrade apm-agent to 1.55.0
3+
area: Infra/Metrics
4+
type: upgrade
5+
issues: []

‎docs/changelog/131525.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 131525
2+
summary: Fix semantic highlighting bug on flat quantized fields
3+
area: Highlighting
4+
type: bug
5+
issues:
6+
- 131443

‎docs/reference/elasticsearch/index-settings/slow-log.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Events that meet the specified threshold are emitted into [{{es}} logging](docs-
2020
* If [{{es}} monitoring](docs-content://deploy-manage/monitor/stack-monitoring.md) is enabled, from [Stack Monitoring](docs-content://deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md). Slow log events have a `logger` value of `index.search.slowlog` or `index.indexing.slowlog`.
2121
* From local {{es}} service logs directory. Slow log files have a suffix of `_index_search_slowlog.json` or `_index_indexing_slowlog.json`.
2222

23+
See this [this video](https://www.youtube.com/watch?v=ulUPJshB5bU) for a walkthrough of setting and reviewing slow logs.
2324

2425
## Slow log format [slow-log-format]
2526

‎docs/reference/query-languages/esql/_snippets/operators/detailedDescription/rlike.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ROW message = "foo ( bar"
1818
```
1919

2020
```{applies_to}
21-
stack: ga 9.1
21+
stack: ga 9.2
2222
serverless: ga
2323
```
2424

‎gradle/verification-metadata.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
<sha256 value="10fe288fd7a2cdaf5175332b73529f9abf8fd54dcfff317d6967c0c35ffb133b" origin="Generated by Gradle"/>
7272
</artifact>
7373
</component>
74-
<component group="co.elastic.apm" name="elastic-apm-agent" version="1.52.2">
75-
<artifact name="elastic-apm-agent-1.52.2.jar">
76-
<sha256 value="dee18355a06f66a425bd597d6447ccbe7e8b7a3c0667adb7b30da173e31044e0" origin="Generated by Gradle"/>
74+
<component group="co.elastic.apm" name="elastic-apm-agent" version="1.55.0">
75+
<artifact name="elastic-apm-agent-1.55.0.jar">
76+
<sha256 value="3cbba96a64593c14568399dbc816fc36a5647e39449e1d4cf1eedce9880a9d3e" origin="Generated by Gradle"/>
7777
</artifact>
7878
</component>
7979
<component group="co.elastic.logging" name="ecs-logging-core" version="1.2.0">

‎libs/x-content/src/main/java/org/elasticsearch/xcontent/ConstructingObjectParser.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,27 @@ public <T> void declareField(BiConsumer<Value, T> consumer, ContextParser<Contex
220220
}
221221
}
222222

223+
/**
224+
* Declare a field that is an array of objects or null. Used to avoid calling the consumer when used with
225+
* {@link #optionalConstructorArg()} or {@link #constructorArg()}.
226+
* @param consumer Consumer that will be passed as is to the {@link #declareField(BiConsumer, ContextParser, ParseField, ValueType)}.
227+
* @param objectParser Parser that will parse the objects in the array, checking for nulls.
228+
* @param field Field to declare.
229+
*/
230+
@Override
231+
public <T> void declareObjectArrayOrNull(
232+
BiConsumer<Value, List<T>> consumer,
233+
ContextParser<Context, T> objectParser,
234+
ParseField field
235+
) {
236+
declareField(
237+
consumer,
238+
(p, c) -> p.currentToken() == XContentParser.Token.VALUE_NULL ? null : parseArray(p, c, objectParser),
239+
field,
240+
ValueType.OBJECT_ARRAY_OR_NULL
241+
);
242+
}
243+
223244
@Override
224245
public <T> void declareNamedObject(
225246
BiConsumer<Value, T> consumer,

0 commit comments

Comments
 (0)