Merge branch 'master' of github.com:kevinlog/kibana into task/onboard…

…ing-ux-updates
elastic · Jul 9, 2020 · aa75c5e · aa75c5e
2 parents 65a2248 + b25b690
commit aa75c5e
Show file tree

Hide file tree

Showing 375 changed files with 3,146 additions and 2,389 deletions.
diff --git a/docs/images/canvas-add-image.gif → docs/canvas/images/canvas-add-image.gif b/docs/images/canvas-add-image.gif → docs/canvas/images/canvas-add-image.gif
diff --git a/docs/images/canvas-add-pages.gif → docs/canvas/images/canvas-add-pages.gif b/docs/images/canvas-add-pages.gif → docs/canvas/images/canvas-add-pages.gif
diff --git a/docs/images/canvas-autoplay-interval.png → ...anvas/images/canvas-autoplay-interval.png b/docs/images/canvas-autoplay-interval.png → ...anvas/images/canvas-autoplay-interval.png
diff --git a/...images/canvas-background-color-picker.png → ...images/canvas-background-color-picker.png b/...images/canvas-background-color-picker.png → ...images/canvas-background-color-picker.png
diff --git a/...hange-your-expression-chart-no-legend.png → ...hange-your-expression-chart-no-legend.png b/...hange-your-expression-chart-no-legend.png → ...hange-your-expression-chart-no-legend.png
diff --git a/...s/canvas-change-your-expression-chart.png → ...s/canvas-change-your-expression-chart.png b/...s/canvas-change-your-expression-chart.png → ...s/canvas-change-your-expression-chart.png
diff --git a/docs/images/canvas-chart-element.png → docs/canvas/images/canvas-chart-element.png b/docs/images/canvas-chart-element.png → docs/canvas/images/canvas-chart-element.png
diff --git a/docs/images/canvas-create-URL.gif → docs/canvas/images/canvas-create-URL.gif b/docs/images/canvas-create-URL.gif → docs/canvas/images/canvas-create-URL.gif
diff --git a/docs/images/canvas-element-select.gif → docs/canvas/images/canvas-element-select.gif b/docs/images/canvas-element-select.gif → docs/canvas/images/canvas-element-select.gif
diff --git a/docs/images/canvas-export-workpad.png → docs/canvas/images/canvas-export-workpad.png b/docs/images/canvas-export-workpad.png → docs/canvas/images/canvas-export-workpad.png
diff --git a/docs/images/canvas-fullscreen.png → docs/canvas/images/canvas-fullscreen.png b/docs/images/canvas-fullscreen.png → docs/canvas/images/canvas-fullscreen.png
diff --git a/...ctions-can-take-arguments-donut-chart.png → ...ctions-can-take-arguments-donut-chart.png b/...ctions-can-take-arguments-donut-chart.png → ...ctions-can-take-arguments-donut-chart.png
diff --git a/...unctions-can-take-arguments-pie-chart.png → ...unctions-can-take-arguments-pie-chart.png b/...unctions-can-take-arguments-pie-chart.png → ...unctions-can-take-arguments-pie-chart.png
diff --git a/docs/images/canvas-generate-pdf.gif → docs/canvas/images/canvas-generate-pdf.gif b/docs/images/canvas-generate-pdf.gif → docs/canvas/images/canvas-generate-pdf.gif
diff --git a/docs/images/canvas-gs-example.png → docs/canvas/images/canvas-gs-example.png b/docs/images/canvas-gs-example.png → docs/canvas/images/canvas-gs-example.png
diff --git a/docs/images/canvas-image-element.png → docs/canvas/images/canvas-image-element.png b/docs/images/canvas-image-element.png → docs/canvas/images/canvas-image-element.png
diff --git a/docs/images/canvas-map-embed.gif → docs/canvas/images/canvas-map-embed.gif b/docs/images/canvas-map-embed.gif → docs/canvas/images/canvas-map-embed.gif
diff --git a/docs/images/canvas-metric-element.png → docs/canvas/images/canvas-metric-element.png b/docs/images/canvas-metric-element.png → docs/canvas/images/canvas-metric-element.png
diff --git a/docs/images/canvas-refresh-interval.png → ...canvas/images/canvas-refresh-interval.png b/docs/images/canvas-refresh-interval.png → ...canvas/images/canvas-refresh-interval.png
diff --git a/docs/images/canvas-timefilter-element.png → ...nvas/images/canvas-timefilter-element.png b/docs/images/canvas-timefilter-element.png → ...nvas/images/canvas-timefilter-element.png
diff --git a/docs/images/canvas-zoom-controls.png → docs/canvas/images/canvas-zoom-controls.png b/docs/images/canvas-zoom-controls.png → docs/canvas/images/canvas-zoom-controls.png
diff --git a/docs/images/canvas_element_options.png → .../canvas/images/canvas_element_options.png b/docs/images/canvas_element_options.png → .../canvas/images/canvas_element_options.png
diff --git a/docs/images/canvas_save_element.png → docs/canvas/images/canvas_save_element.png b/docs/images/canvas_save_element.png → docs/canvas/images/canvas_save_element.png
diff --git a/docs/images/settings.png → docs/dev-tools/console/images/settings.png b/docs/images/settings.png → docs/dev-tools/console/images/settings.png
diff --git a/docs/images/jenkins/job_view.png → docs/developer/images/job_view.png b/docs/images/jenkins/job_view.png → docs/developer/images/job_view.png
diff --git a/docs/images/jenkins/pipeline_steps_view.png → .../developer/images/pipeline_steps_view.png b/docs/images/jenkins/pipeline_steps_view.png → .../developer/images/pipeline_steps_view.png
diff --git a/docs/developer/testing/interpreting-ci-failures.asciidoc b/docs/developer/testing/interpreting-ci-failures.asciidoc
@@ -17,7 +17,7 @@ Clicking the link next to the check in the conversation tab of a pull request wi
 
 To view the results of a job execution in Jenkins, either click the link in the comment left by `@elasticmachine` or search for the `kibana-ci` check in the list at the bottom of the PR. This link will take you to the top-level page for the specific job execution that failed.
 
-image::images/jenkins/job_view.png[]
+image::images/job_view.png[]
 
 1. *Git Changes:* the list of commits that were in this build which weren't in the previous build. For Pull Requests this list is calculated by comparing against the most recent Pull Request which was tested, it is not limited to build for this specific Pull Request, so it's not very useful.
 2. *Test Results:* A link to the test results screen, and shortcuts to the failed tests. Functional tests capture and store the log output from each specific test, and make it visible at these links. For other test runners only the error message is visible and log output must be tracked down in the *Pipeline Steps*.
@@ -29,6 +29,6 @@ image::images/jenkins/job_view.png[]
 
 To view the logs for a failed specific ciGroup, jest, mocha, type checkers, linters, etc., click on the *Pipeline Steps* link in from the Job page.
 
-image::images/jenkins/pipeline_steps_view.png[]
+image::images/pipeline_steps_view.png[]
 
 Scroll down the page until you find a failed step *(1)*, and then look up a few lines for the `Branch:` step to see which specific job this is. If this is the job you're looking for click the little terminal icon next to the failed step *(1)* to view the logs for that specific step in the Pipeline.
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
@@ -154,7 +154,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsBulkUpdateResponse](./kibana-plugin-core-server.savedobjectsbulkupdateresponse.md) |  |
 |  [SavedObjectsClientProviderOptions](./kibana-plugin-core-server.savedobjectsclientprovideroptions.md) | Options to control the creation of the Saved Objects Client. |
 |  [SavedObjectsClientWrapperOptions](./kibana-plugin-core-server.savedobjectsclientwrapperoptions.md) | Options passed to each SavedObjectsClientWrapperFactory to aid in creating the wrapper instance. |
-|  [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation.<!-- -->Note: this type intentially doesn't include a type definition for defining the <code>dynamic</code> mapping parameter. Saved Object fields should always inherit the <code>dynamic: 'strict'</code> paramater. If you are unsure of the shape of your data use <code>type: 'object', enabled: false</code> instead. |
+|  [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
 |  [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
 |  [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md) |  |
 |  [SavedObjectsDeleteByNamespaceOptions](./kibana-plugin-core-server.savedobjectsdeletebynamespaceoptions.md) |  |

diff --git a/...ore/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md b/...ore/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md
@@ -0,0 +1,15 @@
+<!-- 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; [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) &gt; [dynamic](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md)
+
+## SavedObjectsComplexFieldMapping.dynamic property
+
+The dynamic property of the mapping, either `false` or `'strict'`<!-- -->. If unspecified `dynamic: 'strict'` will be inherited from the top-level index mappings.
+
+Note: To limit the number of mapping fields Saved Object types should \*never\* use `dynamic: true`<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+dynamic?: false | 'strict';
+```
diff --git a/...ore/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md b/...ore/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.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; [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) &gt; [enabled](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md)
+
+## SavedObjectsComplexFieldMapping.enabled property
+
+<b>Signature:</b>
+
+```typescript
+enabled?: boolean;
+```
diff --git a/...opment/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.md b/...opment/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.md
@@ -6,8 +6,6 @@
 
 See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation.
 
-Note: this type intentially doesn't include a type definition for defining the `dynamic` mapping parameter. Saved Object fields should always inherit the `dynamic: 'strict'` paramater. If you are unsure of the shape of your data use `type: 'object', enabled: false` instead.
-
 <b>Signature:</b>
 
 ```typescript
@@ -19,6 +17,8 @@ export interface SavedObjectsComplexFieldMapping
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [doc\_values](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md) | <code>boolean</code> |  |
+|  [dynamic](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md) | <code>false &#124; 'strict'</code> | The dynamic property of the mapping, either <code>false</code> or <code>'strict'</code>. If unspecified <code>dynamic: 'strict'</code> will be inherited from the top-level index mappings.<!-- -->Note: To limit the number of mapping fields Saved Object types should \*never\* use <code>dynamic: true</code>. |
+|  [enabled](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md) | <code>boolean</code> |  |
 |  [properties](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md) | <code>SavedObjectsMappingProperties</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md) | <code>string</code> |  |
 
diff --git a/...t/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.enabled.md b/...t/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.enabled.md
diff --git a/...velopment/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md b/...velopment/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
@@ -17,7 +17,6 @@ export interface SavedObjectsCoreFieldMapping
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [doc\_values](./kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md) | <code>boolean</code> |  |
-|  [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>            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> |  |

diff --git a/...e/server/kibana-plugin-core-server.savedobjectstypemappingdefinition.dynamic.md b/...e/server/kibana-plugin-core-server.savedobjectstypemappingdefinition.dynamic.md
@@ -4,7 +4,7 @@
 
 ## SavedObjectsTypeMappingDefinition.dynamic property
 
-The dynamic property of the mapping. either `false` or 'strict'. Defaults to `false`
+The dynamic property of the mapping, either `false` or `'strict'`<!-- -->. If unspecified `dynamic: 'strict'` will be inherited from the top-level index mappings.
 
 <b>Signature:</b>
 

diff --git a/...ment/core/server/kibana-plugin-core-server.savedobjectstypemappingdefinition.md b/...ment/core/server/kibana-plugin-core-server.savedobjectstypemappingdefinition.md
@@ -41,6 +41,6 @@ const typeDefinition: SavedObjectsTypeMappingDefinition = {
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [dynamic](./kibana-plugin-core-server.savedobjectstypemappingdefinition.dynamic.md) | <code>false &#124; 'strict'</code> | The dynamic property of the mapping. either <code>false</code> or 'strict'. Defaults to <code>false</code> |
+|  [dynamic](./kibana-plugin-core-server.savedobjectstypemappingdefinition.dynamic.md) | <code>false &#124; 'strict'</code> | The dynamic property of the mapping, either <code>false</code> or <code>'strict'</code>. If unspecified <code>dynamic: 'strict'</code> will be inherited from the top-level index mappings. |
 |  [properties](./kibana-plugin-core-server.savedobjectstypemappingdefinition.properties.md) | <code>SavedObjectsMappingProperties</code> | The underlying properties of the type mapping |
 
diff --git a/docs/images/Discover-ContextView.png → .../discover/images/Discover-ContextView.png b/docs/images/Discover-ContextView.png → .../discover/images/Discover-ContextView.png
diff --git a/docs/images/Discover-Start.png → docs/discover/images/Discover-Start.png b/docs/images/Discover-Start.png → docs/discover/images/Discover-Start.png
diff --git a/docs/images/Expanded-Document.png → docs/discover/images/Expanded-Document.png b/docs/images/Expanded-Document.png → docs/discover/images/Expanded-Document.png
diff --git a/docs/images/Histogram-Time.png → docs/discover/images/Histogram-Time.png b/docs/images/Histogram-Time.png → docs/discover/images/Histogram-Time.png
diff --git a/docs/images/NegativeFilter.jpg → docs/discover/images/NegativeFilter.jpg b/docs/images/NegativeFilter.jpg → docs/discover/images/NegativeFilter.jpg
diff --git a/docs/images/PositiveFilter.jpg → docs/discover/images/PositiveFilter.jpg b/docs/images/PositiveFilter.jpg → docs/discover/images/PositiveFilter.jpg
diff --git a/docs/images/Timepicker-View.png → docs/discover/images/Timepicker-View.png b/docs/images/Timepicker-View.png → docs/discover/images/Timepicker-View.png
diff --git a/docs/images/edit_filter_query_json.png → ...iscover/images/edit_filter_query_json.png b/docs/images/edit_filter_query_json.png → ...iscover/images/edit_filter_query_json.png
diff --git a/docs/images/filter-field.png → docs/discover/images/filter-field.png b/docs/images/filter-field.png → docs/discover/images/filter-field.png
diff --git a/docs/images/time-filter-bar.png → docs/discover/images/time-filter-bar.png b/docs/images/time-filter-bar.png → docs/discover/images/time-filter-bar.png
diff --git a/docs/images/time-filter-calendar.png → .../discover/images/time-filter-calendar.png b/docs/images/time-filter-calendar.png → .../discover/images/time-filter-calendar.png
diff --git a/docs/images/tutorial-dashboard.png → ...ing-started/images/tutorial-dashboard.png b/docs/images/tutorial-dashboard.png → ...ing-started/images/tutorial-dashboard.png
diff --git a/docs/images/tutorial-discover-2.png → ...ng-started/images/tutorial-discover-2.png b/docs/images/tutorial-discover-2.png → ...ng-started/images/tutorial-discover-2.png
diff --git a/docs/images/tutorial-discover-3.png → ...ng-started/images/tutorial-discover-3.png b/docs/images/tutorial-discover-3.png → ...ng-started/images/tutorial-discover-3.png
diff --git a/docs/images/tutorial-full-inspect1.png → ...started/images/tutorial-full-inspect1.png b/docs/images/tutorial-full-inspect1.png → ...started/images/tutorial-full-inspect1.png
diff --git a/docs/images/tutorial-pattern-1.png → ...ing-started/images/tutorial-pattern-1.png b/docs/images/tutorial-pattern-1.png → ...ing-started/images/tutorial-pattern-1.png
diff --git a/docs/images/tutorial-visualize-bar-1.5.png → ...ted/images/tutorial-visualize-bar-1.5.png b/docs/images/tutorial-visualize-bar-1.5.png → ...ted/images/tutorial-visualize-bar-1.5.png
diff --git a/docs/images/tutorial-visualize-map-2.png → ...arted/images/tutorial-visualize-map-2.png b/docs/images/tutorial-visualize-map-2.png → ...arted/images/tutorial-visualize-map-2.png
diff --git a/docs/images/tutorial-visualize-md-2.png → ...tarted/images/tutorial-visualize-md-2.png b/docs/images/tutorial-visualize-md-2.png → ...tarted/images/tutorial-visualize-md-2.png
diff --git a/docs/images/tutorial-visualize-pie-2.png → ...arted/images/tutorial-visualize-pie-2.png b/docs/images/tutorial-visualize-pie-2.png → ...arted/images/tutorial-visualize-pie-2.png
diff --git a/docs/images/tutorial-visualize-pie-3.png → ...arted/images/tutorial-visualize-pie-3.png b/docs/images/tutorial-visualize-pie-3.png → ...arted/images/tutorial-visualize-pie-3.png
diff --git a/...ages/tutorial-visualize-wizard-step-1.png → ...ages/tutorial-visualize-wizard-step-1.png b/...ages/tutorial-visualize-wizard-step-1.png → ...ages/tutorial-visualize-wizard-step-1.png
diff --git a/docs/images/AddFieldButton.jpg b/docs/images/AddFieldButton.jpg
diff --git a/docs/images/CollapseButton.jpg b/docs/images/CollapseButton.jpg
diff --git a/docs/images/Dashboard_Resize_Menu.png b/docs/images/Dashboard_Resize_Menu.png
diff --git a/docs/images/Dashboard_visualization_data.png b/docs/images/Dashboard_visualization_data.png
diff --git a/docs/images/Discover-ContextView-FilterMontage.png b/docs/images/Discover-ContextView-FilterMontage.png
diff --git a/docs/images/Discover-FieldStats.jpg b/docs/images/Discover-FieldStats.jpg
diff --git a/docs/images/Discover-MoveColumn.jpg b/docs/images/Discover-MoveColumn.jpg
diff --git a/docs/images/EditVis.png b/docs/images/EditVis.png
diff --git a/docs/images/ExistsButton.jpg b/docs/images/ExistsButton.jpg
diff --git a/docs/images/ExpandButton.jpg b/docs/images/ExpandButton.jpg
diff --git a/docs/images/NYCTA-Table.jpg b/docs/images/NYCTA-Table.jpg
diff --git a/docs/images/NewDashboard.png b/docs/images/NewDashboard.png
diff --git a/docs/images/RemoveFieldButton.jpg b/docs/images/RemoveFieldButton.jpg
diff --git a/docs/images/Start-Page.png b/docs/images/Start-Page.png
diff --git a/docs/images/TimeFilter.jpg b/docs/images/TimeFilter.jpg
diff --git a/docs/images/VizEditor.jpg b/docs/images/VizEditor.jpg
diff --git a/docs/images/add-column-button.png b/docs/images/add-column-button.png
diff --git a/docs/images/add_filter_field.png b/docs/images/add_filter_field.png
diff --git a/docs/images/add_filter_operator.png b/docs/images/add_filter_operator.png
diff --git a/docs/images/add_filter_value.png b/docs/images/add_filter_value.png
diff --git a/docs/images/auto_format_after.png b/docs/images/auto_format_after.png
diff --git a/docs/images/auto_format_before.png b/docs/images/auto_format_before.png
diff --git a/docs/images/auto_format_bulk.png b/docs/images/auto_format_bulk.png
diff --git a/docs/images/autorefresh-intervals.png b/docs/images/autorefresh-intervals.png
diff --git a/docs/images/autorefresh-pause.png b/docs/images/autorefresh-pause.png
diff --git a/docs/images/autorefresh.png b/docs/images/autorefresh.png
diff --git a/docs/images/bar-terms-agg.png b/docs/images/bar-terms-agg.png
diff --git a/docs/images/bar-terms-subagg.png b/docs/images/bar-terms-subagg.png
diff --git a/docs/images/canvas-align-elements.gif b/docs/images/canvas-align-elements.gif
diff --git a/docs/images/canvas-background-color-picker.gif b/docs/images/canvas-background-color-picker.gif
diff --git a/docs/images/canvas-click-drag-element.gif b/docs/images/canvas-click-drag-element.gif
diff --git a/docs/images/canvas-distribute-elements.gif b/docs/images/canvas-distribute-elements.gif
diff --git a/docs/images/canvas-download-json.gif b/docs/images/canvas-download-json.gif
diff --git a/docs/images/canvas-ecommerce.png b/docs/images/canvas-ecommerce.png
diff --git a/docs/images/canvas-element-order.gif b/docs/images/canvas-element-order.gif
diff --git a/docs/images/canvas-embed_workpad.gif b/docs/images/canvas-embed_workpad.gif
diff --git a/docs/images/canvas-fullscreen.gif b/docs/images/canvas-fullscreen.gif
diff --git a/docs/images/canvas-move-pixel.gif b/docs/images/canvas-move-pixel.gif
diff --git a/docs/images/canvas-resize-element.gif b/docs/images/canvas-resize-element.gif
diff --git a/docs/images/canvas-zoom.gif b/docs/images/canvas-zoom.gif
diff --git a/docs/images/canvas_create_image.png b/docs/images/canvas_create_image.png
diff --git a/docs/images/canvas_map-time-filter.gif b/docs/images/canvas_map-time-filter.gif
diff --git a/docs/images/canvas_share_autoplay_480.gif b/docs/images/canvas_share_autoplay_480.gif
diff --git a/docs/images/canvas_share_hidetoolbar_480.gif b/docs/images/canvas_share_hidetoolbar_480.gif
diff --git a/docs/images/canvas_workpad_3_page.png b/docs/images/canvas_workpad_3_page.png
diff --git a/docs/images/canvas_workpad_edit_style.png b/docs/images/canvas_workpad_edit_style.png
diff --git a/docs/images/canvas_workpad_weblog.png b/docs/images/canvas_workpad_weblog.png
diff --git a/docs/images/controls/controls_options.png b/docs/images/controls/controls_options.png
diff --git a/docs/images/controls/dropdown_control_editor.png b/docs/images/controls/dropdown_control_editor.png
diff --git a/docs/images/controls/range_slider_editor.png b/docs/images/controls/range_slider_editor.png
diff --git a/docs/images/discover-compass.png b/docs/images/discover-compass.png
diff --git a/docs/images/edit_filter_query.png b/docs/images/edit_filter_query.png
diff --git a/docs/images/filter-actions.png b/docs/images/filter-actions.png
diff --git a/docs/images/filter-allbuttons.png b/docs/images/filter-allbuttons.png
diff --git a/docs/images/filter-sample.png b/docs/images/filter-sample.png
diff --git a/docs/images/goal.png b/docs/images/goal.png
diff --git a/docs/images/history.png b/docs/images/history.png
diff --git a/docs/images/labelbutton.png b/docs/images/labelbutton.png
diff --git a/docs/images/lens_remove_layer.png b/docs/images/lens_remove_layer.png
diff --git a/docs/images/management-index-management.png b/docs/images/management-index-management.png
diff --git a/docs/images/management-upgrade-assistant-8.0.png b/docs/images/management-upgrade-assistant-8.0.png
diff --git a/docs/images/management-watcher-buttons.png b/docs/images/management-watcher-buttons.png
diff --git a/docs/images/management_rolled_dashboard.png b/docs/images/management_rolled_dashboard.png
diff --git a/docs/images/management_rollups_visualization.png b/docs/images/management_rollups_visualization.png
diff --git a/docs/images/markdown-example.png b/docs/images/markdown-example.png
diff --git a/docs/images/multiple_requests.png b/docs/images/multiple_requests.png
diff --git a/docs/images/regionmap.png b/docs/images/regionmap.png
diff --git a/docs/images/search-button.jpg b/docs/images/search-button.jpg
diff --git a/docs/images/security_base_all.png b/docs/images/security_base_all.png
diff --git a/docs/images/share-short-link.png b/docs/images/share-short-link.png
diff --git a/docs/images/time-filter-absolute.jpg b/docs/images/time-filter-absolute.jpg
diff --git a/docs/images/time-filter-relative.jpg b/docs/images/time-filter-relative.jpg
diff --git a/docs/images/time-filter.jpg b/docs/images/time-filter.jpg
diff --git a/docs/images/time-picker-step.jpg b/docs/images/time-picker-step.jpg
diff --git a/docs/images/time-picker.jpg b/docs/images/time-picker.jpg
diff --git a/docs/images/timelion-arg-help.jpg b/docs/images/timelion-arg-help.jpg
diff --git a/docs/images/timelion-read-only-badge.png b/docs/images/timelion-read-only-badge.png
diff --git a/docs/images/timelion-save01.png b/docs/images/timelion-save01.png
diff --git a/docs/images/timelion-save02.png b/docs/images/timelion-save02.png
diff --git a/docs/images/tsvb-annotations.png b/docs/images/tsvb-annotations.png
diff --git a/docs/images/tsvb-data-tab-derivative-example.png b/docs/images/tsvb-data-tab-derivative-example.png
diff --git a/docs/images/tsvb-data-tab-label.png b/docs/images/tsvb-data-tab-label.png
diff --git a/docs/images/tsvb-data-tab-series-options-time-series.png b/docs/images/tsvb-data-tab-series-options-time-series.png
diff --git a/docs/images/tsvb-data-tab-series-options.png b/docs/images/tsvb-data-tab-series-options.png
diff --git a/docs/images/tutorial-full-inspect2.png b/docs/images/tutorial-full-inspect2.png
diff --git a/docs/images/tutorial-sample-discover-2.png b/docs/images/tutorial-sample-discover-2.png
diff --git a/docs/images/tutorial-sample-inspect2.png b/docs/images/tutorial-sample-inspect2.png
diff --git a/docs/images/tutorial-visualize-pie-1.png b/docs/images/tutorial-visualize-pie-1.png
diff --git a/docs/images/visualize-flow.png b/docs/images/visualize-flow.png
diff --git a/docs/images/visualize-icon.png b/docs/images/visualize-icon.png
diff --git a/docs/images/visualize_coordinate_map_example.png b/docs/images/visualize_coordinate_map_example.png
diff --git a/docs/images/visualize_region_map_example.png b/docs/images/visualize_region_map_example.png
diff --git a/docs/images/viz-fit-bounds.png b/docs/images/viz-fit-bounds.png
diff --git a/docs/images/viz-lat-long-filter.png b/docs/images/viz-lat-long-filter.png
diff --git a/docs/images/viz-zoom.png b/docs/images/viz-zoom.png
diff --git a/docs/images/follower_indices.png → ...ment/alerting/images/follower_indices.png b/docs/images/follower_indices.png → ...ment/alerting/images/follower_indices.png
diff --git a/docs/images/actions_icon.png → docs/management/images/actions_icon.png b/docs/images/actions_icon.png → docs/management/images/actions_icon.png
diff --git a/docs/images/add_remote_cluster.png → .../management/images/add_remote_cluster.png b/docs/images/add_remote_cluster.png → .../management/images/add_remote_cluster.png
diff --git a/docs/images/auto_follow_pattern.png → ...management/images/auto_follow_pattern.png b/docs/images/auto_follow_pattern.png → ...management/images/auto_follow_pattern.png
diff --git a/docs/images/colorformatter.png → docs/management/images/colorformatter.png b/docs/images/colorformatter.png → docs/management/images/colorformatter.png
diff --git a/...s/cross-cluster-replication-list-view.png → ...s/cross-cluster-replication-list-view.png b/...s/cross-cluster-replication-list-view.png → ...s/cross-cluster-replication-list-view.png
diff --git a/...mages/index-lifecycle-policies-create.png → ...mages/index-lifecycle-policies-create.png b/...mages/index-lifecycle-policies-create.png → ...mages/index-lifecycle-policies-create.png
diff --git a/...ages/index_lifecycle_policies_options.png → ...ages/index_lifecycle_policies_options.png b/...ages/index_lifecycle_policies_options.png → ...ages/index_lifecycle_policies_options.png
diff --git a/docs/images/index_management_add_policy.png → ...nt/images/index_management_add_policy.png b/docs/images/index_management_add_policy.png → ...nt/images/index_management_add_policy.png
diff --git a/...es/management-create-rollup-bar-chart.png → ...es/management-create-rollup-bar-chart.png b/...es/management-create-rollup-bar-chart.png → ...es/management-create-rollup-bar-chart.png
diff --git a/docs/images/management-index-patterns.png → ...ment/images/management-index-patterns.png b/docs/images/management-index-patterns.png → ...ment/images/management-index-patterns.png
diff --git a/...ages/management-index-read-only-badge.png → ...ages/management-index-read-only-badge.png b/...ages/management-index-read-only-badge.png → ...ages/management-index-read-only-badge.png
diff --git a/...s/management-index-templates-mappings.png → ...s/management-index-templates-mappings.png b/...s/management-index-templates-mappings.png → ...s/management-index-templates-mappings.png
diff --git a/docs/images/management-index-templates.png → ...ent/images/management-index-templates.png b/docs/images/management-index-templates.png → ...ent/images/management-index-templates.png
diff --git a/docs/images/management-license.png → .../management/images/management-license.png b/docs/images/management-license.png → .../management/images/management-license.png
diff --git a/...mages/management-rollup-index-pattern.png → ...mages/management-rollup-index-pattern.png b/...mages/management-rollup-index-pattern.png → ...mages/management-rollup-index-pattern.png
diff --git a/docs/images/management-saved-objects.png → ...ement/images/management-saved-objects.png b/docs/images/management-saved-objects.png → ...ement/images/management-saved-objects.png
diff --git a/...ages/management-upgrade-assistant-9.0.png → ...ages/management-upgrade-assistant-9.0.png b/...ages/management-upgrade-assistant-9.0.png → ...ages/management-upgrade-assistant-9.0.png
diff --git a/docs/images/management_create_rollup_job.png → ...t/images/management_create_rollup_job.png b/docs/images/management_create_rollup_job.png → ...t/images/management_create_rollup_job.png
diff --git a/.../images/management_create_rollup_menu.png → .../images/management_create_rollup_menu.png b/.../images/management_create_rollup_menu.png → .../images/management_create_rollup_menu.png
diff --git a/...images/management_index_create_wizard.png → ...images/management_index_create_wizard.png b/...images/management_index_create_wizard.png → ...images/management_index_create_wizard.png
diff --git a/docs/images/management_index_details.png → ...ement/images/management_index_details.png b/docs/images/management_index_details.png → ...ement/images/management_index_details.png
diff --git a/docs/images/management_index_labels.png → ...gement/images/management_index_labels.png b/docs/images/management_index_labels.png → ...gement/images/management_index_labels.png
diff --git a/...mages/management_rollup_job_dashboard.png → ...mages/management_rollup_job_dashboard.png b/...mages/management_rollup_job_dashboard.png → ...mages/management_rollup_job_dashboard.png
diff --git a/.../images/management_rollup_job_details.png → .../images/management_rollup_job_details.png b/.../images/management_rollup_job_details.png → .../images/management_rollup_job_details.png
diff --git a/docs/images/management_rollup_job_vis.png → ...ment/images/management_rollup_job_vis.png b/docs/images/management_rollup_job_vis.png → ...ment/images/management_rollup_job_vis.png
diff --git a/docs/images/management_rollup_list.png → ...agement/images/management_rollup_list.png b/docs/images/management_rollup_list.png → ...agement/images/management_rollup_list.png
diff --git a/docs/images/remote-clusters-list-view.png → ...ment/images/remote-clusters-list-view.png b/docs/images/remote-clusters-list-view.png → ...ment/images/remote-clusters-list-view.png
diff --git a/docs/images/settings-read-only-badge.png → ...ement/images/settings-read-only-badge.png b/docs/images/settings-read-only-badge.png → ...ement/images/settings-read-only-badge.png
diff --git a/docs/images/tutorial-ilm-custom-policy.png → ...ent/images/tutorial-ilm-custom-policy.png b/docs/images/tutorial-ilm-custom-policy.png → ...ent/images/tutorial-ilm-custom-policy.png
diff --git a/...es/tutorial-ilm-delete-phase-creation.png → ...es/tutorial-ilm-delete-phase-creation.png b/...es/tutorial-ilm-delete-phase-creation.png → ...es/tutorial-ilm-delete-phase-creation.png
diff --git a/docs/images/tutorial-ilm-delete-rollover.png → ...t/images/tutorial-ilm-delete-rollover.png b/docs/images/tutorial-ilm-delete-rollover.png → ...t/images/tutorial-ilm-delete-rollover.png
diff --git a/...tutorial-ilm-hotphaserollover-default.png → ...tutorial-ilm-hotphaserollover-default.png b/...tutorial-ilm-hotphaserollover-default.png → ...tutorial-ilm-hotphaserollover-default.png
diff --git a/...lm-modify-default-warm-phase-rollover.png → ...lm-modify-default-warm-phase-rollover.png b/...lm-modify-default-warm-phase-rollover.png → ...lm-modify-default-warm-phase-rollover.png
diff --git a/docs/images/add-data-fv.png → docs/setup/images/add-data-fv.png b/docs/images/add-data-fv.png → docs/setup/images/add-data-fv.png
diff --git a/docs/images/add-data-tutorials.png → docs/setup/images/add-data-tutorials.png b/docs/images/add-data-tutorials.png → docs/setup/images/add-data-tutorials.png
diff --git a/docs/images/data-viz-homepage.jpg → docs/setup/images/data-viz-homepage.jpg b/docs/images/data-viz-homepage.jpg → docs/setup/images/data-viz-homepage.jpg
diff --git a/docs/images/kibana-status-page-7_5_0.png → ...setup/images/kibana-status-page-7_5_0.png b/docs/images/kibana-status-page-7_5_0.png → ...setup/images/kibana-status-page-7_5_0.png
diff --git a/docs/user/alerting/action-types/pagerduty.asciidoc b/docs/user/alerting/action-types/pagerduty.asciidoc
@@ -68,11 +68,11 @@ Then, select the *Integrations* tab and click the *New Integration* button.
 * If you are creating a new service for your integration,
 go to
 https://support.pagerduty.com/docs/services-and-integrations#section-configuring-services-and-integrations[Configuring Services and Integrations]
-and follow the steps outlined in the *Create a New Service* section, selecting *Elastic* as the *Integration Type* in step 4.
+and follow the steps outlined in the *Create a New Service* section, selecting *Elastic Alerts* as the *Integration Type* in step 4.
 Continue with the <<pagerduty-in-elastic, In Elastic>> section once you have finished these steps.
 
 . Enter an *Integration Name* in the format Elastic-service-name (for example, Elastic-Alerting or Kibana-APM-Alerting)
-and select Elastic from the *Integration Type* menu.
+and select *Elastic Alerts* from the *Integration Type* menu.
 . Click *Add Integration* to save your new integration.
 +
 You will be redirected to the *Integrations* tab for your service. An Integration Key is generated on this screen.

diff --git a/...mages/Dashboard_add_new_visualization.png → ...mages/Dashboard_add_new_visualization.png b/...mages/Dashboard_add_new_visualization.png → ...mages/Dashboard_add_new_visualization.png
diff --git a/docs/images/Dashboard_add_visualization.png → ...rd/images/Dashboard_add_visualization.png b/docs/images/Dashboard_add_visualization.png → ...rd/images/Dashboard_add_visualization.png
diff --git a/docs/images/Dashboard_example.png → ...er/dashboard/images/Dashboard_example.png b/docs/images/Dashboard_example.png → ...er/dashboard/images/Dashboard_example.png
diff --git a/docs/images/Dashboard_inspect.png → ...er/dashboard/images/Dashboard_inspect.png b/docs/images/Dashboard_inspect.png → ...er/dashboard/images/Dashboard_inspect.png
diff --git a/docs/images/clone_panel.gif → docs/user/dashboard/images/clone_panel.gif b/docs/images/clone_panel.gif → docs/user/dashboard/images/clone_panel.gif
diff --git a/docs/images/dashboard-read-only-badge.png → ...oard/images/dashboard-read-only-badge.png b/docs/images/dashboard-read-only-badge.png → ...oard/images/dashboard-read-only-badge.png
diff --git a/docs/images/time_range_per_panel.gif → ...dashboard/images/time_range_per_panel.gif b/docs/images/time_range_per_panel.gif → ...dashboard/images/time_range_per_panel.gif
diff --git a/docs/images/intro-dashboard.png → ...r/introduction/images/intro-dashboard.png b/docs/images/intro-dashboard.png → ...r/introduction/images/intro-dashboard.png
diff --git a/docs/images/intro-data-tutorial.png → ...troduction/images/intro-data-tutorial.png b/docs/images/intro-data-tutorial.png → ...troduction/images/intro-data-tutorial.png
diff --git a/docs/images/intro-discover.png → ...er/introduction/images/intro-discover.png b/docs/images/intro-discover.png → ...er/introduction/images/intro-discover.png
diff --git a/docs/images/intro-kibana.png → ...user/introduction/images/intro-kibana.png b/docs/images/intro-kibana.png → ...user/introduction/images/intro-kibana.png
diff --git a/docs/images/intro-management.png → .../introduction/images/intro-management.png b/docs/images/intro-management.png → .../introduction/images/intro-management.png
diff --git a/docs/images/intro-spaces.jpg → ...user/introduction/images/intro-spaces.jpg b/docs/images/intro-spaces.jpg → ...user/introduction/images/intro-spaces.jpg
diff --git a/docs/images/monitoring-dashboard.png → ...onitoring/images/monitoring-dashboard.png b/docs/images/monitoring-dashboard.png → ...onitoring/images/monitoring-dashboard.png
diff --git a/docs/images/report-automate-csv.png → .../reporting/images/report-automate-csv.png b/docs/images/report-automate-csv.png → .../reporting/images/report-automate-csv.png
diff --git a/docs/images/report-automate-pdf.png → .../reporting/images/report-automate-pdf.png b/docs/images/report-automate-pdf.png → .../reporting/images/report-automate-pdf.png
diff --git a/docs/images/add-bucket.png → docs/visualize/images/add-bucket.png b/docs/images/add-bucket.png → docs/visualize/images/add-bucket.png
diff --git a/docs/images/apply-changes-button.png → ...visualize/images/apply-changes-button.png b/docs/images/apply-changes-button.png → ...visualize/images/apply-changes-button.png
diff --git a/docs/images/color-picker.png → docs/visualize/images/color-picker.png b/docs/images/color-picker.png → docs/visualize/images/color-picker.png
diff --git a/docs/images/dashboard-controls.png → docs/visualize/images/dashboard-controls.png b/docs/images/dashboard-controls.png → docs/visualize/images/dashboard-controls.png
diff --git a/docs/images/gauge.png → docs/visualize/images/gauge.png b/docs/images/gauge.png → docs/visualize/images/gauge.png
diff --git a/docs/images/lens_data_info.png → docs/visualize/images/lens_data_info.png b/docs/images/lens_data_info.png → docs/visualize/images/lens_data_info.png
diff --git a/docs/images/lens_drag_drop.gif → docs/visualize/images/lens_drag_drop.gif b/docs/images/lens_drag_drop.gif → docs/visualize/images/lens_drag_drop.gif
diff --git a/docs/images/lens_suggestions.gif → docs/visualize/images/lens_suggestions.gif b/docs/images/lens_suggestions.gif → docs/visualize/images/lens_suggestions.gif
diff --git a/docs/images/lens_tutorial_1.png → docs/visualize/images/lens_tutorial_1.png b/docs/images/lens_tutorial_1.png → docs/visualize/images/lens_tutorial_1.png
diff --git a/docs/images/lens_tutorial_2.png → docs/visualize/images/lens_tutorial_2.png b/docs/images/lens_tutorial_2.png → docs/visualize/images/lens_tutorial_2.png
diff --git a/docs/images/lens_tutorial_3.png → docs/visualize/images/lens_tutorial_3.png b/docs/images/lens_tutorial_3.png → docs/visualize/images/lens_tutorial_3.png
diff --git a/docs/images/lens_viz_types.png → docs/visualize/images/lens_viz_types.png b/docs/images/lens_viz_types.png → docs/visualize/images/lens_viz_types.png
diff --git a/docs/images/markdown_example_1.png → docs/visualize/images/markdown_example_1.png b/docs/images/markdown_example_1.png → docs/visualize/images/markdown_example_1.png
diff --git a/docs/images/markdown_example_2.png → docs/visualize/images/markdown_example_2.png b/docs/images/markdown_example_2.png → docs/visualize/images/markdown_example_2.png
diff --git a/docs/images/markdown_example_3.png → docs/visualize/images/markdown_example_3.png b/docs/images/markdown_example_3.png → docs/visualize/images/markdown_example_3.png
diff --git a/docs/images/markdown_example_4.png → docs/visualize/images/markdown_example_4.png b/docs/images/markdown_example_4.png → docs/visualize/images/markdown_example_4.png
diff --git a/docs/images/timelion-conditional01.png → ...sualize/images/timelion-conditional01.png b/docs/images/timelion-conditional01.png → ...sualize/images/timelion-conditional01.png
diff --git a/docs/images/timelion-conditional02.png → ...sualize/images/timelion-conditional02.png b/docs/images/timelion-conditional02.png → ...sualize/images/timelion-conditional02.png
diff --git a/docs/images/timelion-conditional03.png → ...sualize/images/timelion-conditional03.png b/docs/images/timelion-conditional03.png → ...sualize/images/timelion-conditional03.png
diff --git a/docs/images/timelion-conditional04.png → ...sualize/images/timelion-conditional04.png b/docs/images/timelion-conditional04.png → ...sualize/images/timelion-conditional04.png
diff --git a/docs/images/timelion-create01.png → docs/visualize/images/timelion-create01.png b/docs/images/timelion-create01.png → docs/visualize/images/timelion-create01.png
diff --git a/docs/images/timelion-create02.png → docs/visualize/images/timelion-create02.png b/docs/images/timelion-create02.png → docs/visualize/images/timelion-create02.png
diff --git a/docs/images/timelion-create03.png → docs/visualize/images/timelion-create03.png b/docs/images/timelion-create03.png → docs/visualize/images/timelion-create03.png
diff --git a/docs/images/timelion-customize01.png → ...visualize/images/timelion-customize01.png b/docs/images/timelion-customize01.png → ...visualize/images/timelion-customize01.png
diff --git a/docs/images/timelion-customize02.png → ...visualize/images/timelion-customize02.png b/docs/images/timelion-customize02.png → ...visualize/images/timelion-customize02.png
diff --git a/docs/images/timelion-customize03.png → ...visualize/images/timelion-customize03.png b/docs/images/timelion-customize03.png → ...visualize/images/timelion-customize03.png
diff --git a/docs/images/timelion-customize04.png → ...visualize/images/timelion-customize04.png b/docs/images/timelion-customize04.png → ...visualize/images/timelion-customize04.png
diff --git a/docs/images/timelion-math01.png → docs/visualize/images/timelion-math01.png b/docs/images/timelion-math01.png → docs/visualize/images/timelion-math01.png
diff --git a/docs/images/timelion-math02.png → docs/visualize/images/timelion-math02.png b/docs/images/timelion-math02.png → docs/visualize/images/timelion-math02.png
diff --git a/docs/images/timelion-math03.png → docs/visualize/images/timelion-math03.png b/docs/images/timelion-math03.png → docs/visualize/images/timelion-math03.png
diff --git a/docs/images/timelion-math04.png → docs/visualize/images/timelion-math04.png b/docs/images/timelion-math04.png → docs/visualize/images/timelion-math04.png
diff --git a/docs/images/timelion-math05.png → docs/visualize/images/timelion-math05.png b/docs/images/timelion-math05.png → docs/visualize/images/timelion-math05.png
diff --git a/docs/images/tsvb-gauge.png → docs/visualize/images/tsvb-gauge.png b/docs/images/tsvb-gauge.png → docs/visualize/images/tsvb-gauge.png
diff --git a/docs/images/tsvb-markdown.png → docs/visualize/images/tsvb-markdown.png b/docs/images/tsvb-markdown.png → docs/visualize/images/tsvb-markdown.png
diff --git a/docs/images/tsvb-metric.png → docs/visualize/images/tsvb-metric.png b/docs/images/tsvb-metric.png → docs/visualize/images/tsvb-metric.png
diff --git a/docs/images/tsvb-screenshot.png → docs/visualize/images/tsvb-screenshot.png b/docs/images/tsvb-screenshot.png → docs/visualize/images/tsvb-screenshot.png
diff --git a/docs/images/tsvb-table.png → docs/visualize/images/tsvb-table.png b/docs/images/tsvb-table.png → docs/visualize/images/tsvb-table.png
diff --git a/docs/images/tsvb-top-n.png → docs/visualize/images/tsvb-top-n.png b/docs/images/tsvb-top-n.png → docs/visualize/images/tsvb-top-n.png
diff --git a/docs/images/vega_lite_default.png → docs/visualize/images/vega_lite_default.png b/docs/images/vega_lite_default.png → docs/visualize/images/vega_lite_default.png
diff --git a/...ages/visualize-date-histogram-split-1.png → ...ages/visualize-date-histogram-split-1.png b/...ages/visualize-date-histogram-split-1.png → ...ages/visualize-date-histogram-split-1.png
diff --git a/...ages/visualize-date-histogram-split-2.png → ...ages/visualize-date-histogram-split-2.png b/...ages/visualize-date-histogram-split-2.png → ...ages/visualize-date-histogram-split-2.png
diff --git a/docs/images/visualize-date-histogram.png → ...alize/images/visualize-date-histogram.png b/docs/images/visualize-date-histogram.png → ...alize/images/visualize-date-histogram.png
diff --git a/docs/images/visualize-drag-reorder.png → ...sualize/images/visualize-drag-reorder.png b/docs/images/visualize-drag-reorder.png → ...sualize/images/visualize-drag-reorder.png
diff --git a/docs/images/visualize_heat_map_example.png → ...ize/images/visualize_heat_map_example.png b/docs/images/visualize_heat_map_example.png → ...ize/images/visualize_heat_map_example.png
diff --git a/src/core/server/saved_objects/mappings/types.ts b/src/core/server/saved_objects/mappings/types.ts
@@ -45,7 +45,9 @@
  * @public
  */
 export interface SavedObjectsTypeMappingDefinition {
-  /** The dynamic property of the mapping. either `false` or 'strict'. Defaults to `false` */
+  /** The dynamic property of the mapping, either `false` or `'strict'`. If
+   * unspecified `dynamic: 'strict'` will be inherited from the top-level
+   * index mappings. */
   dynamic?: false | 'strict';
   /** The underlying properties of the type mapping */
   properties: SavedObjectsMappingProperties;
@@ -134,7 +136,6 @@ export interface SavedObjectsCoreFieldMapping {
   null_value?: number | boolean | string;
   index?: boolean;
   doc_values?: boolean;
-  enabled?: boolean;
   fields?: {
     [subfield: string]: {
       type: string;
@@ -146,14 +147,19 @@ export interface SavedObjectsCoreFieldMapping {
 /**
  * See {@link SavedObjectsFieldMapping} for documentation.
  *
- * Note: this type intentially doesn't include a type definition for defining
- * the `dynamic` mapping parameter. Saved Object fields should always inherit
- * the `dynamic: 'strict'` paramater. If you are unsure of the shape of your
- * data use `type: 'object', enabled: false` instead.
- *
  * @public
  */
 export interface SavedObjectsComplexFieldMapping {
+  /**
+   * The dynamic property of the mapping, either `false` or `'strict'`. If
+   * unspecified `dynamic: 'strict'` will be inherited from the top-level
+   * index mappings.
+   *
+   * Note: To limit the number of mapping fields Saved Object types should
+   * *never* use `dynamic: true`.
+   */
+  dynamic?: false | 'strict';
+  enabled?: boolean;
   doc_values?: boolean;
   type?: string;
   properties: SavedObjectsMappingProperties;

diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -151,7 +151,7 @@ describe('IndexMigrator', () => {
     );
   });
 
-  test('retains mappings from the previous index', async () => {
+  test('retains unknown core field mappings from the previous index', async () => {
     const { callCluster } = testOpts;
 
     testOpts.mappingProperties = { foo: { type: 'text' } };
@@ -162,7 +162,7 @@ describe('IndexMigrator', () => {
           aliases: {},
           mappings: {
             properties: {
-              author: { type: 'text' },
+              unknown_core_field: { type: 'text' },
             },
           },
         },
@@ -187,7 +187,66 @@ describe('IndexMigrator', () => {
             },
           },
           properties: {
-            author: { type: 'text' },
+            unknown_core_field: { type: 'text' },
+            foo: { type: 'text' },
+            migrationVersion: { dynamic: 'true', type: 'object' },
+            namespace: { type: 'keyword' },
+            namespaces: { type: 'keyword' },
+            type: { type: 'keyword' },
+            updated_at: { type: 'date' },
+            references: {
+              type: 'nested',
+              properties: {
+                name: { type: 'keyword' },
+                type: { type: 'keyword' },
+                id: { type: 'keyword' },
+              },
+            },
+          },
+        },
+        settings: { number_of_shards: 1, auto_expand_replicas: '0-1' },
+      },
+      index: '.kibana_2',
+    });
+  });
+
+  test('disables complex field mappings from unknown types in the previous index', async () => {
+    const { callCluster } = testOpts;
+
+    testOpts.mappingProperties = { foo: { type: 'text' } };
+
+    withIndex(callCluster, {
+      index: {
+        '.kibana_1': {
+          aliases: {},
+          mappings: {
+            properties: {
+              unknown_complex_field: { properties: { description: { type: 'text' } } },
+            },
+          },
+        },
+      },
+    });
+
+    await new IndexMigrator(testOpts).migrate();
+
+    expect(callCluster).toHaveBeenCalledWith('indices.create', {
+      body: {
+        mappings: {
+          dynamic: 'strict',
+          _meta: {
+            migrationMappingPropertyHashes: {
+              foo: '625b32086eb1d1203564cf85062dd22e',
+              migrationVersion: '4a1746014a75ade3a714e1db5763276f',
+              namespace: '2f4316de49999235636386fe51dc06c1',
+              namespaces: '2f4316de49999235636386fe51dc06c1',
+              references: '7997cf5a56cc02bdc9c93361bde732b0',
+              type: '2f4316de49999235636386fe51dc06c1',
+              updated_at: '00da57df13e94e9d98437d13ace4bfe0',
+            },
+          },
+          properties: {
+            unknown_complex_field: { dynamic: false, properties: {} },
             foo: { type: 'text' },
             migrationVersion: { dynamic: 'true', type: 'object' },
             namespace: { type: 'keyword' },

diff --git a/src/core/server/saved_objects/migrations/core/migration_context.test.ts b/src/core/server/saved_objects/migrations/core/migration_context.test.ts
@@ -0,0 +1,88 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { disableUnknownTypeMappingFields } from './migration_context';
+
+describe('disableUnknownTypeMappingFields', () => {
+  const sourceMappings = {
+    _meta: {
+      migrationMappingPropertyHashes: {
+        unknown_type: 'md5hash',
+        unknown_core_field: 'md5hash',
+        known_type: 'oldmd5hash',
+      },
+    },
+    properties: {
+      unknown_type: {
+        properties: {
+          unused_field: { type: 'text' },
+        },
+      },
+      unknown_core_field: { type: 'keyword' },
+      known_type: {
+        properties: {
+          field_1: { type: 'text' },
+          old_field: { type: 'boolean' },
+        },
+      },
+    },
+  };
+  const activeMappings = {
+    _meta: {
+      migrationMappingPropertyHashes: {
+        known_type: 'md5hash',
+      },
+    },
+    properties: {
+      known_type: {
+        properties: {
+          new_field: { type: 'binary' },
+          field_1: { type: 'keyword' },
+        },
+      },
+    },
+  };
+  const targetMappings = disableUnknownTypeMappingFields(activeMappings, sourceMappings);
+
+  it('disables complex field mappings from unknown types in the source mappings', () => {
+    expect(targetMappings.properties.unknown_type).toEqual({ dynamic: false, properties: {} });
+  });
+
+  it('retains unknown core field mappings from the source mappings', () => {
+    expect(targetMappings.properties.unknown_core_field).toEqual({ type: 'keyword' });
+  });
+
+  it('overrides source mappings with known types from active mappings', () => {
+    expect(targetMappings.properties.known_type).toEqual({
+      properties: {
+        new_field: { type: 'binary' },
+        field_1: { type: 'keyword' }, // was type text in source mappings
+        // old_field was present in source but ommited in active mappings
+      },
+    });
+  });
+
+  it('retains the active mappings _meta ignoring any _meta fields in the source mappings', () => {
+    expect(targetMappings._meta).toEqual({
+      migrationMappingPropertyHashes: {
+        known_type: 'md5hash',
+      },
+    });
+  });
+});