Skip to content

Commit 98367d4

Browse files
author
Max Hniebergall
committed
Merge branch 'main' of github.com:elastic/elasticsearch into inferenceUpgradeApi
# Conflicts: # server/src/main/java/org/elasticsearch/inference/TaskSettings.java # x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/completion/AlibabaCloudSearchCompletionTaskSettingsTests.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/sparse/AlibabaCloudSearchSparseTaskSettingsTests.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/amazonbedrock/completion/AmazonBedrockChatCompletionTaskSettingsTests.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/azureaistudio/completion/AzureAiStudioChatCompletionTaskSettingsTests.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/azureopenai/completion/AzureOpenAiCompletionTaskSettingsTests.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/embeddings/CohereEmbeddingsTaskSettingsTests.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/CustomElandRerankTaskSettingsTests.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/googlevertexai/rerank/GoogleVertexAiRerankTaskSettingsTests.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openai/completion/OpenAiChatCompletionTaskSettingsTests.java # x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsTaskSettingsTests.java
2 parents 8998681 + e2c314e commit 98367d4

File tree

125 files changed

+2567
-1100
lines changed

Some content is hidden

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

125 files changed

+2567
-1100
lines changed

‎build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/GitInfoPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void apply(Project project) {
4444
gitInfo.disallowChanges();
4545
gitInfo.finalizeValueOnRead();
4646

47-
revision = gitInfo.map(info -> info.getRevision() == null ? info.getRevision() : "master");
47+
revision = gitInfo.map(info -> info.getRevision() == null ? info.getRevision() : "main");
4848
}
4949

5050
public Property<GitInfo> getGitInfo() {

‎build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/LicensingPlugin.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
public class LicensingPlugin implements Plugin<Project> {
2222
static final String ELASTIC_LICENSE_URL_PREFIX = "https://raw.githubusercontent.com/elastic/elasticsearch/";
2323
static final String ELASTIC_LICENSE_URL_POSTFIX = "/licenses/ELASTIC-LICENSE-2.0.txt";
24+
static final String AGPL_ELASTIC_LICENSE_URL_POSTFIX = "/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt";
2425

2526
private ProviderFactory providerFactory;
2627

@@ -36,15 +37,18 @@ public void apply(Project project) {
3637
isSnapshotVersion(project) ? revision.get() : "v" + project.getVersion()
3738
);
3839

39-
Provider<String> projectLicenseURL = licenseCommitProvider.map(licenseCommit -> ELASTIC_LICENSE_URL_PREFIX +
40+
Provider<String> elasticLicenseURL = licenseCommitProvider.map(licenseCommit -> ELASTIC_LICENSE_URL_PREFIX +
4041
licenseCommit + ELASTIC_LICENSE_URL_POSTFIX);
42+
Provider<String> agplLicenseURL = licenseCommitProvider.map(licenseCommit -> ELASTIC_LICENSE_URL_PREFIX +
43+
licenseCommit + AGPL_ELASTIC_LICENSE_URL_POSTFIX);
4144
// But stick the Elastic license url in project.ext so we can get it if we need to switch to it
42-
project.getExtensions().getExtraProperties().set("elasticLicenseUrl", projectLicenseURL);
45+
project.getExtensions().getExtraProperties().set("elasticLicenseUrl", elasticLicenseURL);
4346

4447
MapProperty<String, String> licensesProperty = project.getObjects().mapProperty(String.class, String.class).convention(
4548
providerFactory.provider(() -> Map.of(
4649
"Server Side Public License, v 1", "https://www.mongodb.com/licensing/server-side-public-license",
47-
"Elastic License 2.0", projectLicenseURL.get())
50+
"Elastic License 2.0", elasticLicenseURL.get(),
51+
"GNU Affero General Public License Version 3", agplLicenseURL.get())
4852
)
4953
);
5054

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
7474
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
7575
<distribution>repo</distribution>
7676
</license>
77+
<license>
78+
<name>The OSI-approved Open Source license Version 3.0</name>
79+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
80+
<distribution>repo</distribution>
81+
</license>
7782
</licenses>
7883
<developers>
7984
<developer>
@@ -149,6 +154,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
149154
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
150155
<distribution>repo</distribution>
151156
</license>
157+
<license>
158+
<name>The OSI-approved Open Source license Version 3.0</name>
159+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
160+
<distribution>repo</distribution>
161+
</license>
152162
</licenses>
153163
<developers>
154164
<developer>
@@ -233,6 +243,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
233243
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
234244
<distribution>repo</distribution>
235245
</license>
246+
<license>
247+
<name>The OSI-approved Open Source license Version 3.0</name>
248+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
249+
<distribution>repo</distribution>
250+
</license>
236251
</licenses>
237252
<developers>
238253
<developer>
@@ -326,6 +341,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
326341
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
327342
<distribution>repo</distribution>
328343
</license>
344+
<license>
345+
<name>The OSI-approved Open Source license Version 3.0</name>
346+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
347+
<distribution>repo</distribution>
348+
</license>
329349
</licenses>
330350
<developers>
331351
<developer>
@@ -399,6 +419,11 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
399419
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
400420
<distribution>repo</distribution>
401421
</license>
422+
<license>
423+
<name>The OSI-approved Open Source license Version 3.0</name>
424+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v2.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
425+
<distribution>repo</distribution>
426+
</license>
402427
</licenses>
403428
<developers>
404429
<developer>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public enum DockerBase {
3131
// Chainguard based wolfi image with latest jdk
3232
// This is usually updated via renovatebot
3333
// spotless:off
34-
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:c16d3ad6cebf387e8dd2ad769f54320c4819fbbaa21e729fad087c7ae223b4d0",
34+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:90888b190da54062f67f3fef1372eb0ae7d81ea55f5a1f56d748b13e4853d984",
3535
"-wolfi",
3636
"apk"
3737
),

‎distribution/docker/src/docker/Dockerfile.ess‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ USER root
2525

2626
COPY plugins/*.zip /opt/plugins/archive/
2727

28-
RUN chown root.root /opt/plugins/archive/*
28+
RUN chown 1000:1000 /opt/plugins/archive/*
2929
RUN chmod 0444 /opt/plugins/archive/*
3030

3131
FROM ${base_image}

‎docs/changelog/114109.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114109
2+
summary: Update cluster stats for retrievers
3+
area: Search
4+
type: enhancement
5+
issues: []

‎docs/changelog/114358.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114358
2+
summary: "ESQL: Use less memory in listener"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/114363.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114363
2+
summary: Give the kibana system user permission to read security entities
3+
area: Infra/Core
4+
type: enhancement
5+
issues: []

‎docs/changelog/114375.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114375
2+
summary: Handle `InternalSendException` inline for non-forking handlers
3+
area: Distributed
4+
type: bug
5+
issues: []

‎docs/changelog/114389.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114389
2+
summary: Filter empty task settings objects from the API response
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)