Merge branch 'main' into ska/relocate-more-platform-ui-tests

Author: dmlemeshko

.buildkite/ftr_oblt_stateful_configs.yml

@@ -1,12 +1,12 @@
 disabled:
   # Cypress configs, for now these are still run manually
-  - x-pack/test/apm_cypress/cli_config.ts
+  - x-pack/solutions/observability/test/apm_cypress/cli_config.ts
   - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_open.ts
   - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_runner.ts
   - 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/test/profiling_cypress/cli_config.ts
+  - x-pack/solutions/observability/test/profiling_cypress/cli_config.ts
   #FTR configs
   - x-pack/solutions/observability/plugins/uptime/e2e/config.ts
   - x-pack/solutions/observability/test/api_integration/config.ts

.buildkite/ftr_platform_stateful_configs.yml

@@ -39,11 +39,11 @@ disabled:
   - x-pack/platform/test/scalability/config.ts
 
   # Cypress configs, for now these are still run manually
-  - x-pack/test/fleet_cypress/cli_config.ts
-  - x-pack/test/fleet_cypress/cli_config.space_awareness.ts
-  - x-pack/test/fleet_cypress/config.ts
-  - x-pack/test/fleet_cypress/config.space_awareness.ts
-  - x-pack/test/fleet_cypress/visual_config.ts
+  - x-pack/platform/test/fleet_cypress/cli_config.ts
+  - x-pack/platform/test/fleet_cypress/cli_config.space_awareness.ts
+  - x-pack/platform/test/fleet_cypress/config.ts
+  - x-pack/platform/test/fleet_cypress/config.space_awareness.ts
+  - x-pack/platform/test/fleet_cypress/visual_config.ts
 
   # Default http2 config to use for performance journeys
   - x-pack/performance/configs/http2_config.ts
@@ -273,7 +273,7 @@ enabled:
   - x-pack/platform/test/functional_cloud/saml.config.ts
   - x-pack/platform/test/licensing_plugin/config.public.ts
   - x-pack/platform/test/licensing_plugin/config.ts
-  - x-pack/test/plugin_functional/config.ts
+  - x-pack/platform/test/plugin_functional/config.ts
   - x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
   - x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
   - x-pack/platform/test/reporting_functional/reporting_and_security.config.ts

.buildkite/ftr_security_stateful_configs.yml

@@ -134,3 +134,4 @@ enabled:
   - x-pack/solutions/security/test/fleet_api_integration/config.epm.ts
   - x-pack/solutions/security/test/fleet_api_integration/config.package_policy.ts
   - x-pack/solutions/security/test/functional_solution_sidenav/config.ts
+  - x-pack/solutions/security/test/plugin_functional/config.ts

.eslintrc.js

@@ -773,7 +773,6 @@ module.exports = {
         'src/platform/test/*/*.config.ts',
         'src/platform/test/*/{tests,test_suites,apis,apps}/**/*',
         'src/platform/test/server_integration/**/*.ts',
-        'x-pack/test/apm_api_integration/**/*.ts',
         'x-pack/test/functional/apps/**/*.js',
         'x-pack/solutions/observability/plugins/apm/**/*.js',
         'x-pack/platform/test/*/{tests,test_suites,apis,apps}/**/*',
@@ -2280,7 +2279,7 @@ module.exports = {
         // Ideally, we need to classify the solution specific ones to reduce CI times
         'x-pack/test_serverless/**',
         'x-pack/test/**',
-        'x-pack/test/plugin_functional/plugins/resolver_test/**',
+        'x-pack/platform/test/plugin_functional/plugins/resolver_test/**',
       ],
       rules: {
         '@kbn/imports/no_group_crossing_manifests': 'warn',

.github/CODEOWNERS

@@ -1013,6 +1013,7 @@ x-pack/platform/test/plugin_api_integration/plugins/event_log @elastic/response-
 x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security
 x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
 x-pack/platform/test/plugin_api_perf/plugins/task_manager_performance @elastic/response-ops
+x-pack/platform/test/plugin_functional/plugins/global_search_test @elastic/kibana-core
 x-pack/platform/test/saved_object_api_integration/common/plugins/saved_object_test_plugin @elastic/kibana-security
 x-pack/platform/test/security_api_integration/packages/helpers @elastic/kibana-security
 x-pack/platform/test/security_api_integration/plugins/audit_log @elastic/kibana-security
@@ -1133,10 +1134,9 @@ x-pack/solutions/security/plugins/security_solution_ess @elastic/security-soluti
 x-pack/solutions/security/plugins/security_solution_serverless @elastic/security-solution
 x-pack/solutions/security/plugins/session_view @elastic/kibana-cloud-security-posture
 x-pack/solutions/security/test
+x-pack/solutions/security/test/plugin_functional/plugins/resolver_test @elastic/security-solution
 x-pack/test
 x-pack/test_serverless
-x-pack/test/plugin_functional/plugins/global_search_test @elastic/kibana-core
-x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
 ####
 ## Everything below this line overrides the default assignments for each package.
 ## Items lower in the file have higher precedence:
@@ -1529,7 +1529,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
 /x-pack/platform/test/fleet_packages @elastic/fleet
 /x-pack/platform/test/fleet_tasks @elastic/fleet
 /src/platform/test/api_integration/apis/custom_integration/*.ts @elastic/fleet
-/x-pack/test/fleet_cypress @elastic/fleet
+/x-pack/platform/test/fleet_cypress @elastic/fleet
 /x-pack/platform/test/fleet_functional @elastic/fleet
 /x-pack/platform/test/fleet_multi_cluster @elastic/fleet
 /src/dev/build/tasks/bundle_fleet_packages.ts @elastic/fleet @elastic/kibana-operations
@@ -1541,7 +1541,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
 /src/platform/test/api_integration/apis/ui_metric/*.ts @elastic/obs-ux-infra_services-team
 /x-pack/test/functional/apps/apm/ @elastic/obs-ux-infra_services-team
 /x-pack/solutions/observability/test/api_integration/apm/ @elastic/obs-ux-infra_services-team
-/x-pack/test/apm_cypress/ @elastic/obs-ux-infra_services-team
+/x-pack/solutions/observability/test/apm_cypress/ @elastic/obs-ux-infra_services-team
 /src/apm.js @elastic/kibana-core @vigneshshanmugam
 /src/platform/packages/shared/kbn-utility-types/src/dot.ts @dgieselaar
 /src/platform/packages/shared/kbn-utility-types/src/dot_test.ts @dgieselaar
@@ -1725,7 +1725,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
 /src/platform/test/package @elastic/kibana-operations
 /src/platform/test/package/roles @elastic/kibana-operations
 /src/platform/test/common/fixtures/plugins/coverage/kibana.json @elastic/kibana-operations
-/x-pack/test/plugin_functional/screenshots @elastic/kibana-operations # Assigned per https://github.com/elastic/kibana/pull/94370/files
+/x-pack/platform/test/plugin_functional/screenshots @elastic/kibana-operations # Assigned per https://github.com/elastic/kibana/pull/94370/files
 /src/dev/license_checker/config.ts @elastic/kibana-operations
 /src/dev/ @elastic/kibana-operations
 /src/setup_node_env/ @elastic/kibana-operations
@@ -1786,7 +1786,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
 /src/platform/test/functional/fixtures/es_archiver/kibana_sample_data_flights* @elastic/appex-qa
 /src/platform/test/functional/fixtures/es_archiver/getting_started/shakespeare @elastic/appex-qa
 /src/platform/test/api_integration/fixtures/es_archiver/elasticsearch @elastic/appex-qa
-/x-pack/test/plugin_functional/services.ts @elastic/appex-qa
+/x-pack/platform/test/plugin_functional/services.ts @elastic/appex-qa
 /src/platform/test/server_integration/services/index.js @elastic/appex-qa
 /x-pack/platform/test/stack_functional_integration/configs/config.stack_functional_integration_base.js @elastic/appex-qa
 /x-pack/platform/test/stack_functional_integration/configs/consume_state.js @elastic/appex-qa
@@ -1795,9 +1795,9 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
 /x-pack/test/kibana.jsonc @elastic/appex-qa
 /x-pack/platform/test/functional_with_es_ssl/ftr_provider_context.d.ts @elastic/appex-qa
 /x-pack/platform/test/stack_functional_integration/apps @elastic/appex-qa
-/x-pack/test/plugin_functional/config.ts @elastic/appex-qa
-/x-pack/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa
-/x-pack/test/plugin_functional/page_objects.ts @elastic/appex-qa
+/x-pack/platform/test/plugin_functional/config.ts @elastic/appex-qa
+/x-pack/platform/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa
+/x-pack/platform/test/plugin_functional/page_objects.ts @elastic/appex-qa
 /x-pack/platform/test/upgrade/services/index.ts @elastic/appex-qa
 /x-pack/platform/test/upgrade/ftr_provider_context.d.ts @elastic/appex-qa
 /x-pack/platform/test/upgrade/config.ts @elastic/appex-qa
@@ -1933,7 +1933,6 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
 /x-pack/solutions/security/test/api_integration/ftr_provider_context.d.ts @elastic/appex-qa
 /x-pack/solutions/security/test/api_integration/services/index.ts @elastic/appex-qa
 /x-pack/solutions/security/test/alerting_api_integration/ftr_provider_context.d.ts @elastic/appex-qa
-/x-pack/test/apm_api_integration  @elastic/appex-qa # temporarily due to SKA tests relocation
 /x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.index.ts @elastic/appex-qa # temporarily due to SKA tests relocation
 /x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts @elastic/appex-qa # temporarily due to SKA tests relocation
 /x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/stateful/oblt.index.ts @elastic/appex-qa # temporarily due to SKA tests relocation
@@ -2386,12 +2385,12 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
 /x-pack/test/functional/es_archives/rule_exceptions @elastic/security-solution # Assigned per https://github.com/elastic/kibana/pull/199795/files/ae80bb252bc71f787c122849fcb9b01e386fc5e9#r1840233040
 /x-pack/solutions/security/test/functional_solution_sidenav/ @elastic/security-solution
 /x-pack/test/common/utils/security_solution/index.ts @elastic/security-solution
-/x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
+/x-pack/solutions/security/test/plugin_functional/ @elastic/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/functional/es_archives/endpoint/ @elastic/security-solution
-/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
+/x-pack/platform/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
 /x-pack/test/security_solution_api_integration @elastic/security-solution
 /x-pack/test/api_integration/apis/security_solution @elastic/security-solution
 /x-pack/test/functional/es_archives/auditbeat/default @elastic/security-solution
@@ -2891,7 +2890,7 @@ x-pack/solutions/security/plugins/security_solution/server/lib/security_integrat
 x-pack/platform/plugins/private/translations/translations
 
 # Profiling cypress tests
-x-pack/test/profiling_cypress @elastic/obs-ux-infra_services-team
+x-pack/solutions/observability/test/profiling_cypress @elastic/obs-ux-infra_services-team
 
 # Profiling api integration testing
 x-pack/solutions/observability/test/api_integration/profiling @elastic/obs-ux-infra_services-team
@@ -2910,7 +2909,7 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr
 /src/platform/test/accessibility/apps/home.ts @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/199771/files#r1840077237
 /src/platform/test/api_integration/apis/home/*.ts @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/199771/files#r1840077065
 /src/platform/test/functional/apps/home @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/199771/files#r1840075278
-/x-pack/test/plugin_functional/plugins/global_search_test @elastic/appex-sharedux
+/x-pack/platform/test/plugin_functional/plugins/global_search_test @elastic/appex-sharedux
 /src/platform/test/functional/services/saved_objects_finder.ts @elastic/appex-sharedux
 /src/platform/test/functional/apps/kibana_overview @elastic/appex-sharedux
 /x-pack/platform/test/functional_cloud @elastic/appex-sharedux
@@ -2921,7 +2920,7 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr
 /src/platform/test/functional/services/monaco_editor.ts @elastic/appex-sharedux
 /x-pack/test/functional/fixtures/kbn_archiver/global_search @elastic/appex-sharedux
 /src/platform/test/api_integration/fixtures/unused_urls_task @elastic/appex-sharedux
-/x-pack/test/plugin_functional/test_suites/global_search @elastic/appex-sharedux
+/x-pack/platform/test/plugin_functional/test_suites/global_search @elastic/appex-sharedux
 /src/platform/test/plugin_functional/test_suites/shared_ux @elastic/appex-sharedux
 /src/platform/test/plugin_functional/plugins/kbn_sample_panel_action @elastic/appex-sharedux
 /src/platform/test/plugin_functional/plugins/eui_provider_dev_warning @elastic/appex-sharedux

config/serverless.es.yml

@@ -82,23 +82,8 @@ xpack.painless_lab.enabled: false
 
 xpack.ml.ad.enabled: false
 xpack.ml.dfa.enabled: false
-xpack.ml.nlp:
-  enabled: true
-  modelDeployment:
-    allowStaticAllocations: false
-    vCPURange:
-      low:
-        min: 0
-        max: 2
-        static: 2
-      medium:
-        min: 0
-        max: 32
-        static: 32
-      high:
-        min: 0
-        max: 512
-        static: 512
+xpack.ml.nlp.enabled: true
+
 xpack.ml.compatibleModuleType: 'search'
 
 data_visualizer.resultLinks.fileBeat.enabled: false

config/serverless.oblt.yml

@@ -93,16 +93,8 @@ xpack.ml.dfa.enabled: true
 xpack.ml.nlp:
   enabled: true
   modelDeployment:
-    allowStaticAllocations: false
     vCPURange:
-      low:
-        min: 0
-        max: 2
-      medium:
-        min: 0
-        max: 32
       high:
-        min: 0
         max: 128
 xpack.ml.compatibleModuleType: 'observability'
 

config/serverless.security.yml

@@ -172,14 +172,9 @@ xpack.ml.dfa.enabled: true
 xpack.ml.nlp:
   enabled: true
   modelDeployment:
-    allowStaticAllocations: false
     vCPURange:
-      low:
-        min: 0
-        max: 2
       medium:
         min: 1
-        max: 32
       high:
         min: 1
         max: 128
@@ -213,4 +208,4 @@ xpack.securitySolution.enableExperimental:
   - privilegedUserMonitoringDisabled
 
 # AI Assistant config
-aiAssistantManagementSelection.preferredAIAssistantType: 'security'
+aiAssistantManagementSelection.preferredAIAssistantType: 'security'

config/serverless.yml

@@ -175,6 +175,24 @@ xpack.security.showInsecureClusterWarning: false
 xpack.security.ui.userManagementEnabled: false
 xpack.security.ui.roleMappingManagementEnabled: false
 
+xpack.ml.nlp:
+  enabled: false
+  modelDeployment:
+    allowStaticAllocations: false
+    vCPURange:
+      low:
+        min: 0
+        max: 2
+        maxThreads: 2
+      medium:
+        min: 0
+        max: 32
+        maxThreads: 4
+      high:
+        min: 0
+        max: 512
+        maxThreads: 8
+
 # Enforce restring access to internal APIs see https://github.com/elastic/kibana/issues/151940
 server.restrictInternalApis: true
 # Telemetry enabled by default and not disableable via UI

package.json

@@ -581,7 +581,7 @@
     "@kbn/global-search-bar-plugin": "link:x-pack/platform/plugins/private/global_search_bar",
     "@kbn/global-search-plugin": "link:x-pack/platform/plugins/shared/global_search",
     "@kbn/global-search-providers-plugin": "link:x-pack/platform/plugins/private/global_search_providers",
-    "@kbn/global-search-test-plugin": "link:x-pack/test/plugin_functional/plugins/global_search_test",
+    "@kbn/global-search-test-plugin": "link:x-pack/platform/test/plugin_functional/plugins/global_search_test",
     "@kbn/graph-plugin": "link:x-pack/platform/plugins/private/graph",
     "@kbn/grid-example-plugin": "link:examples/grid_example",
     "@kbn/grid-layout": "link:src/platform/packages/private/kbn-grid-layout",
@@ -805,7 +805,7 @@
     "@kbn/reporting-server": "link:src/platform/packages/private/kbn-reporting/server",
     "@kbn/resizable-layout": "link:src/platform/packages/shared/kbn-resizable-layout",
     "@kbn/resizable-layout-examples-plugin": "link:examples/resizable_layout_examples",
-    "@kbn/resolver-test-plugin": "link:x-pack/test/plugin_functional/plugins/resolver_test",
+    "@kbn/resolver-test-plugin": "link:x-pack/solutions/security/test/plugin_functional/plugins/resolver_test",
     "@kbn/response-ops-alerts-apis": "link:src/platform/packages/shared/response-ops/alerts-apis",
     "@kbn/response-ops-alerts-delete": "link:src/platform/packages/shared/response-ops/alerts-delete",
     "@kbn/response-ops-alerts-fields-browser": "link:src/platform/packages/shared/response-ops/alerts-fields-browser",