Skip to content

Commit 96951c7

Browse files
svilen-mihaylov-elasticsvilen-mihaylov-elastic
committed
Merge branch 'svilen/127208' of https://github.com/svilen-mihaylov-elastic/elasticsearch into svilen/127208
2 parents 15480b6 + 666382c commit 96951c7

File tree

139 files changed

+3681
-1377
lines changed

Some content is hidden

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

139 files changed

+3681
-1377
lines changed

‎.github/workflows/gradle-wrapper-validation.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ jobs:
1010
if: github.repository == 'elastic/elasticsearch'
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # Release v2.1.1
13+
- uses: actions/checkout@v4
14+
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # Release v4.4.1

‎build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111

1212
public enum Architecture {
1313

14-
X64("x86_64", "linux/amd64"),
15-
AARCH64("aarch64", "linux/arm64");
14+
X64("x86_64", "linux/amd64", "amd64"),
15+
AARCH64("aarch64", "linux/arm64", "arm64");
1616

1717
public final String classifier;
1818
public final String dockerPlatform;
19+
public final String dockerClassifier;
1920

20-
Architecture(String classifier, String dockerPlatform) {
21+
Architecture(String classifier, String dockerPlatform, String dockerClassifier) {
2122
this.classifier = classifier;
2223
this.dockerPlatform = dockerPlatform;
24+
this.dockerClassifier = dockerClassifier;
2325
}
2426

2527
public static Architecture current() {

‎distribution/docker/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ subprojects { Project subProject ->
659659
it.setCompression(Compression.GZIP)
660660
it.getArchiveBaseName().set("elasticsearch${base.suffix}-${VersionProperties.elasticsearch}-docker-image")
661661
it.getArchiveVersion().set("")
662-
it.getArchiveClassifier().set(architecture == Architecture.AARCH64 ? 'aarch64' : '')
662+
it.getArchiveClassifier().set(architecture.dockerClassifier)
663663
it.getDestinationDirectory().set(new File(project.parent.buildDir, 'distributions'))
664664
it.dependsOn(exportTask)
665665
}

‎docs/changelog/129369.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 129369
2+
summary: Support semantic reranking using contextual snippets instead of entire field
3+
text
4+
area: Relevance
5+
type: enhancement
6+
issues: []

‎docs/changelog/131581.yaml‎

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

‎docs/changelog/131680.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131680
2+
summary: Grant server module read/write entitlements for deprecated path setting "path.shared_data"
3+
area: Infra/Core
4+
type: bug
5+
issues: []

‎docs/changelog/131694.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131694
2+
summary: Accept unsigned longs on MAX and MIN aggregations
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/131711.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131711
2+
summary: Track & log when there is insufficient disk space available to execute merges
3+
area: Engine
4+
type: enhancement
5+
issues: []

‎docs/changelog/131723.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131723
2+
summary: Tests for FORK's evaluation of field names used in `field_caps` resolve calls
3+
area: Search
4+
type: bug
5+
issues: []

‎docs/reference/elasticsearch-plugins/discovery-ec2-usage.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
applies_to:
3+
stack: ga
24
mapped_pages:
35
- https://www.elastic.co/guide/en/elasticsearch/plugins/current/discovery-ec2-usage.html
46
---
@@ -45,6 +47,9 @@ The available settings for the EC2 discovery plugin are as follows.
4547
`discovery.ec2.endpoint`
4648
: The EC2 service endpoint to which to connect. See [https://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region](https://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region) to find the appropriate endpoint for the region. This setting defaults to `ec2.us-east-1.amazonaws.com` which is appropriate for clusters running in the `us-east-1` region.
4749

50+
`discovery.ec2.protocol` {applies_to}`stack: deprecated 9.1`
51+
: The protocol to use to connect to the EC2 service endpoint, which may be either `http` or `https`. Defaults to `https`. This setting does not operate from version 9.1 and higher.
52+
4853
`discovery.ec2.proxy.host`
4954
: The address or host name of an HTTP proxy through which to connect to EC2. If not set, no proxy is used.
5055

0 commit comments

Comments
 (0)