Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1c7d17c
Remove unnecessary temp dir access (#123314)
rjernst Feb 25, 2025
688542b
Increase await timeout for testCancelFailedSearchWhenPartialResultDis…
smalyshev Feb 25, 2025
4a6343a
Update minimum transport version in `main` (#123254)
DaveCTurner Feb 25, 2025
5b0591e
Consider entitlement lib as system module (#123315)
rjernst Feb 25, 2025
4bd1f81
Move eclipse specific extention property into elasticsearch eclipse p…
breskeby Feb 25, 2025
9aaf072
Add pidfile access for server (#123313)
rjernst Feb 25, 2025
12fcdd8
Some missing entitlements preventing serverless to start (#123271)
ldematte Feb 25, 2025
ec82c24
Add support to VALUES aggregation for spatial types (#122886)
craigtaverner Feb 25, 2025
4f6a0e6
[Entitlements] Follows links during FileAccessTree creation (#123357)
ldematte Feb 25, 2025
d0db4cd
Reduce licence checks in `LicensedWriteLoadForecaster` (#123346)
DaveCTurner Feb 25, 2025
2f0e1da
Missing log4j policy (#123360)
ldematte Feb 25, 2025
6c55099
Store arrays offsets for ip fields natively with synthetic source (#1…
martijnvg Feb 25, 2025
f929270
Fix how we suppress logs for self-tests (#123361)
ldematte Feb 25, 2025
e843849
Updates to allow using Cohere binary embedding response in semantic s…
ymao1 Feb 25, 2025
ae6474d
Deprecate Behavioral Analytics CRUD apis (#122960)
kderusso Feb 25, 2025
28f4d87
[Fleet] Add `upgrade_attempts` to `.fleet-agents` index (#123256)
jillguyonnet Feb 25, 2025
c02b484
Use mock block factory in breaker tests (#122965)
dnhatn Feb 25, 2025
48d2083
Update docker.elastic.co/wolfi/chainguard-base:latest Docker digest t…
elastic-renovate-prod[bot] Feb 25, 2025
88cf248
Fixing serialization of ScriptStats cache_evictions_history (#123384)
masseyke Feb 25, 2025
b5e482b
Enable entitlements by default (#122907)
rjernst Feb 25, 2025
3075b07
Remove @UpdateForV9 annotations from Data Management code (#123171)
mattc58 Feb 25, 2025
af6014e
Use ordered maps for PipelineConfiguration xcontent deserialization (…
joegallo Feb 25, 2025
916b227
Mute org.elasticsearch.index.mapper.IPSyntheticSourceNativeArrayInteg…
elasticsearchmachine Feb 25, 2025
e1652af
Mute org.elasticsearch.index.mapper.IPSyntheticSourceNativeArrayInteg…
elasticsearchmachine Feb 25, 2025
6f2f68e
Mute org.elasticsearch.index.mapper.IPSyntheticSourceNativeArrayInteg…
elasticsearchmachine Feb 25, 2025
4531e6f
Grant Lucene expressions module create classloader entitlement (#123424)
rjernst Feb 25, 2025
c92ce0a
Mute org.elasticsearch.packaging.test.DockerTests test151MachineDepen…
elasticsearchmachine Feb 26, 2025
8176746
Give NamedComponentReader access to read plugins directories (#123431)
rjernst Feb 26, 2025
c4ff1c8
Unmute EnrichIT#testAvgDurationByArtist (#123443)
dnhatn Feb 26, 2025
0dafc99
Add JDK 24 release candidate to toolchain resolver (#123321)
rjernst Feb 26, 2025
1e82621
Mute org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartial…
elasticsearchmachine Feb 26, 2025
597ab8a
Merge branch 'main' into multi-project
tvernum Feb 26, 2025
4d0c253
Add "hasAnyIndices" method to Metadata
tvernum Feb 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.Transformer;
import org.gradle.api.invocation.Gradle;
import org.gradle.api.plugins.JavaBasePlugin;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.Copy;
Expand All @@ -38,6 +39,15 @@ public class EclipseConventionPlugin implements Plugin<Project> {
@Override
public void apply(Project project) {
project.getPlugins().apply(EclipsePlugin.class);
Gradle gradle = project.getGradle();

boolean isEclipse = project.getProviders().systemProperty("eclipse.launcher").isPresent() || // Gradle launched from Eclipse
project.getProviders().systemProperty("eclipse.application").isPresent() || // Gradle launched from the Eclipse compiler server
gradle.getStartParameter().getTaskNames().contains("eclipse") || // Gradle launched from the command line to do eclipse stuff
gradle.getStartParameter().getTaskNames().contains("cleanEclipse");
// for eclipse ide specific hacks...
project.getExtensions().add("isEclipse", isEclipse);

EclipseModel eclipseModel = project.getExtensions().getByType(EclipseModel.class);
EclipseProject eclipseProject = eclipseModel.getProject();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public enum DockerBase {
// Chainguard based wolfi image with latest jdk
// This is usually updated via renovatebot
// spotless:off
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:d74b1fda6b7fee2c90b410df258e005c049e0672fe16d79d00e58f14fb69f90b",
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:c66fdafe581a6ab1668a962015de4ce4666a60ed601d24f019f03bb4aaab8eeb",
"-wolfi",
"apk"
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,15 @@ interface JdkBuild {
String url(String os, String arch, String extension);
}

record ReleasedJdkBuild(JavaLanguageVersion languageVersion, String version, String buildNumber, String hash) implements JdkBuild {
record ReleaseJdkBuild(JavaLanguageVersion languageVersion, String host, String version, String buildNumber, String hash)
implements
JdkBuild {

@Override
public String url(String os, String arch, String extension) {
return "https://download.oracle.com/java/GA/jdk"
return "https://"
+ host
+ "/java/GA/jdk"
+ version
+ "/"
+ hash
Expand Down Expand Up @@ -111,7 +115,8 @@ private static String resolveBuildNumber(int version) {
// package private so it can be replaced by tests
List<JdkBuild> builds = List.of(
getBundledJdkBuild(),
new EarlyAccessJdkBuild(JavaLanguageVersion.of(24)),
// release candidate of JDK 24
new ReleaseJdkBuild(JavaLanguageVersion.of(24), "download.java.net", "24", "36", "1f9ff9062db4449d8ca828c504ffae90"),
new EarlyAccessJdkBuild(JavaLanguageVersion.of(25))
);

Expand All @@ -125,7 +130,7 @@ private JdkBuild getBundledJdkBuild() {
String baseVersion = jdkVersionMatcher.group(1) + (jdkVersionMatcher.group(2) != null ? (jdkVersionMatcher.group(2)) : "");
String build = jdkVersionMatcher.group(3);
String hash = jdkVersionMatcher.group(5);
return new ReleasedJdkBuild(bundledJdkMajorVersion, baseVersion, build, hash);
return new ReleaseJdkBuild(bundledJdkMajorVersion, "download.oracle.com", baseVersion, build, hash);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ class OracleOpenJdkToolchainResolverSpec extends AbstractToolchainResolverSpec {
return null
}
}
toolChain.builds = toolChain.builds.findAll { it instanceof OracleOpenJdkToolchainResolver.EarlyAccessJdkBuild } + [
new OracleOpenJdkToolchainResolver.ReleasedJdkBuild(
toolChain.builds = toolChain.builds + [
new OracleOpenJdkToolchainResolver.ReleaseJdkBuild(
JavaLanguageVersion.of(20),
"download.oracle.com",
"20",
"36",
"bdc68b4b9cbc4ebcb30745c85038d91d"
Expand All @@ -52,16 +53,16 @@ class OracleOpenJdkToolchainResolverSpec extends AbstractToolchainResolverSpec {
[20, anyVendor(), LINUX, AARCH64, "https://download.oracle.com/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-aarch64_bin.tar.gz"],
[20, anyVendor(), WINDOWS, X86_64, "https://download.oracle.com/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_windows-x64_bin.zip"],
// https://download.java.net/java/early_access/jdk23/23/GPL/openjdk-23-ea+23_macos-aarch64_bin.tar.gz
[24, ORACLE, MAC_OS, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_macos-x64_bin.tar.gz"],
[24, ORACLE, MAC_OS, AARCH64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_macos-aarch64_bin.tar.gz"],
[24, ORACLE, LINUX, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_linux-x64_bin.tar.gz"],
[24, ORACLE, LINUX, AARCH64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_linux-aarch64_bin.tar.gz"],
[24, ORACLE, WINDOWS, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_windows-x64_bin.zip"],
[24, anyVendor(), MAC_OS, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_macos-x64_bin.tar.gz"],
[24, anyVendor(), MAC_OS, AARCH64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_macos-aarch64_bin.tar.gz"],
[24, anyVendor(), LINUX, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_linux-x64_bin.tar.gz"],
[24, anyVendor(), LINUX, AARCH64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_linux-aarch64_bin.tar.gz"],
[24, anyVendor(), WINDOWS, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_windows-x64_bin.zip"]]
[24, ORACLE, MAC_OS, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-x64_bin.tar.gz"],
[24, ORACLE, MAC_OS, AARCH64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-aarch64_bin.tar.gz"],
[24, ORACLE, LINUX, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-x64_bin.tar.gz"],
[24, ORACLE, LINUX, AARCH64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-aarch64_bin.tar.gz"],
[24, ORACLE, WINDOWS, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_windows-x64_bin.zip"],
[24, anyVendor(), MAC_OS, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-x64_bin.tar.gz"],
[24, anyVendor(), MAC_OS, AARCH64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-aarch64_bin.tar.gz"],
[24, anyVendor(), LINUX, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-x64_bin.tar.gz"],
[24, anyVendor(), LINUX, AARCH64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-aarch64_bin.tar.gz"],
[24, anyVendor(), WINDOWS, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_windows-x64_bin.zip"]]
}

@RestoreSystemProperties
Expand All @@ -85,16 +86,6 @@ class OracleOpenJdkToolchainResolverSpec extends AbstractToolchainResolverSpec {

where:
version | vendor | os | arch | expectedUrl
24 | ORACLE | MAC_OS | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_macos-x64_bin.tar.gz"
24 | ORACLE | MAC_OS | AARCH64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_macos-aarch64_bin.tar.gz"
24 | ORACLE | LINUX | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_linux-x64_bin.tar.gz"
24 | ORACLE | LINUX | AARCH64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_linux-aarch64_bin.tar.gz"
24 | ORACLE | WINDOWS | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_windows-x64_bin.zip"
24 | anyVendor() | MAC_OS | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_macos-x64_bin.tar.gz"
24 | anyVendor() | MAC_OS | AARCH64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_macos-aarch64_bin.tar.gz"
24 | anyVendor() | LINUX | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_linux-x64_bin.tar.gz"
24 | anyVendor() | LINUX | AARCH64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_linux-aarch64_bin.tar.gz"
24 | anyVendor() | WINDOWS | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_windows-x64_bin.zip"
25 | ORACLE | MAC_OS | X86_64 | urlPrefix(25) + "13/GPL/openjdk-25-ea+13_macos-x64_bin.tar.gz"
25 | ORACLE | MAC_OS | AARCH64 | urlPrefix(25) + "13/GPL/openjdk-25-ea+13_macos-aarch64_bin.tar.gz"
25 | ORACLE | LINUX | X86_64 | urlPrefix(25) + "13/GPL/openjdk-25-ea+13_linux-x64_bin.tar.gz"
Expand Down
9 changes: 0 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,6 @@ allprojects {
}
}

// injecting groovy property variables into all projects
project.ext {
// for ide hacks...
isEclipse = providers.systemProperty("eclipse.launcher").isPresent() || // Detects gradle launched from Eclipse's IDE
providers.systemProperty("eclipse.application").isPresent() || // Detects gradle launched from the Eclipse compiler server
gradle.startParameter.taskNames.contains('eclipse') || // Detects gradle launched from the command line to do eclipse stuff
gradle.startParameter.taskNames.contains('cleanEclipse')
}

ext.bwc_tests_enabled = bwc_tests_enabled

// eclipse configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class SystemJvmOptions {
static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, String> sysprops) {
String distroType = sysprops.get("es.distribution.type");
boolean isHotspot = sysprops.getOrDefault("sun.management.compiler", "").contains("HotSpot");
boolean entitlementsExplicitlyEnabled = Booleans.parseBoolean(sysprops.getOrDefault("es.entitlements.enabled", "false"));
boolean entitlementsExplicitlyEnabled = Booleans.parseBoolean(sysprops.getOrDefault("es.entitlements.enabled", "true"));
// java 24+ only supports entitlements, but it may be enabled on earlier versions explicitly
boolean useEntitlements = RuntimeVersionFeature.isSecurityManagerAvailable() == false || entitlementsExplicitlyEnabled;
return Stream.of(
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog/121827.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 121827
summary: Updates to allow using Cohere binary embedding response in semantic search
queries
area: Machine Learning
type: bug
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/122886.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 122886
summary: Add support to VALUES aggregation for spatial types
area: ES|QL
type: bug
issues:
- 122413
10 changes: 10 additions & 0 deletions docs/changelog/122960.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
pr: 122960
summary: Deprecate Behavioral Analytics CRUD apis
area: Search
type: deprecation
issues: [ ]
deprecation:
title: Deprecate Behavioral Analytics CRUD apis
area: Search
details: Behavioral Analytics has been deprecated as of 9.0.0 and will be removed in a future release. The APIs will still work for now, but will emit warning headers that the API has been deprecated.
impact: Behavioral Analytics has been deprecated as of 9.0.0 and will be removed in a future release.
5 changes: 5 additions & 0 deletions docs/changelog/122999.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 122999
summary: Store arrays offsets for ip fields natively with synthetic source
area: Mapping
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/123346.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 123346
summary: Reduce license checks in `LicensedWriteLoadForecaster`
area: CRUD
type: bug
issues:
- 123247
5 changes: 5 additions & 0 deletions docs/changelog/123384.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 123384
summary: Fixing serialization of `ScriptStats` `cache_evictions_history`
area: Stats
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/123403.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 123403
summary: Use ordered maps for `PipelineConfiguration` xcontent deserialization
area: Ingest Node
type: bug
issues: []
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
[[delete-analytics-collection]]
=== Delete Analytics Collection

deprecated:[9.0.0]
beta::[]

++++
Expand All @@ -14,15 +15,6 @@ beta::[]
For the most up-to-date API details, refer to {api-es}/group/endpoint-analytics[Behavioral analytics APIs].
--

////
[source,console]
----
PUT _application/analytics/my_analytics_collection
----
// TESTSETUP

////

Removes a <<behavioral-analytics-overview,Behavioral Analytics>> Collection and its associated data stream.

[[delete-analytics-collection-request]]
Expand Down Expand Up @@ -59,3 +51,4 @@ The following example deletes the Analytics Collection named `my_analytics_colle
----
DELETE _application/analytics/my_analytics_collection/
----
// TEST[skip:Behavioral Analytics APIs emit deprecation warnings and will not be updated]
1 change: 1 addition & 0 deletions docs/reference/behavioral-analytics/apis/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[[behavioral-analytics-apis]]
== Behavioral Analytics APIs

deprecated:[9.0.0]
beta::[]

++++
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
[[list-analytics-collection]]
=== List Analytics Collections

deprecated:[9.0.0]
beta::[]

++++
Expand All @@ -14,22 +15,6 @@ beta::[]
For the most up-to-date API details, refer to {api-es}/group/endpoint-analytics[Behavioral analytics APIs].
--

////
[source,console]
----
PUT _application/analytics/my_analytics_collection
PUT _application/analytics/my_analytics_collection2
----
// TESTSETUP

[source,console]
----
DELETE _application/analytics/my_analytics_collection
DELETE _application/analytics/my_analytics_collection2
----
// TEARDOWN
////

Returns information about <<behavioral-analytics-overview,Behavioral Analytics>> Collections.

[[list-analytics-collection-request]]
Expand All @@ -46,8 +31,9 @@ Requires the `manage_behavioral_analytics` cluster privilege.
==== {api-path-parms-title}

`<criteria>`::
(optional, string)
Criteria is used to find a matching analytics collection. This could be the name of the collection or a pattern to match multiple. If not specified, will return all analytics collections.
(optional, string) Criteria is used to find a matching analytics collection.
This could be the name of the collection or a pattern to match multiple.
If not specified, will return all analytics collections.

[[list-analytics-collection-response-codes]]
==== {api-response-codes-title}
Expand All @@ -66,6 +52,7 @@ The following example lists all configured Analytics Collections:
----
GET _application/analytics/
----
// TEST[skip:Behavioral Analytics APIs emit deprecation warnings and will not be updated]

A sample response:

Expand All @@ -91,6 +78,7 @@ The following example returns the Analytics Collection that matches `my_analytic
----
GET _application/analytics/my_analytics_collection
----
// TEST[skip:Behavioral Analytics APIs emit deprecation warnings and will not be updated]

A sample response:

Expand All @@ -111,6 +99,7 @@ The following example returns all Analytics Collections prefixed with `my`:
----
GET _application/analytics/my*
----
// TEST[skip:Behavioral Analytics APIs emit deprecation warnings and will not be updated]

A sample response:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
[[post-analytics-collection-event]]
=== Post Event to an Analytics Collection

deprecated:[9.0.0]
beta::[]

++++
Expand All @@ -14,20 +15,6 @@ beta::[]
For the most up-to-date API details, refer to {api-es}/group/endpoint-analytics[Behavioral analytics APIs].
--

////
[source,console]
----
PUT _application/analytics/my_analytics_collection
----
// TESTSETUP

[source,console]
----
DELETE _application/analytics/my_analytics_collection
----
// TEARDOWN
////

Post an event to a <<behavioral-analytics-overview,Behavioral Analytics>> Collection.

[[post-analytics-collection-event-request]]
Expand Down Expand Up @@ -105,3 +92,4 @@ POST _application/analytics/my_analytics_collection/event/search_click
}
}
----
// TEST[skip:Behavioral Analytics APIs emit deprecation warnings and will not be updated]
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
[[put-analytics-collection]]
=== Put Analytics Collection

deprecated:[9.0.0]
beta::[]

++++
Expand All @@ -14,14 +15,6 @@ beta::[]
For the most up-to-date API details, refer to {api-es}/group/endpoint-analytics[Behavioral analytics APIs].
--

////
[source,console]
----
DELETE _application/analytics/my_analytics_collection
----
// TEARDOWN
////

Creates a <<behavioral-analytics-overview,Behavioral Analytics>> Collection.

[[put-analytics-collection-request]]
Expand Down Expand Up @@ -55,3 +48,4 @@ The following example creates a new Analytics Collection called `my_analytics_co
----
PUT _application/analytics/my_analytics_collection
----
// TEST[skip:Behavioral Analytics APIs emit deprecation warnings and will not be updated]
Loading