Skip to content

Commit 9a8d4b6

Browse files
kfirpeledkfirpeled
authored
Merge branch 'main' into cspm/alerts-mapping-update
2 parents adc10bd + e1868b3 commit 9a8d4b6

File tree

2,239 files changed

+15118
-4475
lines changed

Some content is hidden

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

2,239 files changed

+15118
-4475
lines changed

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ disabled:
3030
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts
3131
- x-pack/platform/test/alerting_api_integration/spaces_only_legacy/config.ts
3232
- x-pack/test/cloud_integration/config.ts
33-
- x-pack/test/load/config.ts
34-
- x-pack/test/plugin_api_perf/config.js
33+
- x-pack/platform/test/load/config.ts
34+
- x-pack/platform/test/plugin_api_perf/config.ts
3535
- x-pack/test/screenshot_creation/config.ts
36-
- x-pack/test/fleet_packages/config.ts
36+
- x-pack/platform/test/fleet_packages/config.ts
3737

3838
# Scalability testing config that we run in its own pipeline
39-
- x-pack/test/scalability/config.ts
39+
- x-pack/platform/test/scalability/config.ts
4040

4141
# Cypress configs, for now these are still run manually
4242
- x-pack/test/fleet_cypress/cli_config.ts
@@ -158,11 +158,11 @@ enabled:
158158
- x-pack/test/api_integration/apis/cases/config.ts
159159
- x-pack/test/api_integration/apis/security/config.ts
160160
- x-pack/test/banners_functional/config.ts
161-
- x-pack/test/cases_api_integration/security_and_spaces/config_basic.ts
162-
- x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts
163-
- x-pack/test/cases_api_integration/security_and_spaces/config_trial_common.ts
164-
- x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
165-
- x-pack/test/cases_api_integration/spaces_only/config.ts
161+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_basic.ts
162+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial.ts
163+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial_common.ts
164+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
165+
- x-pack/platform/test/cases_api_integration/spaces_only/config.ts
166166
- x-pack/test/disable_ems/config.ts
167167
- x-pack/test/examples/config.ts
168168
- x-pack/test/fleet_api_integration/config.agent.ts
@@ -173,8 +173,8 @@ enabled:
173173
- x-pack/test/fleet_api_integration/config.package_policy.ts
174174
- x-pack/test/fleet_api_integration/config.space_awareness.ts
175175
- x-pack/test/fleet_functional/config.ts
176-
- x-pack/test/fleet_tasks/config.ts
177-
- x-pack/test/ftr_apis/security_and_spaces/config.ts
176+
- x-pack/platform/test/fleet_tasks/config.ts
177+
- x-pack/platform/test/ftr_apis/security_and_spaces/config.ts
178178
- x-pack/test/functional_basic/apps/ml/permissions/config.ts
179179
- x-pack/test/functional_basic/apps/ml/data_visualizer/group1/config.ts
180180
- x-pack/test/functional_basic/apps/ml/data_visualizer/group2/config.ts
@@ -278,10 +278,10 @@ enabled:
278278
- x-pack/test/licensing_plugin/config.public.ts
279279
- x-pack/test/licensing_plugin/config.ts
280280
- x-pack/test/plugin_functional/config.ts
281-
- x-pack/test/reporting_api_integration/reporting_and_security.config.ts
282-
- x-pack/test/reporting_api_integration/reporting_without_security.config.ts
283-
- x-pack/test/reporting_functional/reporting_and_security.config.ts
284-
- x-pack/test/reporting_functional/reporting_without_security.config.ts
281+
- x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
282+
- x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
283+
- x-pack/platform/test/reporting_functional/reporting_and_security.config.ts
284+
- x-pack/platform/test/reporting_functional/reporting_without_security.config.ts
285285
- x-pack/test/rule_registry/security_and_spaces/config_basic.ts
286286
- x-pack/test/rule_registry/security_and_spaces/config_trial.ts
287287
- x-pack/test/rule_registry/spaces_only/config_basic.ts
@@ -330,7 +330,7 @@ enabled:
330330
- x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
331331
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
332332
- x-pack/test/spaces_api_integration/spaces_only/config.ts
333-
- x-pack/test/task_manager_claimer_update_by_query/config.ts
333+
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
334334
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
335335
- x-pack/test/ui_capabilities/spaces_only/config.ts
336336
- x-pack/test/upgrade_assistant_integration/config.ts
@@ -378,6 +378,7 @@ enabled:
378378
- x-pack/platform/test/api_integration/apis/management/config.ts
379379
- x-pack/platform/test/api_integration/apis/management/index_management/disabled_data_enrichers/config.ts
380380
- x-pack/platform/test/api_integration/apis/maps/config.ts
381+
- x-pack/platform/test/api_integration/apis/lens/config.ts
381382
- x-pack/platform/test/api_integration/apis/ml/config.ts
382383
- x-pack/platform/test/api_integration/apis/monitoring/config.ts
383384
- x-pack/platform/test/api_integration/apis/monitoring_collection/config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,3 +123,5 @@ enabled:
123123
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group1/config.ts
124124
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config.ts
125125
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
126+
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial.ts
127+
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial_common.ts

‎.buildkite/pipeline-resource-definitions/kibana-renovate-helper.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
2+
apiVersion: backstage.io/v1alpha1
3+
kind: Resource
4+
metadata:
5+
name: bk-kibana-renovate-helper
6+
description: 'Run scripts and trigger CI for Kibana Renovate PRs'
7+
links:
8+
- url: 'https://buildkite.com/elastic/kibana-renovate-helper'
9+
title: Pipeline link
10+
spec:
11+
type: buildkite-pipeline
12+
system: buildkite
13+
owner: 'group:kibana-operations'
14+
implementation:
15+
apiVersion: buildkite.elastic.dev/v1
16+
kind: Pipeline
17+
metadata:
18+
name: kibana / renovate helper
19+
description: 'Run scripts and trigger CI for Kibana Renovate PRs'
20+
spec:
21+
env:
22+
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
23+
24+
allow_rebuilds: true
25+
branch_configuration: main
26+
default_branch: main
27+
repository: elastic/kibana
28+
pipeline_file: .buildkite/pipelines/renovate_helper.yml
29+
cancel_intermediate_builds: true
30+
provider_settings:
31+
build_pull_requests: true
32+
prefix_pull_request_fork_branch_names: false
33+
skip_pull_request_builds_for_existing_commits: true
34+
trigger_mode: none
35+
teams:
36+
kibana-operations:
37+
access_level: MANAGE_BUILD_AND_READ
38+
kibana-security:
39+
access_level: MANAGE_BUILD_AND_READ
40+
kibana-tech-leads:
41+
access_level: MANAGE_BUILD_AND_READ
42+
everyone:
43+
access_level: BUILD_AND_READ
44+
tags:
45+
- kibana

‎.buildkite/pipeline-resource-definitions/locations.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ spec:
3838
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pointer-compression.yml
3939
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pr.yml
4040
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-purge-cloud-deployments.yml
41+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-renovate-helper.yml
4142
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-emergency-release.yml
4243
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates-emergency.yml
4344
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates.yml

‎.buildkite/pipelines/renovate_helper.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
agents:
2+
provider: gcp
3+
image: family/kibana-ubuntu-2004
4+
imageProject: elastic-images-prod
5+
machineType: n2-standard-2
6+
steps:
7+
- group: 'Renovate PR opened or comment'
8+
if: >-
9+
"(build.env('GITHUB_PR_USER') == 'elastic-renovate-prod[bot]' && build.env('GITHUB_PR_EVENT_TYPE') == 'pull_request' && build.env('GITHUB_PR_EVENT_ACTION') == 'opened')
10+
|| (build.env('GITHUB_PR_EVENT_TYPE') == 'issue_comment' && build.env('GITHUB_PR_EVENT_ACTION') == 'created')"
11+
12+
steps:
13+
- command: .buildkite/scripts/steps/renovate/renovate_helper.sh
14+
label: 'Run Renovate helper on PR opened or comment'
15+
key: renovate_helper
16+
timeout_in_minutes: 20
17+
retry:
18+
automatic:
19+
- exit_status: '*'
20+
limit: 1
21+
22+
- wait: ~
23+
24+
- command: .buildkite/scripts/steps/renovate/trigger_pr.sh
25+
label: 'Trigger Kibana PR pipeline on PR opened or comment'
26+
key: trigger_pr_opened
27+
timeout_in_minutes: 10
28+
retry:
29+
automatic:
30+
- exit_status: '*'
31+
limit: 1
32+
33+
- group: 'Renovate PR updated'
34+
# GITHUB_PR_USER is the PR author and GITHUB_PR_TRIGGER_USER is the commit author
35+
if: >-
36+
"build.env('GITHUB_PR_USER') == 'elastic-renovate-prod[bot]'
37+
&& build.env('GITHUB_PR_TRIGGER_USER') != 'elastic-renovate-prod[bot]'
38+
&& build.env('GITHUB_PR_EVENT_TYPE') == 'pull_request'
39+
&& build.env('GITHUB_PR_EVENT_ACTION') == 'synchronize'"
40+
41+
steps:
42+
- command: .buildkite/scripts/steps/renovate/trigger_pr.sh
43+
label: 'Trigger Kibana PR pipeline on PR updated'
44+
key: trigger_pr_updated
45+
timeout_in_minutes: 10
46+
retry:
47+
automatic:
48+
- exit_status: '*'
49+
limit: 1

‎.buildkite/pull_requests.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,21 @@
104104
"/__snapshots__/",
105105
"\\.test\\.(ts|tsx|js|jsx)"
106106
]
107+
},
108+
{
109+
"repoOwner": "elastic",
110+
"repoName": "kibana",
111+
"pipelineSlug": "kibana-renovate-helper",
112+
"skip_ci_labels": [],
113+
"enabled": true,
114+
"allow_org_users": true,
115+
"allowed_repo_permissions": ["admin", "write"],
116+
"allowed_list": ["elastic-vault-github-plugin-prod[bot]"],
117+
"build_on_commit": false,
118+
"build_on_comment": true,
119+
"build_drafts": false,
120+
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:run)\\W+(?:renovate)\\W+(?:helper))$",
121+
"kibana_versions_check": true
107122
}
108123
]
109124
}

‎.buildkite/scripts/pipelines/pull_request/pipeline.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,14 @@ const getPipeline = (filename: string, removeSteps = true) => {
197197
}
198198

199199
if (
200-
(await doAnyChangesMatch([
200+
((await doAnyChangesMatch([
201201
/\.docnav\.json$/,
202202
/\.apidocs\.json$/,
203203
/\.devdocs\.json$/,
204204
/\.mdx$/,
205205
/^dev_docs\/.*(png|gif|jpg|jpeg|webp)$/,
206-
])) ||
206+
])) &&
207+
process.env.GITHUB_PR_TARGET_BRANCH === 'main') ||
207208
GITHUB_PR_LABELS.includes('ci:build-next-docs')
208209
) {
209210
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/check_next_docs.yml'));

‎.buildkite/scripts/steps/fleet/install_all_packages.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ echo '--- Installing all packages'
99
node scripts/functional_tests \
1010
--debug \
1111
--bail \
12-
--config x-pack/test/fleet_packages/config.ts
12+
--config x-pack/platform/test/fleet_packages/config.ts

‎.buildkite/scripts/steps/renovate/renovate_helper.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
echo --- Called Renovate Helper
6+
exit 0
7+
8+
source .buildkite/scripts/common/util.sh
9+
10+
echo --- Deduplicate yarn.lock
11+
cmd="node scripts/yarn_deduplicate.js && yarn kbn bootstrap && node scripts/yarn_deduplicate.js"
12+
eval "$cmd"
13+
check_for_changed_files "$cmd" true

‎.buildkite/scripts/steps/renovate/trigger_pr.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
echo --- Triggering Kibana Pull Request Pipeline
6+
exit 0
7+
8+
ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-pull-request "$BUILDKITE_BRANCH"

0 commit comments

Comments
 (0)