Skip to content

Commit

Permalink
Merge branch 'main' into test/unskip_timelines_cypress
Browse files Browse the repository at this point in the history
  • Loading branch information
logeekal authored Oct 25, 2024
2 parents 812f9af + a5517d9 commit ef3025e
Show file tree
Hide file tree
Showing 1,915 changed files with 21,681 additions and 129,211 deletions.
3 changes: 2 additions & 1 deletion .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ enabled:
- x-pack/test/functional/apps/ml/permissions/config.ts
- x-pack/test/functional/apps/ml/short_tests/config.ts
- x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
- x-pack/test/functional/apps/ml/memory_usage/config.ts
- x-pack/test/functional/apps/monitoring/config.ts
- x-pack/test/functional/apps/painless_lab/config.ts
- x-pack/test/functional/apps/remote_clusters/config.ts
Expand Down Expand Up @@ -341,7 +342,7 @@ enabled:
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
- x-pack/test/spaces_api_integration/spaces_only/config.ts
- x-pack/test/task_manager_claimer_mget/config.ts
- x-pack/test/task_manager_claimer_update_by_query/config.ts
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
- x-pack/test/ui_capabilities/spaces_only/config.ts
- x-pack/test/upgrade_assistant_integration/config.ts
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/ftr_security_serverless_configs.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
disabled:
# Base config files, only necessary to inform config finding script
- x-pack/test_serverless/functional/test_suites/security/cypress/security_config.base.ts
- x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
- x-pack/test/security_solution_api_integration/config/serverless/config.base.ts
- x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts
- x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts
- x-pack/test/defend_workflows_cypress/serverless_config.base.ts
- x-pack/test/osquery_cypress/serverless_config.base.ts

# Cypress configs, for now these are still run manually
- x-pack/test/defend_workflows_cypress/serverless_config.ts
- x-pack/test/osquery_cypress/serverless_cli_config.ts
- x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
- x-pack/test/security_solution_cypress/serverless_config.ts


# Playwright
- x-pack/test/security_solution_playwright/serverless_config.ts

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/chrome_forward_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
machineType: n2-standard-4
preemptible: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: "Serverless Osquery Cypress Tests"
label: "Osquery Cypress Tests on Serverless"
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
agents:
image: family/kibana-ubuntu-2004
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/pointer_compression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,4 @@ steps:
retry:
automatic:
- exit_status: '-1'
limit: 1
# status_exception: Native role management is not enabled in this Elasticsearch instance
# - command: .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
# label: 'Serverless Security Defend Workflows Cypress Tests'
# agents:
# machineType: n2-standard-4
# preemptible: true
# depends_on: build
# timeout_in_minutes: 60
# retry:
# automatic:
# - exit_status: '-1'
# limit: 1
limit: 1
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
machineType: n2-standard-4
preemptible: true
Expand Down
2 changes: 0 additions & 2 deletions .buildkite/scripts/steps/checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ fi
.buildkite/scripts/steps/checks/saved_objects_definition_change.sh
.buildkite/scripts/steps/code_generation/elastic_assistant_codegen.sh
.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
.buildkite/scripts/steps/code_generation/osquery_codegen.sh
.buildkite/scripts/steps/openapi_bundling/final_merge.sh
3 changes: 3 additions & 0 deletions .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ run_check() {
retry 5 15 run_check

check_for_changed_files "$cmd" true

.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
.buildkite/scripts/steps/openapi_bundling/final_merge.sh

This file was deleted.

3 changes: 1 addition & 2 deletions .buildkite/scripts/steps/openapi_bundling/final_merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ source .buildkite/scripts/common/util.sh
echo --- Merge Kibana OpenAPI specs

(cd oas_docs && make api-docs && make api-docs-lint)
(cd oas_docs && make api-docs-staging && make api-docs-lint)

check_for_changed_files "make api-docs && make api-docs-staging" true
check_for_changed_files "make api-docs" true
48 changes: 48 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1978,6 +1978,54 @@ module.exports = {
'max-classes-per-file': 'off',
},
},
{
files: [
'packages/kbn-reporting/common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/export_types/pdf_common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/export_types/pdf/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/export_types/png_common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/export_types/png/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/public/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/kbn-reporting/server/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
'packages/shared-ux/page/analytics_no_data/types/**',
'scripts/create_observability_rules.js', // TODO - is importing "@kbn/observability-alerting-test-data" (observability/private)
'src/cli_setup/**', // TODO @kibana/operations - is importing "@kbn/interactive-setup-plugin" (platform/private)
'src/dev/build/tasks/install_chromium.ts', // TODO @kibana/operations - is importing "@kbn/screenshotting-plugin" (platform/private)
'src/plugins/ai_assistant_management/selection/**',
'src/plugins/dashboard/**',
'src/plugins/discover/**',
'test/**',
'x-pack/examples/exploratory_view_example/**',
'x-pack/examples/screenshotting_example/**',
'x-pack/examples/ui_actions_enhanced_examples/**',
'x-pack/packages/security-solution/data_table/**',
'x-pack/plugins/aiops/**',
'x-pack/plugins/data_quality/**',
'x-pack/plugins/ingest_pipelines/**',
'x-pack/plugins/ml/**',
'x-pack/plugins/monitoring/**',
'x-pack/plugins/observability_solution/infra/**',
'x-pack/plugins/observability_solution/inventory/**',
'x-pack/plugins/observability_solution/investigate_app/**',
'x-pack/plugins/observability_solution/investigate/**',
'x-pack/plugins/observability_solution/logs_shared/**',
'x-pack/plugins/observability_solution/metrics_data_access/**',
'x-pack/plugins/observability_solution/observability_ai_assistant_app/**',
'x-pack/plugins/observability_solution/observability_ai_assistant_management/**',
'x-pack/plugins/observability_solution/observability/**',
'x-pack/plugins/observability_solution/slo/**',
'x-pack/plugins/observability_solution/synthetics/e2e/**',
'x-pack/plugins/osquery/**',
'x-pack/plugins/search_assistant/**',
'x-pack/test_serverless/**',
'x-pack/test/**',
'x-pack/test/plugin_functional/plugins/resolver_test/**',
],
rules: {
'@kbn/imports/no_group_crossing_manifests': 'warn',
'@kbn/imports/no_group_crossing_imports': 'warn',
},
},
],
};

Expand Down
34 changes: 28 additions & 6 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ packages/kbn-dev-proc-runner @elastic/kibana-operations
src/plugins/dev_tools @elastic/kibana-management
packages/kbn-dev-utils @elastic/kibana-operations
examples/developer_examples @elastic/appex-sharedux
packages/kbn-discover-contextual-components @elastic/obs-ux-logs-team @elastic/kibana-data-discovery
examples/discover_customization_examples @elastic/kibana-data-discovery
x-pack/plugins/discover_enhanced @elastic/kibana-data-discovery
src/plugins/discover @elastic/kibana-data-discovery
Expand Down Expand Up @@ -744,7 +745,7 @@ x-pack/plugins/runtime_fields @elastic/kibana-management
packages/kbn-safer-lodash-set @elastic/kibana-security
x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
x-pack/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
x-pack/test/task_manager_claimer_mget/plugins/sample_task_plugin_mget @elastic/response-ops
x-pack/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget @elastic/response-ops
test/plugin_functional/plugins/saved_object_export_transforms @elastic/kibana-core
test/plugin_functional/plugins/saved_object_import_warnings @elastic/kibana-core
x-pack/test/saved_object_api_integration/common/plugins/saved_object_test_plugin @elastic/kibana-security
Expand Down Expand Up @@ -946,6 +947,7 @@ packages/kbn-tinymath @elastic/kibana-visualizations
packages/kbn-tooling-log @elastic/kibana-operations
x-pack/plugins/transform @elastic/ml-ui
x-pack/plugins/translations @elastic/kibana-localization
packages/kbn-transpose-utils @elastic/kibana-visualizations
x-pack/examples/triggers_actions_ui_example @elastic/response-ops
x-pack/plugins/triggers_actions_ui @elastic/response-ops
packages/kbn-triggers-actions-ui-types @elastic/response-ops
Expand Down Expand Up @@ -1280,6 +1282,7 @@ x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai
### END Observability Plugins

# Presentation
/x-pack/test/functional/apps/dashboard @elastic/kibana-presentation
/x-pack/test/accessibility/apps/group3/maps.ts @elastic/kibana-presentation
/x-pack/test/accessibility/apps/group1/dashboard_panel_options.ts @elastic/kibana-presentation
/x-pack/test/accessibility/apps/group1/dashboard_links.ts @elastic/kibana-presentation
Expand Down Expand Up @@ -1357,6 +1360,8 @@ x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai
/.eslintignore @elastic/kibana-operations

# Appex QA
/x-pack/test/functional/config.*.* @elastic/appex-qa
/x-pack/test/api_integration/ftr_provider_context.d.ts @elastic/appex-qa # Maybe this should be a glob?
/x-pack/test/accessibility/services.ts @elastic/appex-qa
/x-pack/test/accessibility/page_objects.ts @elastic/appex-qa
/x-pack/test/accessibility/ftr_provider_context.d.ts @elastic/appex-qa
Expand Down Expand Up @@ -1490,7 +1495,7 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
/x-pack/test/alerting_api_integration/observability @elastic/obs-ux-management-team
/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/response-ops
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/response-ops
/x-pack/test/task_manager_claimer_mget/ @elastic/response-ops
/x-pack/test/task_manager_claimer_update_by_query/ @elastic/response-ops
/docs/user/alerting/ @elastic/response-ops
/docs/management/connectors/ @elastic/response-ops
/x-pack/test/cases_api_integration/ @elastic/response-ops
Expand Down Expand Up @@ -1536,6 +1541,15 @@ x-pack/test/api_integration/apis/management/index_management/inference_endpoints
/x-pack/test/functional_search/ @elastic/search-kibana

# Management Experience - Deployment Management
/x-pack/test/api_integration/services/index_management.ts @elastic/kibana-management
/x-pack/test/functional/services/grok_debugger.js @elastic/kibana-management
/x-pack/test/functional/apps/grok_debugger @elastic/kibana-management
/x-pack/test/functional/apps/index_lifecycle_management @elastic/kibana-management
/x-pack/test/functional/apps/index_management @elastic/kibana-management
/x-pack/test/api_integration/services/ingest_pipelines @elastic/kibana-management
/x-pack/test/functional/apps/watcher @elastic/kibana-management
/x-pack/test/api_integration/apis/watcher @elastic/kibana-management
/x-pack/test/api_integration/apis/upgrade_assistant @elastic/kibana-management
/x-pack/test/api_integration/apis/searchprofiler @elastic/kibana-management
/x-pack/test/api_integration/apis/console @elastic/kibana-management
/x-pack/test_serverless/**/test_suites/common/index_management/ @elastic/kibana-management
Expand Down Expand Up @@ -1572,6 +1586,8 @@ x-pack/test/api_integration/apis/management/index_management/inference_endpoints
#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-management

# Security Solution
/x-pack/test/common/services/security_solution @elastic/security-solution
/x-pack/test/api_integration/services/security_solution_*.gen.ts @elastic/security-solution
/x-pack/test/accessibility/apps/group3/security_solution.ts @elastic/security-solution
/x-pack/test_serverless/functional/test_suites/security/config.ts @elastic/security-solution @elastic/appex-qa
/x-pack/test_serverless/functional/test_suites/security/config.feature_flags.ts @elastic/security-solution
Expand All @@ -1585,9 +1601,7 @@ x-pack/test/api_integration/apis/management/index_management/inference_endpoints
/x-pack/test/functional/es_archives/auditbeat/hosts @elastic/security-solution
/x-pack/test_serverless/functional/page_objects/svl_management_page.ts @elastic/security-solution
/x-pack/test_serverless/api_integration/test_suites/security @elastic/security-solution
/x-pack/test_serverless/functional/page_objects/svl_sec_landing_page.ts @elastic/security-solution

/x-pack/test_serverless/functional/test_suites/security/cypress @elastic/security-solution
/x-pack/test_serverless/functional/test_suites/security/index.feature_flags.ts @elastic/security-solution
/x-pack/test_serverless/functional/test_suites/security/index.ts @elastic/security-solution
#CC# /x-pack/plugins/security_solution/ @elastic/security-solution
Expand Down Expand Up @@ -1636,6 +1650,7 @@ x-pack/test/security_solution_api_integration/test_suites/detections_response/us
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
/x-pack/test/common/utils/security_solution/detections_response @elastic/security-detections-response

# Security Solution sub teams

Expand All @@ -1649,7 +1664,12 @@ x-pack/test/security_solution_api_integration/test_suites/sources @elastic/secur
/x-pack/test/security_solution_playwright @elastic/security-engineering-productivity
/x-pack/plugins/security_solution/scripts/run_cypress @MadameSheema @patrykkopycinski @maximpn @banderror

## Security Solution sub teams - Threat Hunting Investigations
## Security Solution sub teams - Threat Hunting

/x-pack/plugins/security_solution/server/lib/siem_migrations @elastic/security-threat-hunting
/x-pack/plugins/security_solution/common/siem_migrations @elastic/security-threat-hunting

## Security Solution Threat Hunting areas - Threat Hunting Investigations

/x-pack/plugins/security_solution/common/api/timeline @elastic/security-threat-hunting-investigations
/x-pack/plugins/security_solution/common/search_strategy/timeline @elastic/security-threat-hunting-investigations
Expand Down Expand Up @@ -1679,7 +1699,7 @@ x-pack/test/security_solution_cypress/cypress/tasks/expandable_flyout @elastic/

/x-pack/plugins/security_solution/server/lib/timeline @elastic/security-threat-hunting-investigations

## Security Solution sub teams - Threat Hunting Explore
## Security Solution Threat Hunting areas - Threat Hunting Explore
/x-pack/plugins/security_solution/common/api/tags @elastic/security-threat-hunting-explore
/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts @elastic/security-threat-hunting-explore
/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram @elastic/security-threat-hunting-explore
Expand Down Expand Up @@ -1968,6 +1988,8 @@ packages/react @elastic/appex-sharedux
test/functional/page_objects/solution_navigation.ts @elastic/appex-sharedux
/x-pack/test_serverless/functional/page_objects/svl_common_navigation.ts @elastic/appex-sharedux
/x-pack/test_serverless/functional/fixtures/kbn_archiver/reporting @elastic/appex-sharedux
/x-pack/test_serverless/functional/page_objects/svl_sec_landing_page.ts @elastic/appex-sharedux
/x-pack/test_serverless/functional/test_suites/security/ftr/navigation.ts @elastic/appex-sharedux

# OpenAPI spec files
oas_docs/.spectral.yaml @elastic/platform-docs
Expand Down
2 changes: 1 addition & 1 deletion .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dataViews": "src/plugins/data_views",
"defaultNavigation": "packages/default-nav",
"devTools": "src/plugins/dev_tools",
"discover": ["src/plugins/discover", "packages/kbn-discover-utils"],
"discover": ["src/plugins/discover", "packages/kbn-discover-utils", "packages/kbn-discover-contextual-components"],
"savedSearch": "src/plugins/saved_search",
"embeddableApi": "src/plugins/embeddable",
"presentationPanel": "src/plugins/presentation_panel",
Expand Down
Loading

0 comments on commit ef3025e

Please sign in to comment.