fix conflict

.buildkite/ftr_oblt_stateful_configs.yml

@@ -20,7 +20,7 @@ disabled:
   - x-pack/solutions/observability/plugins/synthetics/e2e/synthetics/synthetics_run.ts
   - x-pack/solutions/observability/plugins/exploratory_view/e2e/synthetics_run.ts
   - x-pack/solutions/observability/plugins/ux/e2e/synthetics_run.ts
-  - x-pack/plugins/observability_solution/slo/e2e/synthetics_run.ts
+  - x-pack/solutions/observability/plugins/slo/e2e/synthetics_run.ts
 
 defaultQueue: 'n2-4-spot'
 enabled:

.buildkite/ftr_platform_stateful_configs.yml

@@ -131,6 +131,7 @@ enabled:
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts
+  - x-pack/test/alerting_api_integration/security_and_spaces/group5/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts

.buildkite/ftr_security_serverless_configs.yml

@@ -89,6 +89,7 @@ enabled:
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/telemetry/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/basic_license_essentials_tier/configs/serverless.config.ts

.buildkite/ftr_security_stateful_configs.yml

@@ -70,6 +70,7 @@ enabled:
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/telemetry/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/ess.config.ts

.buildkite/pipelines/pull_request/slo_plugin_e2e.yml

@@ -14,7 +14,7 @@ steps:
       - check_oas_snapshot
     timeout_in_minutes: 30
     artifact_paths:
-      - 'x-pack/plugins/observability_solution/slo/e2e/.journeys/**/*'
+      - 'x-pack/solutions/observability/plugins/slo/e2e/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/scripts/packer_cache.sh

@@ -15,5 +15,5 @@ for version in $(cat versions.json | jq -r '.versions[].version'); do
 done
 
 for version in $(cat versions.json | jq -r '.versions[].version'); do
-  node x-pack/plugins/security_solution/scripts/endpoint/agent_downloader --version "$version"
+  node x-pack/solutions/security/plugins/security_solution/scripts/endpoint/agent_downloader --version "$version"
 done

.buildkite/scripts/pipelines/pull_request/pipeline.ts

@@ -224,7 +224,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
     if (
       (await doAnyChangesMatch([
         /^packages\/kbn-securitysolution-.*/,
-        /^x-pack\/plugins\/security_solution/,
+        /^x-pack\/solutions\/security\/plugins\/security_solution/,
         /^x-pack\/test\/defend_workflows_cypress/,
         /^x-pack\/test\/security_solution_cypress/,
         /^fleet_packages\.json/,
@@ -244,9 +244,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^x-pack\/plugins\/data_views\/common/,
         /^x-pack\/plugins\/lists/,
         /^x-pack\/plugins\/rule_registry\/common/,
-        /^x-pack\/plugins\/security_solution/,
-        /^x-pack\/plugins\/security_solution_ess/,
-        /^x-pack\/plugins\/security_solution_serverless/,
+        /^x-pack\/solutions\/security\/plugins\/security_solution/,
+        /^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
+        /^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
         /^x-pack\/plugins\/task_manager/,
         /^x-pack\/solutions\/security\/plugins\/timelines/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
@@ -255,7 +255,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^x-pack\/plugins\/triggers_actions_ui\/server\/connector_types\/bedrock/,
         /^x-pack\/plugins\/usage_collection\/public/,
         /^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
-        /^x-pack\/packages\/security-solution/,
+        /^x-pack\/solutions\/security\/packages/,
         /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/,
         /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant-common/,
         /^x-pack\/test\/functional\/es_archives\/security_solution/,
@@ -290,15 +290,14 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^packages\/kbn-es-query/,
         /^packages\/kbn-i18n/,
         /^packages\/kbn-i18n-react/,
-        /^x-pack\/solutions\/security\/packages\/expandable-flyout/,
         /^packages\/kbn-grouping/,
         /^packages\/kbn-resizable-layout/,
         /^packages\/kbn-rison/,
         /^packages\/kbn-rule-data-utils/,
         /^packages\/kbn-safer-lodash-set/,
         /^packages\/kbn-search-types/,
         /^packages\/kbn-securitysolution-.*/,
-        /^packages\/kbn-securitysolution-ecs/,
+        /^src\/platform\/packages\/shared\/kbn-securitysolution-ecs/,
         /^packages\/kbn-securitysolution-io-ts-alerting-types/,
         /^packages\/kbn-securitysolution-io-ts-list-types/,
         /^packages\/kbn-securitysolution-list-hooks/,
@@ -323,16 +322,16 @@ const getPipeline = (filename: string, removeSteps = true) => {
         /^src\/plugins\/unified_search/,
         /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/,
         /^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant-common/,
-        /^x-pack\/packages\/security-solution/,
+        /^x-pack\/solutions\/security\/packages/,
         /^x-pack\/plugins\/alerting/,
         /^x-pack\/plugins\/cases/,
         /^x-pack\/plugins\/data_views\/common/,
         /^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
         /^x-pack\/plugins\/lists/,
         /^x-pack\/plugins\/rule_registry\/common/,
-        /^x-pack\/plugins\/security_solution/,
-        /^x-pack\/plugins\/security_solution_ess/,
-        /^x-pack\/plugins\/security_solution_serverless/,
+        /^x-pack\/solutions\/security\/plugins\/security_solution/,
+        /^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
+        /^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
         /^x-pack\/plugins\/task_manager/,
         /^x-pack\/solutions\/security\/plugins\/threat_intelligence/,
         /^x-pack\/solutions\/security\/plugins\/timelines/,
@@ -352,7 +351,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
       ((await doAnyChangesMatch([
         /^x-pack\/platform\/plugins\/shared\/osquery/,
         /^x-pack\/test\/osquery_cypress/,
-        /^x-pack\/plugins\/security_solution/,
+        /^x-pack\/solutions\/security\/plugins\/security_solution/,
       ])) ||
         GITHUB_PR_LABELS.includes('ci:all-cypress-suites')) &&
       !GITHUB_PR_LABELS.includes('ci:skip-cypress-osquery')
@@ -365,8 +364,8 @@ const getPipeline = (filename: string, removeSteps = true) => {
     if (
       (await doAnyChangesMatch([
         /^x-pack\/packages\/kbn-cloud-security-posture/,
-        /^x-pack\/plugins\/cloud_security_posture/,
-        /^x-pack\/plugins\/security_solution/,
+        /^x-pack\/solutions\/security\/plugins\/cloud_security_posture/,
+        /^x-pack\/solutions\/security\/plugins\/security_solution/,
         /^x-pack\/test\/security_solution_cypress/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')

.buildkite/scripts/pipelines/security_solution_quality_gate/edr_workflows/mki_security_solution_defend_workflows.sh

@@ -18,7 +18,7 @@ buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" "true
 
 source .buildkite/scripts/pipelines/security_solution_quality_gate/prepare_vault_entries.sh
 
-cd x-pack/plugins/security_solution
+cd x-pack/solutions/security/plugins/security_solution
 set +e
 
 export BK_ANALYTICS_API_KEY=$(vault_get security-solution-quality-gate serverless-cypress-defend-workflows)

.buildkite/scripts/steps/code_generation/security_solution_codegen.sh

@@ -19,6 +19,6 @@ echo -e "\n[Security Solution OpenAPI Code Generation] Endpoint Exceptions Commo
 (cd packages/kbn-securitysolution-endpoint-exceptions-common && yarn openapi:generate)
 
 echo -e "\n[Security Solution OpenAPI Code Generation] Security Solution Plugin\n"
-(cd x-pack/plugins/security_solution && yarn openapi:generate)
+(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:generate)
 
 check_for_changed_files "yarn openapi:generate" true

.buildkite/scripts/steps/console_definitions_sync.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-GIT_SCOPE="src/plugins/console/server/lib/spec_definitions"
+GIT_SCOPE="src/platform/plugins/shared/console/server/lib/spec_definitions"
 
 report_main_step () {
   echo "--- $1"

.buildkite/scripts/steps/functional/defend_workflows.sh

@@ -9,7 +9,7 @@ export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
 echo "--- Defend Workflows Cypress tests"
 
-cd x-pack/plugins/security_solution
+cd x-pack/solutions/security/plugins/security_solution
 
 set +e
 BK_ANALYTICS_API_KEY=$(vault_get security-solution-ci defend-workflows-bk-api-key)

.buildkite/scripts/steps/functional/defend_workflows_burn.sh

@@ -11,4 +11,4 @@ buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'fals
 
 echo "--- Defend Workflows Cypress tests, burning changed specs (Chrome)"
 
-yarn --cwd x-pack/plugins/security_solution cypress:changed-specs-only
+yarn --cwd x-pack/solutions/security/plugins/security_solution cypress:changed-specs-only

.buildkite/scripts/steps/functional/defend_workflows_serverless.sh

@@ -9,7 +9,7 @@ export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
 echo "--- Defend Workflows Cypress tests on Serverless"
 
-cd x-pack/plugins/security_solution
+cd x-pack/solutions/security/plugins/security_solution
 
 set +e
 BK_ANALYTICS_API_KEY=$(vault_get security-solution-ci defend-workflows-bk-api-key)

.buildkite/scripts/steps/functional/defend_workflows_serverless_burn.sh

@@ -11,4 +11,4 @@ buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'fals
 
 echo "--- Defend Workflows Cypress tests, burning changed specs (Chrome)"
 
-yarn --cwd x-pack/plugins/security_solution cypress:dw:serverless:changed-specs-only
+yarn --cwd x-pack/solutions/security/plugins/security_solution cypress:dw:serverless:changed-specs-only

.buildkite/scripts/steps/functional/slo_plugin_e2e.sh

@@ -14,4 +14,4 @@ echo "--- SLO @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_solution/slo/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
+node solutions/observability/plugins/slo/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

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

@@ -7,13 +7,13 @@ source .buildkite/scripts/common/util.sh
 echo --- Security Solution OpenAPI Bundling
 
 echo -e "\n[Security Solution OpenAPI Bundling] Detections API\n"
-(cd x-pack/plugins/security_solution && yarn openapi:bundle:detections)
+(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:bundle:detections)
 
 echo -e "\n[Security Solution OpenAPI Bundling] Timeline API\n"
-(cd x-pack/plugins/security_solution && yarn openapi:bundle:timeline)
+(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:bundle:timeline)
 
 echo -e "\n[Security Solution OpenAPI Bundling] Entity Analytics API\n"
-(cd x-pack/plugins/security_solution && yarn openapi:bundle:entity-analytics)
+(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:bundle:entity-analytics)
 
 echo -e "\n[Security Solution OpenAPI Bundling] Lists API\n"
 (cd packages/kbn-securitysolution-lists-common && yarn openapi:bundle)
@@ -25,7 +25,7 @@ echo -e "\n[Security Solution OpenAPI Bundling] Endpoint Exceptions API\n"
 (cd packages/kbn-securitysolution-endpoint-exceptions-common && yarn openapi:bundle)
 
 echo -e "\n[Security Solution OpenAPI Bundling] Endpoint Management API\n"
-(cd x-pack/plugins/security_solution && yarn openapi:bundle:endpoint-management)
+(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:bundle:endpoint-management)
 
 echo -e "\n[Security Solution OpenAPI Bundling] Elastic Assistant API\n"
 (cd x-pack/platform/packages/shared/kbn-elastic-assistant-common && yarn openapi:bundle)

.buildkite/scripts/steps/storybooks/build_and_upload.ts

@@ -14,6 +14,7 @@ import { getKibanaDir } from '#pipeline-utils';
 
 // TODO - how to generate this dynamically?
 const STORYBOOKS = [
+  'ai_assistant',
   'apm',
   'canvas',
   'cases',