Merge branch 'DianaDerevyankina' into 55710

# Conflicts:
#	x-pack/plugins/apm/kibana.json
#	x-pack/plugins/apm/public/index.ts
#	x-pack/plugins/apm/public/plugin.ts

.eslintignore

@@ -30,6 +30,7 @@ target
 /x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
 /x-pack/legacy/plugins/canvas/shareable_runtime/build
 /x-pack/legacy/plugins/canvas/storybook
+/x-pack/plugins/monitoring/public/lib/jquery_flot
 /x-pack/legacy/plugins/infra/common/graphql/types.ts
 /x-pack/legacy/plugins/infra/public/graphql/types.ts
 /x-pack/legacy/plugins/infra/server/graphql/types.ts

.eslintrc.js

@@ -963,6 +963,12 @@ module.exports = {
         jquery: true,
       },
     },
+    {
+      files: ['x-pack/plugins/monitoring/public/lib/jquery_flot/**/*.js'],
+      env: {
+        jquery: true,
+      },
+    },
 
     /**
      * TSVB overrides

.github/CODEOWNERS

@@ -84,6 +84,7 @@
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
 /x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
+/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 
 # Machine Learning
@@ -203,6 +204,7 @@
 /x-pack/plugins/snapshot_restore/  @elastic/es-ui
 /x-pack/plugins/upgrade_assistant/  @elastic/es-ui
 /x-pack/plugins/watcher/  @elastic/es-ui
+/x-pack/plugins/ingest_pipelines/  @elastic/es-ui
 
 # Endpoint
 /x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem

docs/development/core/server/kibana-plugin-core-server.savedobjectmigrationfn.md

@@ -9,22 +9,36 @@ A migration function for a [saved object type](./kibana-plugin-core-server.saved
 <b>Signature:</b>
 
 ```typescript
-export declare type SavedObjectMigrationFn = (doc: SavedObjectUnsanitizedDoc, context: SavedObjectMigrationContext) => SavedObjectUnsanitizedDoc;
+export declare type SavedObjectMigrationFn<InputAttributes = unknown, MigratedAttributes = unknown> = (doc: SavedObjectUnsanitizedDoc<InputAttributes>, context: SavedObjectMigrationContext) => SavedObjectUnsanitizedDoc<MigratedAttributes>;
 ```
 
 ## Example
 
 
 ```typescript
-const migrateProperty: SavedObjectMigrationFn = (doc, { log }) => {
-  if(doc.attributes.someProp === null) {
-    log.warn('Skipping migration');
-  } else {
-    doc.attributes.someProp = migrateProperty(doc.attributes.someProp);
-  }
-
-  return doc;
+interface TypeV1Attributes {
+  someKey: string;
+  obsoleteProperty: number;
 }
 
+interface TypeV2Attributes {
+  someKey: string;
+  newProperty: string;
+}
+
+const migrateToV2: SavedObjectMigrationFn<TypeV1Attributes, TypeV2Attributes> = (doc, { log }) => {
+  const { obsoleteProperty, ...otherAttributes } = doc.attributes;
+  // instead of mutating `doc` we make a shallow copy so that we can use separate types for the input
+  // and output attributes. We don't need to make a deep copy, we just need to ensure that obsolete
+  // attributes are not present on the returned doc.
+  return {
+    ...doc,
+    attributes: {
+      ...otherAttributes,
+      newProperty: migrate(obsoleteProperty),
+    },
+  };
+};
+
 ```
 

docs/development/core/server/kibana-plugin-core-server.savedobjectsanitizeddoc.md

@@ -9,5 +9,5 @@ Describes Saved Object documents that have passed through the migration framewor
 <b>Signature:</b>
 
 ```typescript
-export declare type SavedObjectSanitizedDoc = SavedObjectDoc & Referencable;
+export declare type SavedObjectSanitizedDoc<T = unknown> = SavedObjectDoc<T> & Referencable;
 ```

docs/development/core/server/kibana-plugin-core-server.savedobjectunsanitizeddoc.md

@@ -9,5 +9,5 @@ Describes Saved Object documents from Kibana < 7.0.0 which don't have a `refe
 <b>Signature:</b>
 
 ```typescript
-export declare type SavedObjectUnsanitizedDoc = SavedObjectDoc & Partial<Referencable>;
+export declare type SavedObjectUnsanitizedDoc<T = unknown> = SavedObjectDoc<T> & Partial<Referencable>;
 ```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.agggrouplabels.md

@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggGroupLabels](./kibana-plugin-plugins-data-public.agggrouplabels.md)
+
+## AggGroupLabels variable
+
+<b>Signature:</b>
+
+```typescript
+AggGroupLabels: {
+    [AggGroupNames.Buckets]: string;
+    [AggGroupNames.Metrics]: string;
+    [AggGroupNames.None]: string;
+}
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.agggroupname.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggGroupName](./kibana-plugin-plugins-data-public.agggroupname.md)
+
+## AggGroupName type
+
+<b>Signature:</b>
+
+```typescript
+export declare type AggGroupName = $Values<typeof AggGroupNames>;
+```