Skip to content

Commit 4e1e8af

Browse files
walterrawalterra
committed
Merge branch 'main' into ml-ad-ae-anomaly-charts-popover
2 parents 4959864 + 233fe60 commit 4e1e8af

22,836 files changed

Lines changed: 240129 additions & 210078 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.

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ disabled:
1212
- x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
1313
- x-pack/test/security_solution_cypress/serverless_config.ts
1414

15+
# Playwright
16+
- x-pack/test/security_solution_playwright/serverless_config.ts
17+
1518
# Serverless base config files
1619
- x-pack/test_serverless/api_integration/config.base.ts
1720
- x-pack/test_serverless/functional/config.base.ts
@@ -74,6 +77,8 @@ enabled:
7477
- x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/serverless.config.ts
7578
- x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/trial_license_complete_tier/configs/serverless.config.ts
7679
- 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
7782
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
7883
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
7984
- 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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ disabled:
2424
- x-pack/test/threat_intelligence_cypress/cli_config_parallel.ts
2525
- x-pack/test/threat_intelligence_cypress/config.ts
2626

27+
# Playwright
28+
- x-pack/test/security_solution_playwright/playwright.config.ts
29+
2730
defaultQueue: 'n2-4-spot'
2831
enabled:
2932
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts

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

Lines changed: 3 additions & 7 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 8.14 7.17
25+
branch_configuration: main 8.15 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -53,10 +53,6 @@ spec:
5353
cronline: 0 9 * * * America/New_York
5454
message: Daily build
5555
branch: '8.15'
56-
Daily build (8.14):
57-
cronline: 0 9 * * * America/New_York
58-
message: Daily build
59-
branch: '8.14'
6056
Daily build (7.17):
6157
cronline: 0 9 * * * America/New_York
6258
message: Daily build
@@ -86,7 +82,7 @@ spec:
8682
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
8783
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
8884
allow_rebuilds: true
89-
branch_configuration: main 8.15 8.14 7.17
85+
branch_configuration: main 8.15 7.17
9086
default_branch: main
9187
repository: elastic/kibana
9288
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -134,7 +130,7 @@ spec:
134130
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
135131
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
136132
allow_rebuilds: true
137-
branch_configuration: main 8.15 8.14 7.17
133+
branch_configuration: main 8.15 7.17
138134
default_branch: main
139135
repository: elastic/kibana
140136
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml

‎.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 8.14 7.17
25+
branch_configuration: main 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.14 8.15
28+
branch_configuration: main 7.17 8.15
2929
default_branch: main
3030
repository: elastic/kibana
3131
pipeline_file: .buildkite/pipelines/on_merge.yml

‎.buildkite/pipeline-resource-definitions/scripts/fix-location-collection.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
#!/usr/bin/env ts-node-script
22
/*
33
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
4-
* or more contributor license agreements. Licensed under the Elastic License
5-
* 2.0 and the Server Side Public License, v 1; you may not use this file except
6-
* in compliance with, at your election, the Elastic License 2.0 or the Server
7-
* Side Public License, v 1.
4+
* or more contributor license agreements. Licensed under the "Elastic License
5+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
6+
* Public License v 1"; you may not use this file except in compliance with, at
7+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
8+
* License v3.0 only", or the "Server Side Public License, v 1".
89
*/
10+
911
import fs from 'fs';
1012
import jsYaml from 'js-yaml';
1113
import path from 'path';

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3-
* or more contributor license agreements. Licensed under the Elastic License
4-
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5-
* in compliance with, at your election, the Elastic License 2.0 or the Server
6-
* Side Public License, v 1.
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
78
*/
89

910
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3-
* or more contributor license agreements. Licensed under the Elastic License
4-
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5-
* in compliance with, at your election, the Elastic License 2.0 or the Server
6-
* Side Public License, v 1.
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
78
*/
89

910
import { expect } from 'chai';

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3-
* or more contributor license agreements. Licensed under the Elastic License
4-
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5-
* in compliance with, at your election, the Elastic License 2.0 or the Server
6-
* Side Public License, v 1.
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
78
*/
89

910
import axios, { AxiosInstance } from 'axios';

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3-
* or more contributor license agreements. Licensed under the Elastic License
4-
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5-
* in compliance with, at your election, the Elastic License 2.0 or the Server
6-
* Side Public License, v 1.
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
78
*/
89

910
export * from './client';

0 commit comments

Comments
 (0)