Skip to content

Commit f181993

Browse files
rylndrylnd
authored
Merge branch 'main' into remove_internals_from_snapshots
2 parents 1422369 + b31d119 commit f181993

3,382 files changed

Lines changed: 105317 additions & 102682 deletions

File tree

Some content is hidden

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

‎.backportrc.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"repoName": "kibana",
44
"targetBranchChoices": [
55
"main",
6+
"8.x",
67
"8.15",
78
"8.14",
89
"8.13",
@@ -52,7 +53,8 @@
5253
"backport"
5354
],
5455
"branchLabelMapping": {
55-
"^v8.16.0$": "main",
56+
"^v9.0.0$": "main",
57+
"^v8.16.0$": "8.x",
5658
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
5759
},
5860
"autoMerge": true,

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ enabled:
7777
- x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/serverless.config.ts
7878
- x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/trial_license_complete_tier/configs/serverless.config.ts
7979
- x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/basic_license_essentials_tier/configs/serverless.config.ts
80+
- x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/ess.config.ts
81+
- x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/serverless.config.ts
8082
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
8183
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
8284
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/serverless.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ disabled:
2121
- x-pack/test/osquery_cypress/visual_config.ts
2222
- x-pack/test/security_solution_cypress/cli_config.ts
2323
- x-pack/test/security_solution_cypress/config.ts
24-
- x-pack/test/threat_intelligence_cypress/cli_config_parallel.ts
25-
- x-pack/test/threat_intelligence_cypress/config.ts
2624

2725
# Playwright
2826
- x-pack/test/security_solution_playwright/playwright.config.ts

‎.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: true
25-
branch_configuration: main 8.15 7.17
25+
branch_configuration: main 8.x 8.15 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -49,6 +49,10 @@ spec:
4949
cronline: 0 9 * * * America/New_York
5050
message: Daily build
5151
branch: main
52+
Daily build (8.x):
53+
cronline: 0 9 * * * America/New_York
54+
message: Daily build
55+
branch: '8.x'
5256
Daily build (8.15):
5357
cronline: 0 9 * * * America/New_York
5458
message: Daily build
@@ -82,7 +86,7 @@ spec:
8286
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
8387
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
8488
allow_rebuilds: true
85-
branch_configuration: main 8.15 7.17
89+
branch_configuration: main 8.x 8.15 7.17
8690
default_branch: main
8791
repository: elastic/kibana
8892
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -130,7 +134,7 @@ spec:
130134
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
131135
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
132136
allow_rebuilds: true
133-
branch_configuration: main 8.15 7.17
137+
branch_configuration: main 8.x 8.15 7.17
134138
default_branch: main
135139
repository: elastic/kibana
136140
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml

‎.buildkite/pipeline-resource-definitions/kibana-fips-daily.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,7 @@ spec:
3434
teams:
3535
kibana-operations:
3636
access_level: MANAGE_BUILD_AND_READ
37+
kibana-security:
38+
access_level: MANAGE_BUILD_AND_READ
3739
everyone:
3840
access_level: READ_ONLY

‎.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: true
25-
branch_configuration: main 8.15 7.17
25+
branch_configuration: main 8.x 8.15 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml

‎.buildkite/pipeline-resource-definitions/kibana-on-merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
2626
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2727
allow_rebuilds: true
28-
branch_configuration: main 7.17 8.15
28+
branch_configuration: main 8.x 8.15 7.17
2929
default_branch: main
3030
repository: elastic/kibana
3131
pipeline_file: .buildkite/pipelines/on_merge.yml

‎.buildkite/pipeline-utils/utils.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ describe('getVersionsFile', () => {
3636
const versionsFile = getVersionsFile();
3737

3838
expect(versionsFile.prevMajors).to.be.an('array');
39-
expect(versionsFile.prevMajors.length).to.eql(1);
40-
expect(versionsFile.prevMajors[0].branch).to.eql('7.17');
41-
4239
expect(versionsFile.prevMinors).to.be.an('array');
4340
});
4441

‎.buildkite/pipeline-utils/utils.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ const getVersionsFile = (() => {
4343
prevMinors: Version[];
4444
prevMajors: Version[];
4545
current: Version;
46+
versions: Version[];
4647
};
4748
const versionsFileName = 'versions.json';
4849
try {

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -386,24 +386,6 @@ steps:
386386
- exit_status: '-1'
387387
limit: 1
388388

389-
- command: .buildkite/scripts/steps/functional/threat_intelligence.sh
390-
label: 'Threat Intelligence Cypress Tests'
391-
agents:
392-
image: family/kibana-ubuntu-2004
393-
imageProject: elastic-images-prod
394-
provider: gcp
395-
machineType: n2-standard-4
396-
preemptible: true
397-
depends_on:
398-
- build
399-
- quick_checks
400-
timeout_in_minutes: 60
401-
parallelism: 1
402-
retry:
403-
automatic:
404-
- exit_status: '-1'
405-
limit: 1
406-
407389
- command: .buildkite/scripts/steps/functional/osquery_cypress.sh
408390
label: 'Osquery Cypress Tests'
409391
agents:

0 commit comments

Comments
 (0)