Merge branch '7.x' into backport/7.x/pr-65467

Author: elasticmachine

docs/canvas/canvas-elements.asciidoc

@@ -31,7 +31,7 @@ By default, most of the elements you create use demo data until you change the d
 [[canvas-add-object]]
 ==== Add a saved object
 
-Add a <<managing-saved-objects,saved object>>, such as a map or Lens visualization, then customize it to fit your display needs.
+Add a <<managing-saved-objects,saved object>>, then customize it to fit your display needs.
 
 . Click *Embed object*.
 

docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md

@@ -10,6 +10,7 @@
 fields?: {
         [subfield: string]: {
             type: string;
+            ignore_above?: number;
         };
     };
 ```

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

@@ -17,7 +17,7 @@ export interface SavedObjectsCoreFieldMapping
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [enabled](./kibana-plugin-core-server.savedobjectscorefieldmapping.enabled.md) | <code>boolean</code> |  |
-|  [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code>        [subfield: string]: {</code><br/><code>            type: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
+|  [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code>        [subfield: string]: {</code><br/><code>            type: string;</code><br/><code>            ignore_above?: number;</code><br/><code>        };</code><br/><code>    }</code> |  |
 |  [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md) | <code>boolean</code> |  |
 |  [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md) | <code>number &#124; boolean &#124; string</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md) | <code>string</code> |  |

docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.error.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsMigrationLogger](./kibana-plugin-core-server.savedobjectsmigrationlogger.md) &gt; [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md)
+
+## SavedObjectsMigrationLogger.error property
+
+<b>Signature:</b>
+
+```typescript
+error: (msg: string, meta: LogMeta) => void;
+```

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

@@ -16,6 +16,7 @@ export interface SavedObjectsMigrationLogger
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [debug](./kibana-plugin-core-server.savedobjectsmigrationlogger.debug.md) | <code>(msg: string) =&gt; void</code> |  |
+|  [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md) | <code>(msg: string, meta: LogMeta) =&gt; void</code> |  |
 |  [info](./kibana-plugin-core-server.savedobjectsmigrationlogger.info.md) | <code>(msg: string) =&gt; void</code> |  |
 |  [warn](./kibana-plugin-core-server.savedobjectsmigrationlogger.warn.md) | <code>(msg: string) =&gt; void</code> |  |
 |  [warning](./kibana-plugin-core-server.savedobjectsmigrationlogger.warning.md) | <code>(msg: string) =&gt; void</code> |  |

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.gettimefield.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-server](./kibana-plugin-plugins-data-server.md) &gt; [IIndexPattern](./kibana-plugin-plugins-data-server.iindexpattern.md) &gt; [getTimeField](./kibana-plugin-plugins-data-server.iindexpattern.gettimefield.md)
+
+## IIndexPattern.getTimeField() method
+
+<b>Signature:</b>
+
+```typescript
+getTimeField?(): IFieldType | undefined;
+```
+<b>Returns:</b>
+
+`IFieldType | undefined`
+

docs/user/plugins.asciidoc

@@ -33,12 +33,17 @@ $ bin/kibana-plugin install x-pack
 === Install plugins from an arbitrary URL
 
 You can download official Elastic plugins simply by specifying their name. You
-can alternatively specify a URL to a specific plugin, as in the following
-example:
+can alternatively specify a URL or file path to a specific plugin, as in the following
+examples:
 
 ["source","shell",subs="attributes"]
 $ bin/kibana-plugin install https://artifacts.elastic.co/downloads/packs/x-pack/x-pack-{version}.zip
 
+or
+
+["source","shell",subs="attributes"]
+$ bin/kibana-plugin install file:///local/path/to/custom_plugin.zip
+
 You can specify URLs that use the HTTP, HTTPS, or `file` protocols.
 
 [float]

src/core/server/saved_objects/mappings/types.ts

@@ -137,6 +137,7 @@ export interface SavedObjectsCoreFieldMapping {
   fields?: {
     [subfield: string]: {
       type: string;
+      ignore_above?: number;
     };
   };
 }

src/core/server/saved_objects/migrations/core/document_migrator.test.ts

@@ -293,7 +293,7 @@ describe('DocumentMigrator', () => {
         migrationVersion: { dog: '10.2.0' },
       })
     ).toThrow(
-      /Document "smelly" has property "dog" which belongs to a more recent version of Kibana \(10\.2\.0\)/i
+      /Document "smelly" has property "dog" which belongs to a more recent version of Kibana \[10\.2\.0\]\. The last known version is \[undefined\]/i
     );
   });
 
@@ -315,7 +315,7 @@ describe('DocumentMigrator', () => {
         migrationVersion: { dawg: '1.2.4' },
       })
     ).toThrow(
-      /Document "fleabag" has property "dawg" which belongs to a more recent version of Kibana \(1\.2\.4\)/i
+      /Document "fleabag" has property "dawg" which belongs to a more recent version of Kibana \[1\.2\.4\]\. The last known version is \[1\.2\.3\]/i
     );
   });
 

src/core/server/saved_objects/migrations/core/document_migrator.ts

@@ -350,7 +350,7 @@ function nextUnmigratedProp(doc: SavedObjectUnsanitizedDoc, migrations: ActiveMi
     if (docVersion && (!latestVersion || Semver.gt(docVersion, latestVersion))) {
       throw Boom.badData(
         `Document "${doc.id}" has property "${p}" which belongs to a more recent` +
-          ` version of Kibana (${docVersion}).`,
+          ` version of Kibana [${docVersion}]. The last known version is [${latestVersion}]`,
         doc
       );
     }