Skip to content

Commit 68bcc2f

Browse files
DiannaHohenseeDiannaHohensee
committed
Merge branch 'main' into 2025/10/08/ES-12631-enable-stats
2 parents 0e9a689 + b4cd892 commit 68bcc2f

File tree

523 files changed

+8459
-1877
lines changed

Some content is hidden

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

523 files changed

+8459
-1877
lines changed

‎.buildkite/scripts/generate-pr-performance-benchmark.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ steps:
4646
CONFIGURATION_NAME: ${GITHUB_PR_COMMENT_VAR_BENCHMARK}
4747
ENV_ID: ${env_id_baseline}
4848
REVISION: ${merge_base}
49+
BENCHMARK_TYPE: baseline
4950
- label: Trigger contender benchmark with ${GITHUB_PR_TRIGGERED_SHA:0:7}
5051
trigger: elasticsearch-performance-esbench-pr
5152
build:
@@ -56,6 +57,7 @@ steps:
5657
ENV_ID: ${env_id_contender}
5758
ES_REPO_URL: https://github.com/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}.git
5859
REVISION: ${GITHUB_PR_TRIGGERED_SHA}
60+
BENCHMARK_TYPE: contender
5961
- wait: ~
6062
- label: Update PR comment and Buildkite annotation
6163
command: |

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ build/
4646
**/.local*
4747
.vagrant/
4848
/logs/
49+
**/target/
4950

5051
# osx stuff
5152
.DS_Store

‎build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
import java.lang.management.ManagementFactory;
11-
import java.time.LocalDateTime;
1210

13-
import org.elasticsearch.gradle.Architecture
1411
import org.elasticsearch.gradle.OS
15-
import static org.elasticsearch.gradle.internal.util.CiUtils.safeName
16-
1712
import java.lang.management.ManagementFactory
1813
import java.time.LocalDateTime
14+
import org.elasticsearch.gradle.Architecture
15+
16+
import static org.elasticsearch.gradle.internal.util.CiUtils.safeName
1917

2018
// Resolving this early to avoid issues with the build scan plugin in combination with the configuration cache usage
2119
def taskNames = gradle.startParameter.taskNames.join(' ')
@@ -32,10 +30,10 @@ develocity {
3230
// Automatically publish scans from Elasticsearch CI
3331
if (onCI) {
3432
publishing.onlyIf { true }
35-
if(server.isPresent() == false) {
33+
if (server.isPresent() == false) {
3634
server = 'https://gradle-enterprise.elastic.co'
3735
}
38-
} else if( server.isPresent() == false) {
36+
} else if (server.isPresent() == false) {
3937
publishing.onlyIf { false }
4038
}
4139

@@ -99,6 +97,15 @@ develocity {
9997
tag 'pull-request'
10098
link 'Source', "${prBaseUrl}/tree/${System.getenv('BUILDKITE_COMMIT')}"
10199
link 'Pull Request', "https://github.com/${repository}/pull/${prId}"
100+
} else if (System.getenv('ELASTICSEARCH_PR_NUMBER')) {
101+
// For tracking es-pr-check failures in the serverless repo caused by elasticsearch PRs
102+
def esPr = System.getenv('ELASTICSEARCH_PR_NUMBER')
103+
def esCommit = System.getenv('ELASTICSEARCH_SUBMODULE_COMMIT')
104+
value 'Git Commit ID', esCommit
105+
tag "pr/${esPr}"
106+
tag 'pull-request'
107+
link 'Source', "https://github.com/elastic/elasticsearch/pull/${esPr}/commits/${esCommit}"
108+
link 'Pull Request', "https://github.com/elastic/elasticsearch/pull/${esPr}"
102109
} else {
103110
value 'Git Commit ID', gitRevision.get()
104111
link 'Source', "https://github.com/${repository}/tree/${gitRevision.get()}"

‎docs/changelog/135295.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 135295
2+
summary: Replace any Attribute type when pushing down past Project
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 134407

‎docs/changelog/135838.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 135838
2+
summary: Remove rate limit field from services API for EIS
3+
area: Machine Learning
4+
type: bug
5+
issues: []

‎docs/changelog/135886.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 135886
2+
summary: Provide defaults for index sort settings
3+
area: Mapping
4+
type: bug
5+
issues:
6+
- 129062

‎docs/changelog/136066.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 136066
2+
summary: Simulate shards moved by explicit commands
3+
area: Allocation
4+
type: enhancement
5+
issues: []

‎docs/changelog/136105.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pr: 136105
2+
summary: Fix a breaker bug
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 135224
7+
- 135260

‎docs/changelog/136266.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 136266
2+
summary: Fix Page.equals()
3+
area: ES|QL
4+
type: bug
5+
issues: []

‎docs/changelog/136279.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 136279
2+
summary: Initialize `TermsEnum` eagerly
3+
area: Search
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)