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

elastic · Sep 3, 2021 · 0f49323 · 0f49323
2 parents 19a2903 + c13f6ad
commit 0f49323
Show file tree

Hide file tree

Showing 284 changed files with 3,575 additions and 2,636 deletions.
diff --git a/.i18nrc.json b/.i18nrc.json
@@ -62,11 +62,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
@@ -16235,11 +16235,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",
@@ -20354,15 +20354,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": [
@@ -22474,7 +22474,7 @@
             },
             {
               "plugin": "visTypeMetric",
-              "path": "src/plugins/vis_type_metric/public/plugin.ts"
+              "path": "src/plugins/vis_types/metric/public/plugin.ts"
             },
             {
               "plugin": "visTypeTable",
@@ -30651,11 +30651,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",
@@ -37100,11 +37100,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
@@ -709,7 +709,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) | - |
 
 
 
@@ -768,12 +768,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/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
@@ -67,6 +67,58 @@ Review important information about the {kib} 7.x releases.
 
 For information about the 7.14.1 release, review the following information.
 
+[float]
+[[security-updates-v7.14.1]]
+=== Security updates
+Review the security updates that were found in previous versions of {kib}.
+[discrete]
+[[code-execution-issue]]
+.Code execution issue
+[%collapsible]
+====
+*Details* +
+In {kib} 7.10.2 to 7.14.0, users with Fleet admin privileges could insecurely upload malicious packages. Due to an older version of the js-yaml library, attackers were able to execute commands on the {kib} server. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22150[CVE-2021-22150]
+*Solution* +
+Upgrade to {kib} 7.14.1.
+====    
+[discrete]
+[[path-traversal-issue]]
+.Path traversal issue
+[%collapsible]
+====
+*Details* +
+In {kib} 7.13.4 and earlier, {kib} was not validating the user supplied paths that upload .pbf files, allowing malicious users to arbitrarily traverse the {kib} host to load internal files that end in the .pbf extension. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22151[CVE-2021-22151]
+Thanks to Luat Nguyen of CyberJutsu for reporting this issue.
+*Solution* +
+Upgrade to {kib} 7.14.1.
+====    
+[discrete]
+[[html-injection-issue]]
+.HTML injection issue
+[%collapsible]
+====
+*Details* +
+In {kib} 7.14.0, {kib} was not sanitizing document fields that contain HTML snippets, allowing attackers with the ability to write documents to an {es} index to inject HTML. When *Discover* highlighted a search term that contained the HTML, the term was rendered. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-37936[CVE-2021-37936]
+*Solution* +
+In <<advanced-options,*Advanced Settings*>>, set `doc_table:highlight` to `false`. If you do not want to change the *Advanced Settings*, upgrade to {kib} 7.14.1.
+====    
+[discrete]
+[[nodejs-security-vulnerabilities]]
+.Node.js security vulnerabilities
+[%collapsible]
+====
+*Details* +
+In {kib} 7.14.0 and earlier, Node.js 14.17.3 is affected by the following security vulnerabilities: 
+* https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22930[CVE-2021-22930]
+* https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3672[CVE-2021-3672]
+* https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22931[CVE-2021-22931]
+* https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22930[CVE-2021-22930]
+* https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22939[CVE-2021-22939]
+We do not believe an attacker can exploit the security vulnerabilities against {kib}, but are upgrading Node.js out of an abudance of caution. To resolve the security vulnerabilities, {kib} 7.14.1 upgrades Node.js to 14.17.5.
+*Solution* +
+Upgrade to {kib} 7.14.1.
+==== 
+
 [float]
 [[breaking-changes-v7.14.1]]
 === Breaking changes

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -290,7 +290,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.
 
 
@@ -302,7 +302,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.
 
 
@@ -314,7 +314,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.
 
 

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/spaces/images/edit-space-feature-visibility.png b/docs/spaces/images/edit-space-feature-visibility.png
diff --git a/docs/spaces/images/edit-space.png b/docs/spaces/images/edit-space.png
diff --git a/docs/spaces/images/spaces-roles.png b/docs/spaces/images/spaces-roles.png