Skip to content

Commit 9cd3dce

Browse files
Merge branch 'main' into sql/jdbc_api_key
2 parents 11c6571 + e86a8a1 commit 9cd3dce

File tree

262 files changed

+7854
-2500
lines changed

Some content is hidden

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

262 files changed

+7854
-2500
lines changed

distribution/docker/src/docker/Dockerfile.ess

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@ RUN mkdir /app && \\
4242
COPY --from=builder --chown=0:0 /opt /opt
4343
USER 1000:0
4444
ENV ES_PLUGIN_ARCHIVE_DIR /opt/plugins/archive
45+
ENV GLIBC_TUNABLES=glibc.malloc.hugetlb=0

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Extract Elasticsearch artifact
2626
################################################################################
2727
28-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:11d66ae7ec7ca1d5a7289750bdd96eb3d8eb592e5b7377f1fc8e4fb556fa7383 AS builder
28+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:efc70f02cdc8aaa7eb5196c5d17719098a3f4bba347aa966a85f7e5452d0a0ca AS builder
2929
3030
# Install required packages to extract the Elasticsearch distribution
3131
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -104,7 +104,7 @@ WORKDIR /usr/share/elasticsearch/config
104104
# Add entrypoint
105105
################################################################################
106106

107-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:11d66ae7ec7ca1d5a7289750bdd96eb3d8eb592e5b7377f1fc8e4fb556fa7383
107+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:efc70f02cdc8aaa7eb5196c5d17719098a3f4bba347aa966a85f7e5452d0a0ca
108108

109109
RUN <%= retry.loop(package_manager,
110110
"export DEBIAN_FRONTEND=noninteractive && \n" +
@@ -124,6 +124,7 @@ RUN groupadd -g 1000 elasticsearch && \
124124
chown -R 0:0 /usr/share/elasticsearch
125125

126126
ENV ELASTIC_CONTAINER=true
127+
ENV GLIBC_TUNABLES=glibc.malloc.hugetlb=0
127128

128129
WORKDIR /usr/share/elasticsearch
129130

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

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

83-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:b5a03b6a754fa2f9a29e44e316a6c4df1f606cd8a3cd8810ce3d6a3a3134428b
83+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:4a82c706003370964df94913adfc47aab9a55b4fb2490260e7f7ebcf27cc4240
8484

8585
RUN <%= retry.loop(package_manager,
8686
"export DEBIAN_FRONTEND=noninteractive && \n" +
@@ -103,6 +103,7 @@ RUN groupadd -g 1000 elasticsearch && \
103103
chown -R 0:0 /usr/share/elasticsearch
104104

105105
ENV ELASTIC_CONTAINER=true
106+
ENV GLIBC_TUNABLES=glibc.malloc.hugetlb=0
106107

107108
WORKDIR /usr/share/elasticsearch
108109

docs/changelog/141060.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
area: ES|QL
2+
issues:
3+
- 140538
4+
pr: 141060
5+
summary: "Support arithmetic operations for dense_vectors: scalar version"
6+
type: enhancement

docs/changelog/142157.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
area: CRUD
2+
issues:
3+
- 141586
4+
pr: 142157
5+
summary: Do not mark bulk indexing requests as retried after primary relocations
6+
type: enhancement

docs/changelog/142386.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
area: SQL
2+
issues:
3+
- 137365
4+
pr: 142386
5+
summary: Fix `QlIllegalArgumentException` with non-foldable date range queries
6+
type: bug

docs/changelog/142433.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
area: Security
2+
issues: []
3+
pr: 142433
4+
summary: Fix built-in roles sync to retry on lock contention instead of silently discarding
5+
pending updates
6+
type: bug

docs/changelog/142738.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 142738
2+
summary: Added service settings update logic for Alibaba Cloud Search provider in the Inference Plugin
3+
area: Inference
4+
type: enhancement
5+
issues:
6+
- 122356

docs/changelog/142746.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
area: Search
2+
issues: []
3+
pr: 142746
4+
summary: Add search task watchdog to log hot threads on slow search
5+
type: enhancement

docs/changelog/142834.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
area: ES|QL
2+
issues: []
3+
pr: 142834
4+
summary: Remove snapshot protection from node reduce late materialization
5+
type: feature

0 commit comments

Comments
 (0)