Skip to content

Commit 6bd2937

Browse files
julian-elasticjulian-elastic
committed
Merge branch 'main' into lookupJoin
2 parents bae7007 + 3212ec2 commit 6bd2937

File tree

142 files changed

+3593
-1388
lines changed

Some content is hidden

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

142 files changed

+3593
-1388
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
}

‎distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:799fc6d2ed4e9be0b1f2a05b92a593f69de19525061088bd1432fcd27048cc87 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:69f3df4cc5fd08b194a1a44dda2ff9f6665ac2b59063a2b2aedb8948ebd87f97 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -103,7 +103,7 @@ WORKDIR /usr/share/elasticsearch/config
103103
# Add entrypoint
104104
################################################################################
105105

106-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:799fc6d2ed4e9be0b1f2a05b92a593f69de19525061088bd1432fcd27048cc87
106+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:69f3df4cc5fd08b194a1a44dda2ff9f6665ac2b59063a2b2aedb8948ebd87f97
107107

108108
RUN <%= retry.loop(package_manager,
109109
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:fdfd7f357a09f933ab22143273849f8b247360f2f94f4dc2ea473001c59f9f0b AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:1c4caa90ee9cf26c9143e44074f50ba9bb17636823bde4397751a5e0d846bfd6 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -79,7 +79,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
7979
# Add entrypoint
8080
################################################################################
8181

82-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:fdfd7f357a09f933ab22143273849f8b247360f2f94f4dc2ea473001c59f9f0b
82+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:1c4caa90ee9cf26c9143e44074f50ba9bb17636823bde4397751a5e0d846bfd6
8383

8484
RUN <%= retry.loop(package_manager,
8585
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎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: []

0 commit comments

Comments
 (0)