Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into api-keys
Browse files Browse the repository at this point in the history
  • Loading branch information
rshen91 committed May 10, 2024
2 parents 5681fe2 + 8b9c654 commit 62b86f5
Show file tree
Hide file tree
Showing 845 changed files with 4,903 additions and 116,048 deletions.
15 changes: 14 additions & 1 deletion .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ enabled:
- x-pack/test/api_integration/apis/search/config.ts
- x-pack/test/api_integration/apis/searchprofiler/config.ts
- x-pack/test/api_integration/apis/security/config.ts
- x-pack/test/api_integration/apis/security_solution/config.ts
- x-pack/test/api_integration/apis/spaces/config.ts
- x-pack/test/api_integration/apis/stats/config.ts
- x-pack/test/api_integration/apis/status/config.ts
Expand Down Expand Up @@ -551,3 +550,17 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/users/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/users/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/serverless.config.ts
79 changes: 60 additions & 19 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ steps:
label: 'Serverless Entity Analytics - Security Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -108,7 +110,9 @@ steps:
label: 'Serverless Explore - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -120,7 +124,9 @@ steps:
label: 'Serverless Investigations - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 8
retry:
Expand All @@ -132,7 +138,9 @@ steps:
label: 'Serverless Rule Management - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 5
retry:
Expand All @@ -144,7 +152,9 @@ steps:
label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -156,7 +166,9 @@ steps:
label: 'Rule Management - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 4
retry:
Expand All @@ -168,7 +180,9 @@ steps:
label: 'Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 6
retry:
Expand All @@ -180,7 +194,9 @@ steps:
label: 'Serverless Detection Engine - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 5
retry:
Expand All @@ -192,7 +208,9 @@ steps:
label: 'Serverless Detection Engine - Exceptions - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 6
retry:
Expand All @@ -204,7 +222,9 @@ steps:
label: 'Detection Engine - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 5
retry:
Expand All @@ -216,7 +236,9 @@ steps:
label: 'Detection Engine - Exceptions - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 6
retry:
Expand All @@ -228,7 +250,9 @@ steps:
label: 'Serverless AI Assistant - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 1
retry:
Expand All @@ -240,7 +264,9 @@ steps:
label: 'AI Assistant - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 1
retry:
Expand All @@ -252,7 +278,9 @@ steps:
label: 'Entity Analytics - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -264,7 +292,9 @@ steps:
label: 'Explore - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 3
retry:
Expand All @@ -276,7 +306,9 @@ steps:
label: 'Investigations - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 7
retry:
Expand All @@ -288,7 +320,9 @@ steps:
label: 'Threat Intelligence Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 1
retry:
Expand All @@ -300,7 +334,9 @@ steps:
label: 'Osquery Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 8
retry:
Expand All @@ -312,7 +348,9 @@ steps:
label: 'Serverless Osquery Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 8
retry:
Expand All @@ -326,6 +364,7 @@ steps:
queue: n2-4-virt
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 20
retry:
Expand All @@ -339,6 +378,7 @@ steps:
queue: n2-4-virt
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 14
retry:
Expand All @@ -351,6 +391,7 @@ steps:
timeout_in_minutes: 10
depends_on:
- build
- quick_checks
agents:
queue: 'kibana-default'

Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ steps:
label: 'Check Types'
agents:
queue: n2-4-spot
key: check_types
timeout_in_minutes: 60
retry:
automatic:
Expand All @@ -93,6 +94,7 @@ steps:

- command: .buildkite/scripts/steps/checks.sh
label: 'Checks'
key: checks
agents:
queue: n2-2-spot
timeout_in_minutes: 60
Expand Down
17 changes: 15 additions & 2 deletions .buildkite/pipelines/pull_request/deploy_project.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
steps:
- command: .buildkite/scripts/steps/serverless/build_and_deploy.sh
label: 'Build and Deploy Project'
- command: .buildkite/scripts/steps/artifacts/docker_image.sh
label: 'Build Project Image'
key: build_project_image
agents:
queue: n2-16-spot
timeout_in_minutes: 60
Expand All @@ -9,3 +10,15 @@ steps:
automatic:
- exit_status: '-1'
limit: 3
- command: .buildkite/scripts/steps/serverless/deploy.sh
label: 'Deploy Project'
agents:
queue: kibana-default
timeout_in_minutes: 10
depends_on:
- build_project_image
- linting
- linting_with_types
- checks
- check_types
soft_fail: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set -euo pipefail


source .buildkite/scripts/common/util.sh
source .buildkite/scripts/steps/artifacts/docker_image.sh

KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless:pr-$BUILDKITE_PULL_REQUEST-${BUILDKITE_COMMIT:0:12}"

deploy() {
PROJECT_TYPE=$1
Expand Down
5 changes: 4 additions & 1 deletion .buildkite/scripts/steps/test/jest_parallel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ echo "
while read -r config; do
echo "--- $ node scripts/jest --config $config"

cmd="NODE_OPTIONS=\"--max-old-space-size=14336\" node ./scripts/jest --config=\"$config\" $parallelism --coverage=false --passWithNoTests"
# --trace-warnings to debug
# Node.js process-warning detected:
# Warning: Closing file descriptor 24 on garbage collection
cmd="NODE_OPTIONS=\"--max-old-space-size=12288 --trace-warnings\" node ./scripts/jest --config=\"$config\" $parallelism --coverage=false --passWithNoTests"
echo "actual full command is:"
echo "$cmd"
echo ""
Expand Down
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -1378,6 +1378,9 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
x-pack/test/security_solution_api_integration/test_suites/detections_response/utils @elastic/security-detections-response
x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry @elastic/security-detections-response
x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles @elastic/security-detections-response
x-pack/test/security_solution_api_integration/test_suites/explore @elastic/security-threat-hunting-explore
x-pack/test/security_solution_api_integration/test_suites/investigations @elastic/security-threat-hunting-investigations
x-pack/test/security_solution_api_integration/test_suites/sources @elastic/security-detections-response

# Security Solution sub teams

Expand Down
2 changes: 1 addition & 1 deletion api_docs/actions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
title: "actions"
image: https://source.unsplash.com/400x175/?github
description: API docs for the actions plugin
date: 2024-05-09
date: 2024-05-10
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
---
import actionsObj from './actions.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/advanced_settings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
title: "advancedSettings"
image: https://source.unsplash.com/400x175/?github
description: API docs for the advancedSettings plugin
date: 2024-05-09
date: 2024-05-10
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
---
import advancedSettingsObj from './advanced_settings.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/ai_assistant_management_selection.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
title: "aiAssistantManagementSelection"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiAssistantManagementSelection plugin
date: 2024-05-09
date: 2024-05-10
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
---
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/aiops.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
title: "aiops"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiops plugin
date: 2024-05-09
date: 2024-05-10
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
---
import aiopsObj from './aiops.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/alerting.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
title: "alerting"
image: https://source.unsplash.com/400x175/?github
description: API docs for the alerting plugin
date: 2024-05-09
date: 2024-05-10
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
---
import alertingObj from './alerting.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/apm.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
title: "apm"
image: https://source.unsplash.com/400x175/?github
description: API docs for the apm plugin
date: 2024-05-09
date: 2024-05-10
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
---
import apmObj from './apm.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/apm_data_access.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apmDataAccess
title: "apmDataAccess"
image: https://source.unsplash.com/400x175/?github
description: API docs for the apmDataAccess plugin
date: 2024-05-09
date: 2024-05-10
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apmDataAccess']
---
import apmDataAccessObj from './apm_data_access.devdocs.json';
Expand Down

0 comments on commit 62b86f5

Please sign in to comment.