Skip to content

Commit 9b821c3

Browse files
ywelschywelsch
committed
Merge remote-tracking branch 'elastic/main' into compute-engine
2 parents 8d389f3 + d01dd39 commit 9b821c3

File tree

1,090 files changed

+34104
-8954
lines changed

Some content is hidden

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

1,090 files changed

+34104
-8954
lines changed

‎.backportrc.json

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
{
2-
"upstream": "elastic/elasticsearch",
3-
"targetBranchChoices": [
4-
"master",
5-
"8.3",
6-
"8.2",
7-
"8.1",
8-
"8.0",
9-
"7.17",
10-
"6.8"
11-
],
12-
"targetPRLabels": ["backport"],
13-
"branchLabelMapping": {
14-
"^v8.4.0$": "master",
15-
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$": "$1.$2"
2+
"upstream" : "elastic/elasticsearch",
3+
"targetBranchChoices" : [ "main", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
4+
"targetPRLabels" : [ "backport" ],
5+
"branchLabelMapping" : {
6+
"^v8.5.0$" : "main",
7+
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
168
}
179
}

‎.ci/bwcVersions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,6 @@ BWC_VERSION:
6969
- "8.3.1"
7070
- "8.3.2"
7171
- "8.3.3"
72+
- "8.3.4"
7273
- "8.4.0"
74+
- "8.5.0"

‎.ci/jobs.t/elastic+elasticsearch+intake+multijob+part3.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
jjbb-template: generic-gradle-unix.yml
3+
vars:
4+
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+part3
5+
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake part 3"
6+
- job-description: Elasticsearch %BRANCH% branch intake check part 3.
7+
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3"

‎.ci/jobs.t/elastic+elasticsearch+intake.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
kill-phase-on: NEVER
4343
current-parameters: true
4444
git-revision: true
45+
- name: elastic+elasticsearch+%BRANCH%+intake+multijob+part3
46+
kill-phase-on: NEVER
47+
current-parameters: true
48+
git-revision: true
4549
- name: elastic+elasticsearch+%BRANCH%+intake+multijob+bwc-snapshots
4650
kill-phase-on: NEVER
4751
current-parameters: true

‎.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
values:
2828
- 'checkPart1'
2929
- 'checkPart2'
30+
- 'checkPart3'
3031
- 'bwcTestSnapshots'
3132
- 'checkRestCompat'
3233
builders:

‎.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
values:
2727
- 'checkPart1'
2828
- 'checkPart2'
29+
- 'checkPart3'
2930
- 'bwcTestSnapshots'
3031
- 'checkRestCompat'
3132
builders:

‎.ci/jobs.t/elastic+elasticsearch+periodic+java-matrix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
values:
2727
- 'checkPart1'
2828
- 'checkPart2'
29+
- 'checkPart3'
2930
- 'bwcTestSnapshots'
3031
- 'checkRestCompat'
3132
builders:

‎.ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
export BEATS_DIR=$(pwd)/distribution/docker/build/artifacts/beats
2323
2424
mkdir -p ${BEATS_DIR}
25-
curl -o "${BEATS_DIR}/metricbeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/metricbeat/metricbeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
26-
curl -o "${BEATS_DIR}/filebeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/filebeat/filebeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
25+
curl --fail -o "${BEATS_DIR}/metricbeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/metricbeat/metricbeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
26+
curl --fail -o "${BEATS_DIR}/filebeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/filebeat/filebeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
2727
2828
$WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false \
2929
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef build

‎.ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
black-list-labels:
2626
- '>test-mute'
2727
- 'test-full-bwc'
28-
black-list-target-branches:
29-
- feature/desired-balance-allocator
3028
axes:
3129
- axis:
3230
type: slave

‎.ci/jobs.t/elastic+elasticsearch+pull-request+docs-check.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
- ^docs/.*
2323
black-list-labels:
2424
- '>test-mute'
25-
black-list-target-branches:
26-
- feature/desired-balance-allocator
2725
builders:
2826
- inject:
2927
properties-file: '.ci/java-versions.properties'

‎.ci/jobs.t/elastic+elasticsearch+pull-request+eql-correctness.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
cancel-builds-on-update: true
2121
black-list-target-branches:
2222
- 6.8
23-
- feature/desired-balance-allocator
2423
excluded-regions:
2524
- ^docs/.*
2625
black-list-labels:

‎.ci/jobs.t/elastic+elasticsearch+pull-request+example-plugins.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
- build-tools/.*
2424
- build-tools-internal/.*
2525
- plugins/examples/.*
26-
black-list-target-branches:
27-
- feature/desired-balance-allocator
2826
builders:
2927
- inject:
3028
properties-file: '.ci/java-versions.properties'

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix-sample.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
cancel-builds-on-update: true
2222
black-list-target-branches:
2323
- 6.8
24-
- feature/desired-balance-allocator
2524
excluded-regions:
2625
- ^docs/.*
2726
black-list-labels:
@@ -32,7 +31,7 @@
3231
type: label-expression
3332
name: os
3433
values:
35-
- rocky-linux-8-packaging
34+
- rhel-8-packaging
3635
- ubuntu-20.04-packaging
3736
- axis:
3837
type: user-defined

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
black-list-target-branches:
2525
- 7.17
2626
- 7.16
27-
- feature/desired-balance-allocator
2827
excluded-regions:
2928
- ^docs/.*
3029
black-list-labels:

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-upgrade-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
cancel-builds-on-update: true
2323
black-list-target-branches:
2424
- 6.8
25-
- feature/desired-balance-allocator
2625
excluded-regions:
2726
- ^docs/.*
2827
white-list-labels:

‎.ci/jobs.t/elastic+elasticsearch+pull-request+part-3-fips.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+pull-request+part-3-fips"
4+
display-name: "elastic / elasticsearch - pull request part-3 fips"
5+
description: "Testing of Elasticsearch pull requests - part-3 fips"
6+
workspace: "/dev/shm/elastic+elasticsearch+pull-request+part-3-fips"
7+
scm:
8+
- git:
9+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
10+
branches:
11+
- "${ghprbActualCommit}"
12+
triggers:
13+
- github-pull-request:
14+
org-list:
15+
- elastic
16+
allow-whitelist-orgs-as-admins: true
17+
trigger-phrase: '.*run\W+elasticsearch-ci/part-3-fips.*'
18+
github-hooks: true
19+
status-context: elasticsearch-ci/part-3-fips
20+
cancel-builds-on-update: true
21+
black-list-target-branches:
22+
- 6.8
23+
- 7.17
24+
excluded-regions:
25+
- ^docs/.*
26+
white-list-labels:
27+
- 'Team:Security'
28+
black-list-labels:
29+
- '>test-mute'
30+
builders:
31+
- inject:
32+
# Use FIPS-specific Java versions
33+
properties-file: '.ci/java-versions-fips.properties'
34+
properties-content: |
35+
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
36+
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
37+
JAVA16_HOME=$HOME/.java/openjdk16
38+
- shell: |
39+
#!/usr/local/bin/runbld --redirect-stderr
40+
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true checkPart3

‎.ci/jobs.t/elastic+elasticsearch+pull-request+part-3-windows.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+pull-request+part-3-windows"
4+
display-name: "elastic / elasticsearch - pull request part-3 windows"
5+
description: "Testing of Elasticsearch pull requests - part-3 windows"
6+
node: "windows-immutable"
7+
workspace: "C:\\Users\\jenkins\\workspace\\pr-part-2\\${BUILD_NUMBER}"
8+
scm:
9+
- git:
10+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
11+
branches:
12+
- "${ghprbActualCommit}"
13+
triggers:
14+
- github-pull-request:
15+
org-list:
16+
- elastic
17+
allow-whitelist-orgs-as-admins: true
18+
trigger-phrase: '.*run\W+elasticsearch-ci/part-3-windows.*'
19+
github-hooks: true
20+
status-context: elasticsearch-ci/part-3-windows
21+
cancel-builds-on-update: true
22+
black-list-target-branches:
23+
- 6.8
24+
- 7.17
25+
excluded-regions:
26+
- ^docs/.*
27+
white-list-labels:
28+
- 'test-windows'
29+
black-list-labels:
30+
- '>test-mute'
31+
builders:
32+
- inject:
33+
properties-file: '.ci/java-versions.properties'
34+
properties-content: |
35+
JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
36+
RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
37+
JAVA16_HOME=$USERPROFILE\\.java\\openjdk16
38+
GRADLE_TASK=checkPart3
39+
- batch: |
40+
del /f /s /q %USERPROFILE%\.gradle\init.d\*.*
41+
mkdir %USERPROFILE%\.gradle\init.d
42+
copy .ci\init.gradle %USERPROFILE%\.gradle\init.d\
43+
(
44+
echo call %GRADLEW_BAT% --max-workers=4 -Dbwc.checkout.align=true %GRADLE_TASK% ^|^| exit /b 1
45+
) | java -jar "C:\Program Files\infra\bin\runbld" --redirect-stderr -

‎.ci/jobs.t/elastic+elasticsearch+pull-request+part-3.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- job:
3-
name: "elastic+elasticsearch+pull-request+par-3"
4-
display-name: "elastic / elasticsearch - pull request part 3"
3+
name: "elastic+elasticsearch+pull-request+part-3"
4+
display-name: "elastic / elasticsearch - pull request part-3"
55
description: "Testing of Elasticsearch pull requests - part 3"
66
workspace: "/dev/shm/elastic+elasticsearch+pull-request+part-3"
77
scm:
@@ -18,8 +18,13 @@
1818
github-hooks: true
1919
status-context: elasticsearch-ci/part-3
2020
cancel-builds-on-update: true
21-
white-list-labels:
22-
- 'test-part-3'
21+
excluded-regions:
22+
- ^docs/.*
23+
black-list-labels:
24+
- '>test-mute'
25+
black-list-target-branches:
26+
- 6.8
27+
- 7.17
2328
builders:
2429
- inject:
2530
properties-file: '.ci/java-versions.properties'

‎.ci/jobs.t/elastic+elasticsearch+pull-request+precommit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
cancel-builds-on-update: true
2121
white-list-labels:
2222
- '>test-mute'
23-
black-list-target-branches:
24-
- feature/desired-balance-allocator
2523
builders:
2624
- inject:
2725
properties-file: '.ci/java-versions.properties'

‎.ci/jobs.t/elastic+elasticsearch+pull-request+rest-compatibility.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
- 7.16
2424
- 7.15
2525
- 6.8
26-
- feature/desired-balance-allocator
2726
excluded-regions:
2827
- ^docs/.*
2928
black-list-labels:

‎.ci/snapshotBwcVersions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
BWC_VERSION:
22
- "7.17.6"
3-
- "8.3.3"
3+
- "8.3.4"
44
- "8.4.0"
5+
- "8.5.0"

‎.ci/templates.t/pull-request-gradle-unix.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
- ^docs/.*
2323
black-list-labels:
2424
- '>test-mute'
25-
black-list-target-branches:
26-
- feature/desired-balance-allocator
2725
builders:
2826
- inject:
2927
properties-file: '.ci/java-versions.properties'

‎.github/CODEOWNERS

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# GitHub CODEOWNERS definition
2+
# Identify which groups will be pinged by changes to different parts of the codebase.
3+
# For more info, see https://help.github.com/articles/about-codeowners/
4+
5+
# Stack Monitoring index templates
6+
x-pack/plugin/core/src/main/resources/monitoring-alerts-7.json @elastic/infra-monitoring-ui
7+
x-pack/plugin/core/src/main/resources/monitoring-beats-mb.json @elastic/infra-monitoring-ui
8+
x-pack/plugin/core/src/main/resources/monitoring-beats.json @elastic/infra-monitoring-ui
9+
x-pack/plugin/core/src/main/resources/monitoring-ent-search-mb.json @elastic/infra-monitoring-ui
10+
x-pack/plugin/core/src/main/resources/monitoring-es-mb.json @elastic/infra-monitoring-ui
11+
x-pack/plugin/core/src/main/resources/monitoring-es.json @elastic/infra-monitoring-ui
12+
x-pack/plugin/core/src/main/resources/monitoring-kibana-mb.json @elastic/infra-monitoring-ui
13+
x-pack/plugin/core/src/main/resources/monitoring-kibana.json @elastic/infra-monitoring-ui
14+
x-pack/plugin/core/src/main/resources/monitoring-logstash-mb.json @elastic/infra-monitoring-ui
15+
x-pack/plugin/core/src/main/resources/monitoring-logstash.json @elastic/infra-monitoring-ui
16+
x-pack/plugin/core/src/main/resources/monitoring-mb-ilm-policy.json @elastic/infra-monitoring-ui
17+
x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringTemplateRegistry.java @elastic/infra-monitoring-ui

‎.github/workflows/sync-main-branch.yml

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

0 commit comments

Comments
 (0)