Merge remote-tracking branch 'upstream/main' into aux

.eslintrc.js

@@ -986,7 +986,11 @@ module.exports = {
         'x-pack/packages/kbn-elastic-assistant/**/*.{js,mjs,ts,tsx}',
         'x-pack/packages/security-solution/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/security_solution/public/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/security_solution_ess/public/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/security_solution_serverless/public/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/security_solution/common/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/security_solution_ess/common/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/security_solution_serverless/common/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/timelines/public/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/timelines/common/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/cases/public/**/*.{js,mjs,ts,tsx}',
@@ -1014,6 +1018,8 @@ module.exports = {
         'x-pack/packages/kbn-elastic-assistant/**/*.{ts,tsx}',
         'x-pack/packages/security-solution/**/*.{ts,tsx}',
         'x-pack/plugins/security_solution/**/*.{ts,tsx}',
+        'x-pack/plugins/security_solution_ess/**/*.{ts,tsx}',
+        'x-pack/plugins/security_solution_serverless/**/*.{ts,tsx}',
         'x-pack/plugins/timelines/**/*.{ts,tsx}',
         'x-pack/plugins/cases/**/*.{ts,tsx}',
       ],
@@ -1022,6 +1028,8 @@ module.exports = {
         'x-pack/packages/kbn-elastic-assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
         'x-pack/packages/security-solution/**/*.{test,mock,test_helper}.{ts,tsx}',
         'x-pack/plugins/security_solution/**/*.{test,mock,test_helper}.{ts,tsx}',
+        'x-pack/plugins/security_solution_ess/**/*.{test,mock,test_helper}.{ts,tsx}',
+        'x-pack/plugins/security_solution_serverless/**/*.{test,mock,test_helper}.{ts,tsx}',
         'x-pack/plugins/timelines/**/*.{test,mock,test_helper}.{ts,tsx}',
         'x-pack/plugins/cases/**/*.{test,mock,test_helper}.{ts,tsx}',
       ],
@@ -1036,6 +1044,8 @@ module.exports = {
         'x-pack/packages/kbn-elastic-assistant/**/*.{ts,tsx}',
         'x-pack/packages/security-solution/**/*.{ts,tsx}',
         'x-pack/plugins/security_solution/**/*.{ts,tsx}',
+        'x-pack/plugins/security_solution_ess/**/*.{ts,tsx}',
+        'x-pack/plugins/security_solution_serverless/**/*.{ts,tsx}',
         'x-pack/plugins/timelines/**/*.{ts,tsx}',
         'x-pack/plugins/cases/**/*.{ts,tsx}',
       ],
@@ -1069,6 +1079,8 @@ module.exports = {
         'x-pack/packages/kbn-elastic-assistant/**/*.{js,mjs,ts,tsx}',
         'x-pack/packages/security-solution/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/security_solution_ess/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/timelines/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}',
       ],
@@ -1163,6 +1175,8 @@ module.exports = {
         {
           files: [
             'x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}',
+            'x-pack/plugins/security_solution_ess/**/*.{js,mjs,ts,tsx}',
+            'x-pack/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}',
             'x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}',
           ],
           rules: {

.github/CODEOWNERS

@@ -359,7 +359,6 @@ packages/kbn-eslint-plugin-eslint @elastic/kibana-operations
 packages/kbn-eslint-plugin-imports @elastic/kibana-operations
 packages/kbn-eslint-plugin-telemetry @elastic/actionable-observability
 x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin @elastic/kibana-security
-x-pack/plugins/ess_security @elastic/security-solution
 src/plugins/event_annotation @elastic/kibana-visualizations
 x-pack/test/plugin_api_integration/plugins/event_log @elastic/response-ops
 x-pack/plugins/event_log @elastic/response-ops
@@ -580,8 +579,10 @@ examples/search_examples @elastic/kibana-data-discovery
 x-pack/plugins/searchprofiler @elastic/platform-deployment-management
 x-pack/test/security_api_integration/packages/helpers @elastic/kibana-core
 x-pack/plugins/security @elastic/kibana-security
+x-pack/plugins/security_solution_ess @elastic/security-solution
 x-pack/test/cases_api_integration/common/plugins/security_solution @elastic/response-ops
 x-pack/plugins/security_solution @elastic/security-solution
+x-pack/plugins/security_solution_serverless @elastic/security-solution
 x-pack/packages/security-solution/side_nav @elastic/security-threat-hunting-explore
 x-pack/packages/security-solution/storybook/config @elastic/security-threat-hunting-explore
 x-pack/test/security_functional/plugins/test_endpoints @elastic/kibana-security
@@ -609,7 +610,6 @@ x-pack/plugins/serverless @elastic/appex-sharedux
 x-pack/plugins/serverless_observability @elastic/appex-sharedux @elastic/apm-ui
 packages/serverless/project_switcher @elastic/appex-sharedux
 x-pack/plugins/serverless_search @elastic/enterprise-search-frontend
-x-pack/plugins/serverless_security @elastic/security-solution
 packages/serverless/storybook/config @elastic/appex-sharedux
 packages/serverless/types @elastic/appex-sharedux
 test/plugin_functional/plugins/session_notifications @elastic/kibana-core
@@ -824,7 +824,7 @@ packages/kbn-yarn-lock-validator @elastic/kibana-operations
 #CC# /src/plugins/home/server/services/ @elastic/appex-sharedux
 #CC# /src/plugins/home/ @elastic/appex-sharedux
 #CC# /x-pack/plugins/reporting/ @elastic/appex-sharedux
-#CC# /x-pack/plugins/serverless_security/ @elastic/appex-sharedux
+#CC# /x-pack/plugins/security_solution_serverless/ @elastic/appex-sharedux
 
 ### Observability Plugins
 
@@ -1034,6 +1034,11 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
 /x-pack/test/api_integration/apis/security_solution @elastic/security-solution
 #CC# /x-pack/plugins/security_solution/ @elastic/security-solution
 
+# Security Solution Offering plugins
+# TODO: assign sub directories to sub teams
+/x-pack/plugins/security_solution_ess/ @elastic/security-solution
+/x-pack/plugins/security_solution_serverless/ @elastic/security-solution
+
 # Security Solution sub teams
 
 ## Security Solution sub teams - Threat Hunting Investigations
@@ -1259,6 +1264,8 @@ x-pack/test/threat_intelligence_cypress @elastic/protections-experience
 # Security design
 /x-pack/plugins/endpoint/**/*.scss @elastic/security-design
 /x-pack/plugins/security_solution/**/*.scss @elastic/security-design
+/x-pack/plugins/security_solution_ess/**/*.scss @elastic/security-design
+/x-pack/plugins/security_solution_serverless/**/*.scss @elastic/security-design
 
 # Logstash
 #CC# /x-pack/plugins/logstash/ @elastic/logstash

config/serverless.security.yml

@@ -6,9 +6,9 @@ xpack.apm.enabled: false
 xpack.observability.enabled: false
 xpack.uptime.enabled: false
 
-## Enable the Serverless Security plugin
-xpack.serverless.security.enabled: true
-xpack.serverless.security.productTypes:
+## Enable the Security Solution Serverless plugin
+xpack.securitySolutionServerless.enabled: true
+xpack.securitySolutionServerless.productTypes:
   [
     { product_line: 'security', product_tier: 'complete' },
     { product_line: 'endpoint', product_tier: 'complete' },

config/serverless.yml

@@ -16,7 +16,7 @@ migrations.zdt:
   runOnRoles: ["ui"]
 
 # Ess plugins
-xpack.ess.security.enabled: false
+xpack.securitySolutionEss.enabled: false
 
 # Management team plugins
 xpack.upgrade_assistant.enabled: false

docs/developer/plugin-list.asciidoc

@@ -538,10 +538,6 @@ security and spaces filtering.
 |This plugin provides Kibana user interfaces for managing the Enterprise Search solution and its products, App Search and Workplace Search.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/ess_security/README.md[essSecurity]
-|This plugin contains the ESS/on-prem deployments (non-serverless) customizations for Security Solution.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/event_log/README.md[eventLog]
 |The event log plugin provides a persistent history of alerting and action
 activities.
@@ -730,6 +726,15 @@ Kibana.
 |Welcome to the Kibana Security Solution plugin! This README will go over getting started with development and testing.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/security_solution_ess/README.md[securitySolutionEss]
+|This plugin contains the ESS/on-prem deployments (non-serverless) specific logic for Security Solution.
+
+
+|{kib-repo}blob/{branch}/x-pack/plugins/security_solution_serverless/README.mdx[securitySolutionServerless]
+|This plugin contains configuration and code used to create a Serverless Security project.
+It leverages universal configuration and other APIs in the serverless plugin to configure Kibana.
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/serverless/README.mdx[serverless]
 |
 
@@ -742,10 +747,6 @@ Kibana.
 |This plugin contains configuration and code used to create a Serverless Search project.  It leverages universal configuration and other APIs in the serverless plugin to configure Kibana.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/serverless_security/README.mdx[serverlessSecurity]
-|This plugin contains configuration and code used to create a Serverless Security project.  It leverages universal configuration and other APIs in the serverless plugin to configure Kibana.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/session_view/README.md[sessionView]
 |Session View is meant to provide a visualization into what is going on in a particular Linux environment where the agent is running. It looks likes a terminal emulator; however, it is a tool for introspecting process activity and understanding user and service behaviour in your Linux servers and infrastructure. It is a time-ordered series of process executions displayed in a tree over time.
 

package.json

@@ -393,7 +393,6 @@
     "@kbn/es-types": "link:packages/kbn-es-types",
     "@kbn/es-ui-shared-plugin": "link:src/plugins/es_ui_shared",
     "@kbn/eso-plugin": "link:x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin",
-    "@kbn/ess-security": "link:x-pack/plugins/ess_security",
     "@kbn/event-annotation-plugin": "link:src/plugins/event_annotation",
     "@kbn/event-log-fixture-plugin": "link:x-pack/test/plugin_api_integration/plugins/event_log",
     "@kbn/event-log-plugin": "link:x-pack/plugins/event_log",
@@ -582,8 +581,10 @@
     "@kbn/search-examples-plugin": "link:examples/search_examples",
     "@kbn/searchprofiler-plugin": "link:x-pack/plugins/searchprofiler",
     "@kbn/security-plugin": "link:x-pack/plugins/security",
+    "@kbn/security-solution-ess": "link:x-pack/plugins/security_solution_ess",
     "@kbn/security-solution-fixtures-plugin": "link:x-pack/test/cases_api_integration/common/plugins/security_solution",
     "@kbn/security-solution-plugin": "link:x-pack/plugins/security_solution",
+    "@kbn/security-solution-serverless": "link:x-pack/plugins/security_solution_serverless",
     "@kbn/security-solution-side-nav": "link:x-pack/packages/security-solution/side_nav",
     "@kbn/security-solution-storybook-config": "link:x-pack/packages/security-solution/storybook/config",
     "@kbn/security-test-endpoints-plugin": "link:x-pack/test/security_functional/plugins/test_endpoints",
@@ -611,7 +612,6 @@
     "@kbn/serverless-observability": "link:x-pack/plugins/serverless_observability",
     "@kbn/serverless-project-switcher": "link:packages/serverless/project_switcher",
     "@kbn/serverless-search": "link:x-pack/plugins/serverless_search",
-    "@kbn/serverless-security": "link:x-pack/plugins/serverless_security",
     "@kbn/serverless-types": "link:packages/serverless/types",
     "@kbn/session-notifications-plugin": "link:test/plugin_functional/plugins/session_notifications",
     "@kbn/session-view-plugin": "link:x-pack/plugins/session_view",

packages/kbn-optimizer/limits.yml

@@ -40,7 +40,6 @@ pageLoadAssetSize:
   embeddable: 87309
   embeddableEnhanced: 22107
   enterpriseSearch: 50858
-  essSecurity: 16573
   esUiShared: 326654
   eventAnnotation: 48565
   exploratoryView: 74673
@@ -119,10 +118,11 @@ pageLoadAssetSize:
   searchprofiler: 67080
   security: 65433
   securitySolution: 66738
+  securitySolutionEss: 16573
+  securitySolutionServerless: 40000
   serverless: 16573
   serverlessObservability: 68747
   serverlessSearch: 71995
-  serverlessSecurity: 40000
   sessionView: 77750
   share: 71239
   snapshotRestore: 79032

tsconfig.base.json

@@ -712,8 +712,6 @@
       "@kbn/eslint-plugin-telemetry/*": ["packages/kbn-eslint-plugin-telemetry/*"],
       "@kbn/eso-plugin": ["x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin"],
       "@kbn/eso-plugin/*": ["x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin/*"],
-      "@kbn/ess-security": ["x-pack/plugins/ess_security"],
-      "@kbn/ess-security/*": ["x-pack/plugins/ess_security/*"],
       "@kbn/event-annotation-plugin": ["src/plugins/event_annotation"],
       "@kbn/event-annotation-plugin/*": ["src/plugins/event_annotation/*"],
       "@kbn/event-log-fixture-plugin": ["x-pack/test/plugin_api_integration/plugins/event_log"],
@@ -1154,10 +1152,14 @@
       "@kbn/security-api-integration-helpers/*": ["x-pack/test/security_api_integration/packages/helpers/*"],
       "@kbn/security-plugin": ["x-pack/plugins/security"],
       "@kbn/security-plugin/*": ["x-pack/plugins/security/*"],
+      "@kbn/security-solution-ess": ["x-pack/plugins/security_solution_ess"],
+      "@kbn/security-solution-ess/*": ["x-pack/plugins/security_solution_ess/*"],
       "@kbn/security-solution-fixtures-plugin": ["x-pack/test/cases_api_integration/common/plugins/security_solution"],
       "@kbn/security-solution-fixtures-plugin/*": ["x-pack/test/cases_api_integration/common/plugins/security_solution/*"],
       "@kbn/security-solution-plugin": ["x-pack/plugins/security_solution"],
       "@kbn/security-solution-plugin/*": ["x-pack/plugins/security_solution/*"],
+      "@kbn/security-solution-serverless": ["x-pack/plugins/security_solution_serverless"],
+      "@kbn/security-solution-serverless/*": ["x-pack/plugins/security_solution_serverless/*"],
       "@kbn/security-solution-side-nav": ["x-pack/packages/security-solution/side_nav"],
       "@kbn/security-solution-side-nav/*": ["x-pack/packages/security-solution/side_nav/*"],
       "@kbn/security-solution-storybook-config": ["x-pack/packages/security-solution/storybook/config"],
@@ -1212,8 +1214,6 @@
       "@kbn/serverless-project-switcher/*": ["packages/serverless/project_switcher/*"],
       "@kbn/serverless-search": ["x-pack/plugins/serverless_search"],
       "@kbn/serverless-search/*": ["x-pack/plugins/serverless_search/*"],
-      "@kbn/serverless-security": ["x-pack/plugins/serverless_security"],
-      "@kbn/serverless-security/*": ["x-pack/plugins/serverless_security/*"],
       "@kbn/serverless-storybook-config": ["packages/serverless/storybook/config"],
       "@kbn/serverless-storybook-config/*": ["packages/serverless/storybook/config/*"],
       "@kbn/serverless-types": ["packages/serverless/types"],

x-pack/.i18nrc.json

@@ -74,9 +74,9 @@
     "xpack.serverless": "plugins/serverless",
     "xpack.serverlessSearch": "plugins/serverless_search",
     "xpack.serverlessObservability": "plugins/serverless_observability",
-    "xpack.serverlessSecurity": "plugins/serverless_security",
     "xpack.securitySolution": "plugins/security_solution",
-    "xpack.securitySolutionEss": "plugins/ess_security",
+    "xpack.securitySolutionEss": "plugins/security_solution_ess",
+    "xpack.securitySolutionServerless": "plugins/security_solution_serverless",
     "xpack.sessionView": "plugins/session_view",
     "xpack.snapshotRestore": "plugins/snapshot_restore",
     "xpack.spaces": "plugins/spaces",

x-pack/plugins/apm/server/routes/typings.ts

@@ -11,6 +11,7 @@ import {
   Logger,
   KibanaRequest,
   CoreStart,
+  RouteConfigOptions,
 } from '@kbn/core/server';
 import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
 import { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
@@ -41,7 +42,7 @@ export interface APMRouteCreateOptions {
     >;
     body?: { accepts: Array<'application/json' | 'multipart/form-data'> };
     disableTelemetry?: boolean;
-  };
+  } & RouteConfigOptions<any>;
 }
 
 export type TelemetryUsageCounter = ReturnType<