Skip to content

Commit 4e0fd1d

Browse files
committed
Merge remote-tracking branch 'origin/main' into ES-12000_add_write_load_modeling_to_balancer
2 parents beb2611 + efd3110 commit 4e0fd1d

File tree

248 files changed

+3139
-3126
lines changed

Some content is hidden

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

248 files changed

+3139
-3126
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/patches/awsv2sdk/Awsv2ClassPatcher.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/patches/awsv2sdk/StringFormatInPathResolverPatcher.java

Lines changed: 0 additions & 89 deletions
This file was deleted.

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jna = 5.12.1
1717
netty = 4.1.118.Final
1818
commons_lang3 = 3.9
1919
google_oauth_client = 1.34.1
20-
awsv2sdk = 2.30.38
20+
awsv2sdk = 2.31.78
2121
reactive_streams = 1.0.4
2222

2323
antlr4 = 4.13.1

docs/changelog/121914.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 121914
2+
summary: Support Fields API in conditional ingest processors
3+
area: Infra/Core
4+
type: feature
5+
issues: []

docs/changelog/129090.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 129090
2+
summary: Enable force inference endpoint deleting for invalid models and after stopping
3+
model deployment fails
4+
area: Machine Learning
5+
type: enhancement
6+
issues: []

docs/changelog/131050.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 131050
2+
summary: Upgrade AWS Java SDK to 2.31.78
3+
area: "Snapshot/Restore"
4+
type: upgrade
5+
issues: []
6+

docs/docset.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,6 @@ subs:
111111
feat-imp: "feature importance"
112112
feat-imp-cap: "Feature importance"
113113
nlp: "natural language processing"
114+
index-manage-app: "Index Management"
115+
connectors-app: "Connectors"
116+
ingest-pipelines-app: "Ingest Pipelines"

docs/internal/GeneralArchitectureGuide.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,20 @@ See the [public upgrade docs][] for the upgrade process.
298298

299299
(what plugins do we have?)
300300

301+
# Observability
302+
303+
Elasticsearch emits logs as described in the [public logging docs][], and exposes a good deal of information about its inner workings using
304+
all its management and stats APIs. Elasticsearch also integrates with the [Elastic APM Java agent][] to perform distributed tracing (as
305+
described in [TRACING.md][]) and metrics collection (as described in [METERING.md][]). This agent exposes the data it collects to an
306+
[OpenTelemetry][] service such as [Elastic APM Server][].
307+
308+
[public logging docs]: https://www.elastic.co/docs/deploy-manage/monitor/logging-configuration
309+
[Elastic APM Java agent]: https://www.elastic.co/docs/reference/apm/agents/java
310+
[OpenTelemetry]: https://opentelemetry.io/
311+
[Elastic APM Server]: https://www.elastic.co/docs/solutions/observability/apm
312+
[TRACING.md]: https://github.com/elastic/elasticsearch/blob/v8.18.3/TRACING.md
313+
[METERING.md]: https://github.com/elastic/elasticsearch/blob/v8.18.3/modules/apm/METERING.md
314+
301315
# Testing
302316

303317
(Overview of our testing frameworks. Discuss base test classes.)

docs/reference/query-languages/esql.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ This reference section provides detailed technical information about {{esql}} fe
2020
* [Advanced workflows](esql/esql-advanced.md): Learn how to handle more complex tasks with these guides, including how to extract, transform, and combine data from multiple indices
2121
* [Types and fields](esql/esql-types-and-fields.md): Learn about how {{esql}} handles different data types and special fields
2222
* [Limitations](esql/limitations.md): Learn about the current limitations of {{esql}}
23-
* [Examples](esql/esql-examples.md): Explore some example queries
23+
* [Examples](esql/esql-examples.md): Explore some example queries
24+
* [Troubleshooting](esql/esql-troubleshooting.md): Learn how to diagnose and resolve issues with {{esql}}

docs/reference/query-languages/esql/_snippets/functions/layout/match_phrase.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)