Skip to content

Commit

Permalink
Merge branch 'main' into tm/capacity-estimation-nan
Browse files Browse the repository at this point in the history
  • Loading branch information
doakalexi authored Jan 21, 2025
2 parents 8d830e6 + a7e46fe commit 286c9e2
Show file tree
Hide file tree
Showing 2,482 changed files with 69,868 additions and 19,421 deletions.
6 changes: 1 addition & 5 deletions .buildkite/ftr_oblt_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ disabled:
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config.ts
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config_run.ts
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config.ts
- x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_open.ts
- x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_runner.ts
- x-pack/solutions/observability/plugins/profiling/e2e/ftr_config.ts

- x-pack/test/profiling_cypress/cli_config.ts
#FTR configs
- x-pack/solutions/observability/plugins/uptime/e2e/config.ts

Expand All @@ -31,7 +28,6 @@ enabled:
- x-pack/test/api_integration/apis/synthetics/config.ts
- x-pack/test/api_integration/apis/uptime/config.ts
- x-pack/test/api_integration/apis/entity_manager/config.ts
- x-pack/test/api_integration/apis/streams/config.ts
- x-pack/test/apm_api_integration/basic/config.ts
- x-pack/test/apm_api_integration/cloud/config.ts
- x-pack/test/apm_api_integration/rules/config.ts
Expand Down
1 change: 1 addition & 0 deletions .buildkite/ftr_security_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,4 @@ enabled:
- x-pack/test/cloud_security_posture_functional/data_views/config.ts
- x-pack/test/automatic_import_api_integration/apis/config_basic.ts
- x-pack/test/automatic_import_api_integration/apis/config_graphs.ts
- x-pack/test/security_solution_api_integration/test_suites/asset_inventory/entity_store/trial_license_complete_tier/configs/ess.config.ts
14 changes: 7 additions & 7 deletions .buildkite/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .buildkite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"devDependencies": {
"@types/chai": "^4.3.3",
"@types/js-yaml": "^4.0.5",
"@types/js-yaml": "^4.0.9",
"@types/minimatch": "^3.0.5",
"@types/mocha": "^10.0.1",
"@types/node": "^15.12.2",
Expand Down
16 changes: 16 additions & 0 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,22 @@ steps:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/profiling_cypress.sh
label: 'Profiling Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on: build
timeout_in_minutes: 120
parallelism: 3
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/apm_cypress.sh
label: 'APM Cypress Tests'
agents:
Expand Down
19 changes: 0 additions & 19 deletions .buildkite/pipelines/on_merge_unsupported_ftrs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,6 @@ steps:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/functional/profiling_cypress.sh
label: 'Profiling Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on: build
env:
PING_SLACK_TEAM: "@obs-ux-infra_services-team"
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '-1'
limit: 3
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/functional/synthetics_plugin.sh
label: 'Synthetics @elastic/synthetics Tests'
agents:
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/pull_request/profiling_cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ steps:
- check_types
- check_oas_snapshot
timeout_in_minutes: 120
parallelism: 2
parallelism: 3
retry:
automatic:
- exit_status: '-1'
Expand Down
12 changes: 5 additions & 7 deletions .buildkite/scripts/steps/functional/profiling_cypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@

set -euo pipefail

source .buildkite/scripts/common/util.sh
source .buildkite/scripts/steps/functional/common.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh
.buildkite/scripts/copy_es_snapshot_cache.sh
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}

export JOB=kibana-profiling-cypress

echo "--- Profiling Cypress Tests"

cd "$XPACK_DIR"
cd "$XPACK_DIR/solutions/observability/plugins/profiling/e2e"

NODE_OPTIONS=--openssl-legacy-provider node solutions/observability/plugins/profiling/scripts/test/e2e.js \
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
set +e
yarn cypress:run; status=$?; yarn junit:merge || :; exit $status
5 changes: 3 additions & 2 deletions .buildkite/scripts/steps/package_testing/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ set -euo pipefail
source "$(dirname "$0")/../../common/util.sh"
.buildkite/scripts/bootstrap.sh

# temporary adding this to get screenshots
is_test_execution_step
# temporary enable this to get screenshots on package testing failures
#
#is_test_execution_step

echo "--- Package Testing for $TEST_PACKAGE"

Expand Down
13 changes: 11 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ x-pack/solutions/security/packages/kbn-securitysolution-list-hooks @elastic/secu
x-pack/solutions/security/packages/kbn-securitysolution-list-utils @elastic/security-detection-engine
x-pack/solutions/security/packages/kbn-securitysolution-lists-common @elastic/security-detection-engine
x-pack/solutions/security/packages/kbn-securitysolution-t-grid @elastic/security-detection-engine
x-pack/solutions/security/packages/kbn-securitysolution-utils @elastic/security-detection-engine
x-pack/solutions/security/packages/kbn-securitysolution-utils @elastic/security-detection-engine @elastic/security-detection-rule-management
x-pack/solutions/security/packages/navigation @elastic/security-threat-hunting-explore
x-pack/solutions/security/packages/side_nav @elastic/security-threat-hunting-explore
x-pack/solutions/security/packages/storybook/config @elastic/security-threat-hunting-explore
Expand Down Expand Up @@ -1247,7 +1247,6 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql


# Observability UI
/x-pack/test/api_integration/apis/streams @elastic/observability-ui # Assigned per https://github.com/elastic/kibana/pull/201293
/x-pack/test_serverless/api_integration/test_suites/observability/config.ts @elastic/observability-ui @elastic/appex-qa
/x-pack/test_serverless/api_integration/test_suites/observability/index.ts @elastic/observability-ui

Expand Down Expand Up @@ -1450,6 +1449,9 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
# Observability settings
/x-pack/plugins/observability_solution/observability/server/ui_settings.ts @elastic/obs-docs

# Streams
/x-pack/test/api_integration/deployment_agnostic/apis/observability/streams @elastic/streams-program-team

### END Observability Plugins

# Presentation
Expand Down Expand Up @@ -2187,6 +2189,7 @@ x-pack/test/security_solution_api_integration/test_suites/detections_response/te
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/siem_migrations @elastic/security-threat-hunting
x-pack/test/security_solution_api_integration/test_suites/sources @elastic/security-detections-response
/x-pack/test/common/utils/security_solution/detections_response @elastic/security-detections-response
/x-pack/test/functional/es_archives/signals @elastic/security-detections-response
Expand Down Expand Up @@ -2513,6 +2516,9 @@ x-pack/solutions/security/plugins/security_solution/public/common/components/ses
x-pack/solutions/security/plugins/security_solution/public/cloud_defend @elastic/kibana-cloud-security-posture
x-pack/solutions/security/plugins/security_solution/public/cloud_security_posture @elastic/kibana-cloud-security-posture
x-pack/solutions/security/plugins/security_solution/public/kubernetes @elastic/kibana-cloud-security-posture
x-pack/test/security_solution_api_integration/test_suites/asset_inventory @elastic/kibana-cloud-security-posture
x-pack/solutions/security/plugins/security_solution/server/lib/asset_inventory @elastic/kibana-cloud-security-posture

## Fleet plugin (co-owned with Fleet team)
x-pack/platform/plugins/shared/fleet/public/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
Expand Down Expand Up @@ -2580,6 +2586,9 @@ x-pack/solutions/security/plugins/security_solution/server/lib/security_integrat
# Changes to translation files should not ping code reviewers
x-pack/platform/plugins/private/translations/translations

# Profiling cypress tests
x-pack/test/profiling_cypress @elastic/obs-ux-infra_services-team

# Profiling api integration testing
x-pack/test/profiling_api_integration @elastic/obs-ux-infra_services-team

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ src/platform/packages/**/package-map.json
/packages/kbn-synthetic-package-map/
**/.synthetics/
**/.journeys/
**/.rca/
x-pack/test/security_api_integration/plugins/audit_log/audit.log

# ignore FTR temp directory
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: 2025-01-16
date: 2025-01-21
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: 2025-01-16
date: 2025-01-21
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: 2025-01-16
date: 2025-01-21
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: 2025-01-16
date: 2025-01-21
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
---
import aiopsObj from './aiops.devdocs.json';
Expand Down
Loading

0 comments on commit 286c9e2

Please sign in to comment.