Skip to content

Commit 68369f4

Browse files
ashokadityaashokaditya
authored
Merge branch 'main' into feat/data-usage-metrics-ux-api-192965-192966
2 parents e7f32cd + 62ca320 commit 68369f4

2,137 files changed

Lines changed: 46056 additions & 18588 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_oblt_serverless_configs.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ disabled:
66
- x-pack/test_serverless/functional/test_suites/observability/cypress/config_headless.ts
77
- x-pack/test_serverless/functional/test_suites/observability/cypress/config_runner.ts
88

9-
# serverless config files that run deployment-agnostic tests
10-
# Failing https://github.com/elastic/kibana/issues/195811
11-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
12-
139
defaultQueue: 'n2-4-spot'
1410
enabled:
1511
- x-pack/test_serverless/api_integration/test_suites/observability/config.ts
@@ -29,3 +25,5 @@ enabled:
2925
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts
3026
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group6.ts
3127
- x-pack/test_serverless/functional/test_suites/observability/config.screenshots.ts
28+
# serverless config files that run deployment-agnostic tests
29+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ disabled:
3434

3535
# Cypress configs, for now these are still run manually
3636
- x-pack/test/fleet_cypress/cli_config.ts
37+
- x-pack/test/fleet_cypress/cli_config.space_awareness.ts
3738
- x-pack/test/fleet_cypress/config.ts
39+
- x-pack/test/fleet_cypress/config.space_awareness.ts
3840
- x-pack/test/fleet_cypress/visual_config.ts
3941

4042
defaultQueue: 'n2-4-spot'

‎.buildkite/ftr_search_serverless_configs.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
disabled:
22
# Base config files, only necessary to inform config finding script
33

4-
# serverless config files that run deployment-agnostic tests
5-
# Failing https://github.com/elastic/kibana/issues/195811
6-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/search.serverless.config.ts
7-
84
defaultQueue: 'n2-4-spot'
95
enabled:
106
- x-pack/test_serverless/api_integration/test_suites/search/config.ts
@@ -22,3 +18,5 @@ enabled:
2218
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group4.ts
2319
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts
2420
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group6.ts
21+
# serverless config files that run deployment-agnostic tests
22+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/search.serverless.config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ disabled:
2020
- x-pack/test_serverless/functional/config.base.ts
2121
- x-pack/test_serverless/shared/config.base.ts
2222

23-
# serverless config files that run deployment-agnostic tests
24-
# Failing https://github.com/elastic/kibana/issues/195811
25-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/security.serverless.config.ts
26-
2723
defaultQueue: 'n2-4-spot'
2824
enabled:
2925
- x-pack/test_serverless/api_integration/test_suites/security/config.ts
@@ -104,3 +100,5 @@ enabled:
104100
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/response_actions/trial_license_complete_tier/configs/serverless.config.ts
105101
- x-pack/test/security_solution_endpoint/configs/serverless.endpoint.config.ts
106102
- x-pack/test/security_solution_endpoint/configs/serverless.integrations.config.ts
103+
# serverless config files that run deployment-agnostic tests
104+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/security.serverless.config.ts

‎.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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-deploy-project-from-pr
6+
description: 'Builds and deploys a Kibana serverless project from a PR'
7+
links:
8+
- url: 'https://buildkite.com/elastic/kibana-deploy-project-from-pr'
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 / deploy project from PR
19+
description: 'Builds and deploys a Kibana serverless project from a PR'
20+
spec:
21+
env:
22+
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
23+
24+
allow_rebuilds: false
25+
branch_configuration: main
26+
default_branch: main
27+
repository: elastic/kibana
28+
pipeline_file: .buildkite/pipelines/serverless_deployment/project-build-and-deploy-pr.yml
29+
skip_intermediate_builds: true
30+
provider_settings:
31+
prefix_pull_request_fork_branch_names: false
32+
skip_pull_request_builds_for_existing_commits: true
33+
trigger_mode: none
34+
teams:
35+
kibana-operations:
36+
access_level: MANAGE_BUILD_AND_READ
37+
appex-qa:
38+
access_level: MANAGE_BUILD_AND_READ
39+
kibana-tech-leads:
40+
access_level: MANAGE_BUILD_AND_READ
41+
everyone:
42+
access_level: BUILD_AND_READ
43+
tags:
44+
- kibana

‎.buildkite/pipeline-resource-definitions/kibana-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ spec:
2020
spec:
2121
env:
2222
ELASTIC_PR_COMMENTS_ENABLED: 'true'
23-
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
24-
ELASTIC_GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
23+
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
24+
GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
2525
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
2626
allow_rebuilds: true
2727
branch_configuration: ''

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ spec:
1616
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-chrome-forward-testing.yml
1717
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-codeql.yml
1818
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-coverage-daily.yml
19+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml
1920
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
2021
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-serverless-snapshots.yml
2122
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml

‎.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ steps:
5454
env:
5555
FTR_CONFIGS_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/ftr_configs.sh"
5656
JEST_INTEGRATION_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/jest_integration.sh"
57-
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts"
57+
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/test/api_integration/deployment_agnostic/configs/serverless/**"
5858
FTR_EXTRA_ARGS: "$FTR_EXTRA_ARGS"
5959
LIMIT_CONFIG_TYPE: "functional,integration"
6060
retry:

‎.buildkite/pipelines/quality-gates/emergency/pipeline.tests-production.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
env:
1111
TARGET_ENV: production
1212
CHECK_SLO: true
13-
CHECK_SLO_TAG: kibana
13+
CHECK_SLO_TAG: kbn-quality-gate
1414
CHECK_SLO_WAITING_PERIOD: 15m
1515
CHECK_SLO_BURN_RATE_THRESHOLD: 0.1
1616
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}

‎.buildkite/pipelines/quality-gates/emergency/pipeline.tests-staging.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ steps:
4646
command: "make -C /agent trigger-manual-verification-phase"
4747
agents:
4848
image: "docker.elastic.co/ci-agent-images/manual-verification-agent:0.0.6"
49+
if: build.env("DEPLOYMENT_SLICES") =~ /.*staging-ds-2.*/

0 commit comments

Comments
 (0)