Merge branch 'main' into so-finder-7

.github/CODEOWNERS

@@ -528,6 +528,8 @@ x-pack/test/security_api_integration/packages/helpers @elastic/kibana-core
 x-pack/plugins/security @elastic/kibana-security
 x-pack/test/cases_api_integration/common/plugins/security_solution @elastic/response-ops
 x-pack/plugins/security_solution @elastic/security-solution
+packages/security-solution/side_nav @elastic/security-threat-hunting-explore
+packages/security-solution/storybook/config @elastic/appex-sharedux
 x-pack/test/security_functional/plugins/test_endpoints @elastic/kibana-security
 packages/kbn-securitysolution-autocomplete @elastic/security-solution-platform
 packages/kbn-securitysolution-ecs @elastic/security-threat-hunting-explore

.i18nrc.json

@@ -79,6 +79,7 @@
     "server": "src/legacy/server",
     "share": "src/plugins/share",
     "sharedUXPackages": "packages/shared-ux",
+    "securitySolutionPackages": "packages/security-solution",
     "coloring": "packages/kbn-coloring/src",
     "languageDocumentationPopover": "packages/kbn-language-documentation-popover/src",
     "statusPage": "src/legacy/core_plugins/status_page",

docs/developer/plugin-list.asciidoc

@@ -488,7 +488,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 
 |{kib-repo}blob/{branch}/x-pack/plugins/custom_branding/README.md[customBranding]
 |This is a plugin to configure custom branding.
-This plugin is currently under active development; do not use.
+Plugin server-side only. Plugin has three main functions:
 
 
 |<<dashboard-enhanced-plugin>>

examples/content_management_examples/public/examples/todos/stories/todo.stories.tsx

@@ -8,6 +8,7 @@
 
 import * as React from 'react';
 import { ContentClientProvider, ContentClient } from '@kbn/content-management-plugin/public';
+import { ContentTypeRegistry } from '@kbn/content-management-plugin/public/registry';
 
 import { Todos } from '../todos';
 import { TodosClient } from './todos_client';
@@ -19,6 +20,10 @@ export default {
 };
 
 const todosClient = new TodosClient();
+
+const contentTypeRegistry = new ContentTypeRegistry();
+contentTypeRegistry.register({ id: 'todos', version: { latest: 'v1' } });
+
 const contentClient = new ContentClient((contentType: string) => {
   switch (contentType) {
     case 'todos':
@@ -27,7 +32,7 @@ const contentClient = new ContentClient((contentType: string) => {
     default:
       throw new Error(`Unknown content type: ${contentType}`);
   }
-});
+}, contentTypeRegistry);
 
 export const SimpleTodoApp = () => (
   <ContentClientProvider contentClient={contentClient}>

examples/content_management_examples/public/plugin.ts

@@ -31,10 +31,17 @@ export class ContentManagementExamplesPlugin
       },
     });
 
+    contentManagement.registry.register({
+      id: 'todos',
+      version: {
+        latest: 'v1',
+      },
+    });
+
     return {};
   }
 
-  public start(core: CoreStart) {
+  public start(core: CoreStart, deps: StartDeps) {
     return {};
   }
 

examples/content_management_examples/server/examples/todos/todos.ts

@@ -13,20 +13,13 @@ import {
 } from '@kbn/content-management-plugin/server';
 import { v4 } from 'uuid';
 import {
-  createInSchema,
-  searchInSchema,
   Todo,
   TODO_CONTENT_ID,
-  updateInSchema,
   TodoSearchOut,
   TodoCreateOut,
   TodoUpdateOut,
   TodoDeleteOut,
   TodoGetOut,
-  createOutSchema,
-  getOutSchema,
-  updateOutSchema,
-  searchOutSchema,
   TodoUpdateIn,
   TodoSearchIn,
   TodoCreateIn,
@@ -39,40 +32,10 @@ export const registerTodoContentType = ({
 }) => {
   contentManagement.register({
     id: TODO_CONTENT_ID,
-    schemas: {
-      content: {
-        create: {
-          in: {
-            data: createInSchema,
-          },
-          out: {
-            result: createOutSchema,
-          },
-        },
-        update: {
-          in: {
-            data: updateInSchema,
-          },
-          out: {
-            result: updateOutSchema,
-          },
-        },
-        search: {
-          in: {
-            query: searchInSchema,
-          },
-          out: {
-            result: searchOutSchema,
-          },
-        },
-        get: {
-          out: {
-            result: getOutSchema,
-          },
-        },
-      },
-    },
     storage: new TodosStorage(),
+    version: {
+      latest: 'v1',
+    },
   });
 };
 

package.json

@@ -530,6 +530,8 @@
     "@kbn/security-plugin": "link:x-pack/plugins/security",
     "@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-side-nav": "link:packages/security-solution/side_nav",
+    "@kbn/security-solution-storybook-config": "link:packages/security-solution/storybook/config",
     "@kbn/security-test-endpoints-plugin": "link:x-pack/test/security_functional/plugins/test_endpoints",
     "@kbn/securitysolution-autocomplete": "link:packages/kbn-securitysolution-autocomplete",
     "@kbn/securitysolution-ecs": "link:packages/kbn-securitysolution-ecs",
@@ -752,7 +754,7 @@
     "deepmerge": "^4.2.2",
     "del": "^6.1.0",
     "elastic-apm-http-client": "^11.0.1",
-    "elastic-apm-node": "^3.42.0",
+    "elastic-apm-node": "^3.43.0",
     "email-addresses": "^5.0.0",
     "execa": "^4.0.2",
     "expiry-js": "0.1.7",

packages/kbn-apm-synthtrace-client/src/lib/apm/apm_fields.ts

@@ -116,6 +116,7 @@ export type ApmFields = Fields<{
     'kubernetes.pod.name': string;
     'kubernetes.pod.uid': string;
     'labels.name': string;
+    'labels.telemetry_auto_version': string;
     'metricset.name': string;
     'network.carrier.icc': string;
     'network.carrier.mcc': string;

packages/kbn-apm-synthtrace-client/src/lib/apm/processors/get_breakdown_metrics.ts

@@ -41,6 +41,7 @@ const KEY_FIELDS: Array<keyof ApmFields> = [
   'transaction.name',
   'span.type',
   'span.subtype',
+  'labels.telemetry_auto_version',
 ];
 
 export function getBreakdownMetrics(events: ApmFields[]): ApmFields[] {