Merge branch 'master' into apm.links

elastic · Sep 6, 2021 · 3add51b · 3add51b
2 parents b35b4e5 + 4416a31
commit 3add51b
Show file tree

Hide file tree

Showing 847 changed files with 14,715 additions and 6,937 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -16,22 +16,23 @@
 /src/plugins/discover/ @elastic/kibana-data-discovery
 /x-pack/plugins/discover_enhanced/ @elastic/kibana-data-discovery
 /test/functional/apps/discover/ @elastic/kibana-data-discovery
+/x-pack/plugins/graph/ @elastic/kibana-data-discovery
+/x-pack/test/functional/apps/graph @elastic/kibana-data-discovery
 
 # Vis Editors
 /x-pack/plugins/lens/ @elastic/kibana-vis-editors
-/x-pack/plugins/graph/ @elastic/kibana-vis-editors
 /src/plugins/advanced_settings/ @elastic/kibana-vis-editors
 /src/plugins/charts/ @elastic/kibana-vis-editors
 /src/plugins/management/ @elastic/kibana-vis-editors
 /src/plugins/kibana_legacy/ @elastic/kibana-vis-editors
 /src/plugins/timelion/ @elastic/kibana-vis-editors
 /src/plugins/vis_default_editor/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_metric/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/metric/ @elastic/kibana-vis-editors
 /src/plugins/vis_type_table/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_tagcloud/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/tagcloud/ @elastic/kibana-vis-editors
 /src/plugins/vis_type_timelion/ @elastic/kibana-vis-editors
 /src/plugins/vis_type_timeseries/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_vega/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/vega/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/vislib/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/xy/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/pie/ @elastic/kibana-vis-editors

diff --git a/.github/workflows/sync-main-branch.yml b/.github/workflows/sync-main-branch.yml
@@ -9,6 +9,7 @@ jobs:
   sync_latest_from_upstream:
     runs-on: ubuntu-latest
     name: Sync latest commits from master branch
+    if: github.repository == 'elastic/kibana'
 
     steps:
       - name: Checkout target repo

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -60,11 +60,11 @@
     "uiActions": "src/plugins/ui_actions",
     "visDefaultEditor": "src/plugins/vis_default_editor",
     "visTypeMarkdown": "src/plugins/vis_type_markdown",
-    "visTypeMetric": "src/plugins/vis_type_metric",
+    "visTypeMetric": "src/plugins/vis_types/metric",
     "visTypeTable": "src/plugins/vis_type_table",
-    "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
+    "visTypeTagCloud": "src/plugins/vis_types/tagcloud",
     "visTypeTimeseries": "src/plugins/vis_type_timeseries",
-    "visTypeVega": "src/plugins/vis_type_vega",
+    "visTypeVega": "src/plugins/vis_types/vega",
     "visTypeVislib": "src/plugins/vis_types/vislib",
     "visTypeXy": "src/plugins/vis_types/xy",
     "visTypePie": "src/plugins/vis_types/pie",

diff --git a/api_docs/core.json b/api_docs/core.json
@@ -1125,7 +1125,7 @@
             "references": [
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/public/plugin.ts"
+                "path": "src/plugins/vis_types/vega/public/plugin.ts"
               }
             ]
           },
@@ -1423,15 +1423,15 @@
               },
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/public/data_model/search_api.ts"
+                "path": "src/plugins/vis_types/vega/public/data_model/search_api.ts"
               },
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/public/plugin.ts"
+                "path": "src/plugins/vis_types/vega/public/plugin.ts"
               },
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/target/types/public/data_model/search_api.d.ts"
+                "path": "src/plugins/vis_types/vega/target/types/public/data_model/search_api.d.ts"
               }
             ]
           }

diff --git a/api_docs/data.json b/api_docs/data.json
@@ -16157,11 +16157,11 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "dashboard",
@@ -20282,15 +20282,15 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           }
         ],
         "children": [
@@ -22396,7 +22396,7 @@
             },
             {
               "plugin": "visTypeMetric",
-              "path": "src/plugins/vis_type_metric/public/plugin.ts"
+              "path": "src/plugins/vis_types/metric/public/plugin.ts"
             },
             {
               "plugin": "visTypeTable",
@@ -30417,11 +30417,11 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "dashboard",
@@ -36898,11 +36898,11 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "dashboard",

diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
@@ -679,7 +679,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_metric/public/plugin.ts#:~:text=fieldFormats) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/metric/public/plugin.ts#:~:text=fieldFormats) | - |
 
 
 
@@ -738,12 +738,12 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.esQuery" text="esQuery"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibCorePluginApi" section="def-public.CoreSetup.injectedMetadata" text="injectedMetadata"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/plugin.ts#:~:text=injectedMetadata) | - |
-| <DocLink id="kibCorePluginApi" section="def-public.CoreStart.injectedMetadata" text="injectedMetadata"/> | [search_api.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/data_model/search_api.ts#:~:text=injectedMetadata), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/plugin.ts#:~:text=injectedMetadata), [search_api.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/target/types/public/data_model/search_api.d.ts#:~:text=injectedMetadata) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.esQuery" text="esQuery"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery) | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
+| <DocLink id="kibCorePluginApi" section="def-public.CoreSetup.injectedMetadata" text="injectedMetadata"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/plugin.ts#:~:text=injectedMetadata) | - |
+| <DocLink id="kibCorePluginApi" section="def-public.CoreStart.injectedMetadata" text="injectedMetadata"/> | [search_api.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/data_model/search_api.ts#:~:text=injectedMetadata), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/plugin.ts#:~:text=injectedMetadata), [search_api.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/target/types/public/data_model/search_api.d.ts#:~:text=injectedMetadata) | - |
 
 
 

diff --git a/api_docs/vis_type_vega.json b/api_docs/vis_type_vega.json
@@ -22,7 +22,7 @@
       "tags": [],
       "label": "VisTypeVegaPluginStart",
       "description": [],
-      "path": "src/plugins/vis_type_vega/server/types.ts",
+      "path": "src/plugins/vis_types/vega/server/types.ts",
       "deprecated": false,
       "children": [],
       "lifecycle": "start",
@@ -35,7 +35,7 @@
       "tags": [],
       "label": "VisTypeVegaPluginSetup",
       "description": [],
-      "path": "src/plugins/vis_type_vega/server/types.ts",
+      "path": "src/plugins/vis_types/vega/server/types.ts",
       "deprecated": false,
       "children": [],
       "lifecycle": "setup",

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -286,7 +286,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |The markdown visualization that can be used to place text panels on dashboards.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_metric[visTypeMetric]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/metric[visTypeMetric]
 |WARNING: Missing README.
 
 
@@ -298,7 +298,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |Contains the data table visualization, that allows presenting data in a simple table format.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_tagcloud[visTypeTagcloud]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/tagcloud[visTypeTagcloud]
 |WARNING: Missing README.
 
 
@@ -310,7 +310,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_vega[visTypeVega]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/vega[visTypeVega]
 |WARNING: Missing README.
 
 
@@ -350,7 +350,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/apm/readme.md[apm]
-|To access an elasticsearch instance that has live data you have two options:
+|Local setup documentation
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/banners/README.md[banners]

diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md b/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md
@@ -31,10 +31,10 @@ async function getDeprecations({ esClient, savedObjectsClient }: GetDeprecations
     // Example of a manual correctiveAction
     deprecations.push({
       title: i18n.translate('xpack.timelion.deprecations.worksheetsTitle', {
-        defaultMessage: 'Found Timelion worksheets.'
+        defaultMessage: 'Timelion worksheets are deprecated'
       }),
       message: i18n.translate('xpack.timelion.deprecations.worksheetsMessage', {
-        defaultMessage: 'You have {count} Timelion worksheets. The Timelion app will be removed in 8.0. To continue using your Timelion worksheets, migrate them to a dashboard.',
+        defaultMessage: 'You have {count} Timelion worksheets. Migrate your Timelion worksheets to a dashboard to continue using them.',
         values: { count },
       }),
       documentationUrl:

diff --git a/docs/discover/images/add-field-to-pattern.png b/docs/discover/images/add-field-to-pattern.png
diff --git a/docs/discover/images/customer.png b/docs/discover/images/customer.png
diff --git a/docs/discover/images/discover-from-visualize.png b/docs/discover/images/discover-from-visualize.png
diff --git a/docs/discover/images/discover-search-for-relevance.png b/docs/discover/images/discover-search-for-relevance.png
diff --git a/docs/discover/images/document-table-expanded.png b/docs/discover/images/document-table-expanded.png
diff --git a/docs/discover/images/document-table.png b/docs/discover/images/document-table.png
diff --git a/docs/discover/images/double-arrow.png b/docs/discover/images/double-arrow.png
diff --git a/docs/discover/images/downward-arrow.png b/docs/discover/images/downward-arrow.png
diff --git a/docs/discover/images/hello-field.png b/docs/discover/images/hello-field.png
diff --git a/docs/discover/search-for-relevance.asciidoc b/docs/discover/search-for-relevance.asciidoc
@@ -1,6 +1,5 @@
 [[discover-search-for-relevance]]
 == Search for relevance
-Sometimes you might be unsure which documents best match your search.
 {es} assigns a relevancy, or score to each document, so you can
 can narrow your search to the documents with the most relevant results.
 The higher the score, the better it matches your query.
@@ -12,25 +11,23 @@ the <<gs-get-data-into-kibana, sample flights data set>>, or you can use your ow
 .  In *Discover*, open the index pattern dropdown, and select that data you want to work with.
 +
 For the sample flights data, set the index pattern to *kibana_sample_data_flights*.
-.  In the query bar, click  *KQL*, and then turn it off.
-+
-You're now using the <<lucene-query, Lucene query syntax>>.
+
 .  Run your search.  For the sample data, try:
 +
 ```ts
 Warsaw OR Venice OR Clear
 ```
 . If you don't see any results, expand the <<set-time-filter,time range>>, for example to *Last 7 days*.
 . From the list of *Available fields*, add `_score` and any other fields you want to the document table.
-. To sort the `_score` column in descending order, hover over its header, and then click twice on
-the arrow icon
-image:images/double-arrow.png[Double arrow icon to indicate sorting] so it changes to
+. To sort the `_score` column in descending order, hover over its header, and set
+the sort icon to
 image:images/downward-arrow.png[Downward pointing arrow to indicate descending sorting].
 +
 At this point, you're doing a multi-column sort: first by `Time`, and then by `_score`.
-. To turn off sorting for the `Time` field, hover over its header, and then click the down arrow.
+. To turn off sorting for the `Time` field, hover over its header, and set the sort icon to
+image:images/double-arrow.png[Arrow on both ends of the icon indicates sorting is off].
 +
 Your table now sorts documents from most to least relevant.
 +
 [role="screenshot"]
-image::images/discover-search-for-relevance.png["Example of a search for relevance"]
+image::images/discover-search-for-relevance.png["Documents are sorted from most relevant to least relevant."]
diff --git a/docs/management/connectors/action-types/email.asciidoc b/docs/management/connectors/action-types/email.asciidoc
@@ -51,7 +51,7 @@ Use the <<action-settings, Action configuration settings>> to customize connecto
 
 Config defines information for the connector type.
 
-`service`:: The name of a https://nodemailer.com/smtp/well-known/[well-known email service provider]. If `service` is provided, `host`, `port`, and `secure` properties are ignored. For more information on the `gmail` service value, see the https://nodemailer.com/usage/using-gmail/[Nodemailer Gmail documentation].
+`service`:: The name of the email service. If `service` is `elastic_cloud` (for Elastic Cloud notifications) or one of Nodemailer's https://nodemailer.com/smtp/well-known/[well-known email service providers], `host`, `port`, and `secure` properties are ignored. If `service` is `other`, `host` and `port` properties must be defined. For more information on the `gmail` service value, see the https://nodemailer.com/usage/using-gmail/[Nodemailer Gmail documentation].
 `from`:: An email address that corresponds to *Sender*.
 `host`:: A string that corresponds to *Host*.
 `port`:: A number that corresponds to *Port*.
@@ -107,7 +107,7 @@ For other email servers, you can check the list of well-known services that Node
 [[elasticcloud]]
 ==== Sending email from Elastic Cloud
 
-IMPORTANT: These instructions require you to link:{cloud}/ec-watcher.html#ec-watcher-whitelist[whitelist] the email addresses that notifications get sent first.
+IMPORTANT: These instructions require you to link:{cloud}/ec-watcher.html#ec-watcher-whitelist[allowlist] the email addresses that notifications get sent.
 
 Use the following connector settings to send email from Elastic Cloud: