Skip to content

Commit 764933f

Browse files
pawankartik-elasticpawankartik-elastic
authored
Merge branch 'main' into pkar/esql-wrap-remote-errors
2 parents 32e26f6 + 7fadeeb commit 764933f

File tree

571 files changed

+11864
-4636
lines changed

Some content is hidden

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

571 files changed

+11864
-4636
lines changed

‎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
@@ -22,7 +22,7 @@ public enum DockerBase {
2222
// Chainguard based wolfi image with latest jdk
2323
// This is usually updated via renovatebot
2424
// spotless:off
25-
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:15a4191ff8ec8305dcba449365e8a1586c9cda8e016ae838d960b9009c6a5cac",
25+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:c4e10ecf3d8a21cf4be2fb53a2f522de50e14c80ce1da487e3ffd13f4d48d24d",
2626
"-wolfi",
2727
"apk"
2828
),

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,12 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
3030
map.put(LegacyRestTestBasePlugin.class, ":docs");
3131
map.put(LegacyRestTestBasePlugin.class, ":distribution:docker");
3232
map.put(LegacyRestTestBasePlugin.class, ":modules:reindex");
33-
map.put(LegacyRestTestBasePlugin.class, ":plugins:analysis-icu");
34-
map.put(LegacyRestTestBasePlugin.class, ":plugins:analysis-kuromoji");
35-
map.put(LegacyRestTestBasePlugin.class, ":plugins:analysis-nori");
36-
map.put(LegacyRestTestBasePlugin.class, ":plugins:analysis-phonetic");
37-
map.put(LegacyRestTestBasePlugin.class, ":plugins:analysis-smartcn");
38-
map.put(LegacyRestTestBasePlugin.class, ":plugins:analysis-stempel");
39-
map.put(LegacyRestTestBasePlugin.class, ":plugins:analysis-ukrainian");
40-
map.put(LegacyRestTestBasePlugin.class, ":plugins:discovery-azure-classic");
41-
map.put(LegacyRestTestBasePlugin.class, ":plugins:discovery-ec2");
42-
map.put(LegacyRestTestBasePlugin.class, ":plugins:discovery-gce");
43-
map.put(LegacyRestTestBasePlugin.class, ":plugins:mapper-annotated-text");
44-
map.put(LegacyRestTestBasePlugin.class, ":plugins:store-smb");
4533
map.put(LegacyRestTestBasePlugin.class, ":qa:ccs-rolling-upgrade-remote-cluster");
4634
map.put(LegacyRestTestBasePlugin.class, ":qa:mixed-cluster");
4735
map.put(LegacyRestTestBasePlugin.class, ":qa:multi-cluster-search");
4836
map.put(LegacyRestTestBasePlugin.class, ":qa:remote-clusters");
4937
map.put(LegacyRestTestBasePlugin.class, ":qa:repository-multi-version");
5038
map.put(LegacyRestTestBasePlugin.class, ":qa:rolling-upgrade-legacy");
51-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-http");
52-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-ingest-disabled");
53-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-ingest-with-all-dependencies");
54-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-plugins");
55-
map.put(LegacyRestTestBasePlugin.class, ":qa:system-indices");
56-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-apm-integration");
57-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-delayed-aggs");
58-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-die-with-dignity");
59-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-error-query");
60-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-latency-simulating-directory");
61-
map.put(LegacyRestTestBasePlugin.class, ":test:yaml-rest-runner");
62-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:core");
6339
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search");
6440
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet");
6541
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:logstash");
@@ -77,8 +53,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
7753
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:smoke-test-plugins-ssl");
7854
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:smoke-test-security-with-mustache");
7955
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:xpack-prefix-rest-compat");
80-
map.put(LegacyRestTestBasePlugin.class, ":modules:ingest-geoip:qa:file-based-update");
81-
map.put(LegacyRestTestBasePlugin.class, ":plugins:discovery-gce:qa:gce");
8256
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:multi-cluster-search-security:legacy-with-basic-license");
8357
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:multi-cluster-search-security:legacy-with-full-license");
8458
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:multi-cluster-search-security:legacy-with-restricted-trust");

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.gradle.api.provider.Provider;
1717
import org.gradle.api.tasks.testing.Test;
1818

19+
import java.io.File;
1920
import java.util.Arrays;
2021
import java.util.List;
2122

@@ -26,21 +27,22 @@ public class MutedTestPlugin implements Plugin<Project> {
2627

2728
@Override
2829
public void apply(Project project) {
30+
project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class);
31+
var buildParams = loadBuildParams(project).get();
32+
33+
File settingsRoot = project.getLayout().getSettingsDirectory().getAsFile();
2934
String additionalFilePaths = project.hasProperty(ADDITIONAL_FILES_PROPERTY)
3035
? project.property(ADDITIONAL_FILES_PROPERTY).toString()
3136
: "";
3237
List<RegularFile> additionalFiles = Arrays.stream(additionalFilePaths.split(","))
3338
.filter(p -> p.isEmpty() == false)
34-
.map(p -> project.getRootProject().getLayout().getProjectDirectory().file(p))
39+
.map(p -> project.getLayout().getSettingsDirectory().file(p))
3540
.toList();
3641

37-
project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class);
38-
var buildParams = loadBuildParams(project).get();
39-
4042
Provider<MutedTestsBuildService> mutedTestsProvider = project.getGradle()
4143
.getSharedServices()
4244
.registerIfAbsent("mutedTests", MutedTestsBuildService.class, spec -> {
43-
spec.getParameters().getInfoPath().set(project.getRootProject().getProjectDir());
45+
spec.getParameters().getInfoPath().set(settingsRoot);
4446
spec.getParameters().getAdditionalFiles().set(additionalFiles);
4547
});
4648

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class BasePluginBuildPlugin implements Plugin<Project> {
5656
public static final String BUNDLE_PLUGIN_TASK_NAME = "bundlePlugin";
5757
public static final String EXPLODED_BUNDLE_PLUGIN_TASK_NAME = "explodedBundlePlugin";
5858
public static final String EXPLODED_BUNDLE_CONFIG = "explodedBundleZip";
59+
public static final Attribute<Boolean> EXPLODED_PLUGIN_BUNDLE_ATTRIBUTE = Attribute.of("exploded-plugin-bundle", Boolean.class);
5960

6061
protected final ProviderFactory providerFactory;
6162

@@ -170,6 +171,7 @@ private TaskProvider<Zip> createBundleTasks(final Project project, PluginPropert
170171
explodedBundleZip.setCanBeResolved(false);
171172
explodedBundleZip.setCanBeConsumed(true);
172173
explodedBundleZip.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
174+
explodedBundleZip.getAttributes().attribute(EXPLODED_PLUGIN_BUNDLE_ATTRIBUTE, true);
173175
project.getArtifacts().add(EXPLODED_BUNDLE_CONFIG, explodedBundle);
174176
return bundle;
175177
}

‎distribution/docker/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base) {
316316
from configurations.fips
317317
}
318318
into("resources") {
319-
from tasks.named('fipsResources')
319+
from tasks.named('fipsDockerResources')
320320
}
321321
}
322322
}
@@ -536,9 +536,9 @@ void addBuildCloudDockerImageTasks(Architecture architecture) {
536536
}
537537

538538
// fips
539-
TaskProvider<ExportElasticsearchBuildResourcesTask> fipsResourcesTask = tasks.register('fipsResources', ExportElasticsearchBuildResourcesTask)
539+
TaskProvider<ExportElasticsearchBuildResourcesTask> fipsResourcesTask = tasks.register('fipsDockerResources', ExportElasticsearchBuildResourcesTask)
540540
fipsResourcesTask.configure {
541-
outputDir = project.layout.buildDirectory.dir('fips-resources').get().asFile
541+
outputDir = project.layout.buildDirectory.dir('fips-docker-resources').get().asFile
542542
copy 'fips_java.security'
543543
copy 'fips_java.policy'
544544
}

‎docs/changelog/121885.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 121885
2+
summary: Introduce batched query execution and data-node side reduce
3+
area: Search
4+
type: enhancement
5+
issues: []

‎docs/changelog/124048.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 124048
2+
summary: Handle long overflow in dates
3+
area: Search
4+
type: bug
5+
issues:
6+
- 112483

‎docs/changelog/124062.yaml‎

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

‎docs/changelog/125191.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125191
2+
summary: Fix sorting when `aggregate_metric_double` present
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/125404.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125404
2+
summary: Check if the anomaly results index has been rolled over
3+
area: Machine Learning
4+
type: upgrade
5+
issues: []

0 commit comments

Comments
 (0)