Skip to content

Commit 42f6083

Browse files
mattkimemattkime
authored
Merge branch '8.19' into backport/8.19/pr-218705
2 parents d90cced + 29fbafa commit 42f6083

1,638 files changed

Lines changed: 48505 additions & 23510 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_platform_stateful_configs.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ disabled:
99
- src/platform/test/server_integration/config.base.js
1010
- x-pack/test/functional_with_es_ssl/config.base.ts
1111
- x-pack/test/api_integration/config.ts
12+
- x-pack/platform/test/api_integration/config.ts
1213
- x-pack/test/fleet_api_integration/config.base.ts
1314
- x-pack/test/functional_basic/apps/ml/config.base.ts
1415
- x-pack/test/functional_basic/apps/transform/config.base.ts
@@ -152,25 +153,16 @@ enabled:
152153
- x-pack/test/api_integration/apis/cases/config.ts
153154
- x-pack/test/api_integration/apis/content_management/config.ts
154155
- x-pack/test/api_integration/apis/console/config.ts
155-
- x-pack/test/api_integration/apis/es/config.ts
156-
- x-pack/test/api_integration/apis/features/config.ts
157-
- x-pack/test/api_integration/apis/file_upload/config.ts
158-
- x-pack/test/api_integration/apis/grok_debugger/config.ts
159-
- x-pack/test/api_integration/apis/kibana/config.ts
160156
- x-pack/test/api_integration/apis/lists/config.ts
161157
- x-pack/test/api_integration/apis/logstash/config.ts
162158
- x-pack/test/api_integration/apis/management/config.ts
163159
- x-pack/test/api_integration/apis/management/index_management/disabled_data_enrichers/config.ts
164160
- x-pack/test/api_integration/apis/maps/config.ts
165161
- x-pack/test/api_integration/apis/ml/config.ts
166162
- x-pack/test/api_integration/apis/monitoring/config.ts
167-
- x-pack/test/api_integration/apis/monitoring_collection/config.ts
168163
- x-pack/test/api_integration/apis/search/config.ts
169-
- x-pack/test/api_integration/apis/searchprofiler/config.ts
170164
- x-pack/test/api_integration/apis/security/config.ts
171165
- x-pack/test/api_integration/apis/spaces/config.ts
172-
- x-pack/test/api_integration/apis/stats/config.ts
173-
- x-pack/test/api_integration/apis/status/config.ts
174166
- x-pack/test/api_integration/apis/telemetry/config.ts
175167
- x-pack/test/api_integration/apis/transform/config.ts
176168
- x-pack/test/api_integration/apis/upgrade_assistant/config.ts
@@ -381,3 +373,13 @@ enabled:
381373
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/platform.stateful.config.ts
382374
- x-pack/test/api_integration/apis/cloud/config.ts
383375
- x-pack/test/api_integration/apis/cloud/saml.config.ts
376+
# configs migrated to the new Kibana architecture
377+
- x-pack/platform/test/api_integration/apis/features/config.ts
378+
- x-pack/platform/test/api_integration/apis/es/config.ts
379+
- x-pack/platform/test/api_integration/apis/grok_debugger/config.ts
380+
- x-pack/platform/test/api_integration/apis/file_upload/config.ts
381+
- x-pack/platform/test/api_integration/apis/kibana/config.ts
382+
- x-pack/platform/test/api_integration/apis/monitoring_collection/config.ts
383+
- x-pack/platform/test/api_integration/apis/searchprofiler/config.ts
384+
- x-pack/platform/test/api_integration/apis/stats/config.ts
385+
- x-pack/platform/test/api_integration/apis/status/config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ disabled:
55
- x-pack/test/security_solution_api_integration/config/ess/config.base.edr_workflows.trial.ts
66
- x-pack/test/security_solution_api_integration/config/ess/config.base.edr_workflows.ts
77
- x-pack/test/security_solution_api_integration/config/ess/config.base.trial.ts
8+
- x-pack/test/security_solution_api_integration/config/ess/config.base.frozen.trial.ts
89
- x-pack/test/security_solution_endpoint/configs/config.base.ts
910
- x-pack/test/security_solution_endpoint/config.base.ts
1011
- x-pack/test/security_solution_endpoint_api_int/config.base.ts
@@ -45,6 +46,7 @@ enabled:
4546
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/configs/ess.config.ts
4647
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/configs/ess.config.ts
4748
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/configs/ess.config.ts
49+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/frozen_indices_handling/trial_license_complete_tier/configs/ess.config.ts
4850
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/configs/ess.config.ts
4951
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/configs/ess.config.ts
5052
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/configs/ess.config.ts

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ async function main() {
3838

3939
const preamble = locationFileLines.slice(0, 1);
4040

41-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
4241
const locationObj = jsYaml.load(
4342
locationFileLines.slice(1).join('\n')
4443
) as BackstageLocationResource;
4544
locationObj.spec.targets = pipelines.map(
4645
(fileName) => `${resourceDefinitionsBaseUrl}/${fileName}`
4746
);
4847

49-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
5048
const locationYaml = jsYaml.dump(locationObj, { lineWidth: 400 });
5149

5250
fs.writeFileSync(locationFile, `${preamble.join('\n')}\n${locationYaml}`);

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

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

10-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1110
import { dump } from 'js-yaml';
1211
import { BuildkiteClient, BuildkiteAgentTargetingRule } from './buildkite';
1312

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import axios, { AxiosInstance } from 'axios';
1111
import { execSync, ExecSyncOptions } from 'child_process';
1212

13-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1413
import { dump } from 'js-yaml';
1514

1615
import { parseLinkHeader } from './parse_link_header';

‎.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import * as Fs from 'fs';
1212
import * as globby from 'globby';
1313
import minimatch from 'minimatch';
1414

15-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1615
import { load as loadYaml } from 'js-yaml';
1716

1817
import { BuildkiteClient, BuildkiteStep } from '../buildkite';
@@ -488,7 +487,7 @@ export async function pickTestGroupRunOrder() {
488487
key: 'jest',
489488
agents: {
490489
...expandAgentQueue('n2-4-spot'),
491-
diskSizeGb: 75,
490+
diskSizeGb: 80,
492491
},
493492
retry: {
494493
automatic: [

‎.buildkite/pipelines/build_pr_and_deploy_cloud.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ env:
44
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-deploy-cloud-from-pr
55

66
steps:
7+
- group: 'Notify if missing labels'
8+
if: "build.env('GITHUB_PR_LABELS') !~ /(ci:cloud-deploy|ci:cloud-redeploy)/"
9+
10+
steps:
11+
- command: |
12+
ts-node .buildkite/scripts/lifecycle/comment_on_pr.ts \
13+
--message "Cloud deployments require a Github label, please add \`ci:cloud-deploy\` or \`ci:cloud-redeploy\` and trigger the job through the checkbox again." \
14+
--context "cloud-deploy-job" \
15+
--clear-previous
16+
label: Comment missing labels
17+
agents:
18+
provider: gcp
19+
image: family/kibana-ubuntu-2004
20+
imageProject: elastic-images-prod
21+
machineType: n2-standard-2
22+
timeout_in_minutes: 5
23+
724
- group: 'Cloud Deployment'
825
if: "build.env('GITHUB_PR_LABELS') =~ /(ci:cloud-deploy|ci:cloud-redeploy)/"
926

‎.buildkite/pipelines/esql_grammar_sync.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
steps:
2-
- command: .buildkite/scripts/steps/esql_grammar_sync.sh
3-
label: Grammar Sync
4-
timeout_in_minutes: 10
5-
agents:
6-
image: family/kibana-ubuntu-2004
7-
imageProject: elastic-images-prod
8-
provider: gcp
9-
machineType: n2-standard-2
10-
preemptible: true
2+
# - command: .buildkite/scripts/steps/esql_grammar_sync.sh
3+
# label: Grammar Sync
4+
# timeout_in_minutes: 10
5+
# agents:
6+
# image: family/kibana-ubuntu-2004
7+
# imageProject: elastic-images-prod
8+
# provider: gcp
9+
# machineType: n2-standard-2
10+
# preemptible: true
1111
- command: .buildkite/scripts/steps/esql_generate_function_metadata.sh
1212
label: Generate Function Metadata
1313
timeout_in_minutes: 15

‎.buildkite/pipelines/serverless_deployment/build_pr_and_deploy_project.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ env:
44
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-deploy-project-from-pr
55

66
steps:
7+
- group: 'Notify if missing labels'
8+
if: "build.env('GITHUB_PR_LABELS') !~ /ci:project-deploy-(elasticsearch|observability|security)/"
9+
10+
steps:
11+
- command: |
12+
ts-node .buildkite/scripts/lifecycle/comment_on_pr.ts \
13+
--message "Project deployments require a Github label, please add one or more of \`ci:project-deploy-(elasticsearch|observability|security)\` and trigger the job through the checkbox again." \
14+
--context "project-deploy-job" \
15+
--clear-previous
16+
label: Comment missing labels
17+
agents:
18+
provider: gcp
19+
image: family/kibana-ubuntu-2004
20+
imageProject: elastic-images-prod
21+
machineType: n2-standard-2
22+
timeout_in_minutes: 5
23+
724
- group: 'Project Deployment'
825
if: "build.env('GITHUB_PR_LABELS') =~ /ci:project-deploy-(elasticsearch|observability|security)/"
926

‎.buildkite/scout_ci_config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ ui_tests:
44
- discover_enhanced
55
- maps
66
- observability_onboarding
7+
- painless_lab
78
- security_solution
89
disabled:

0 commit comments

Comments
 (0)