wylieconlon · dej611 · Apr 20, 2021 · Apr 20, 2021 · Apr 20, 2021 · Apr 20, 2021
diff --git a/.backportrc.json b/.backportrc.json
@@ -3,6 +3,7 @@
   "targetBranchChoices": [
     { "name": "master", "checked": true },
     { "name": "7.x", "checked": true },
+    "7.13",
     "7.12",
     "7.11",
     "7.10",
@@ -30,7 +31,7 @@
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
     "^v8.0.0$": "master",
-    "^v7.13.0$": "7.x",
+    "^v7.14.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,4 @@
 **/*.js.snap
-**/graphql/types.ts
 /.es
 /.chromium
 /build

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -144,6 +144,8 @@
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
 /x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
 /x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
+/x-pack/plugins/stack_alerts/server/alert_types/geo_containment @elastic/kibana-gis
+/x-pack/plugins/stack_alerts/public/alert_types/geo_containment @elastic/kibana-gis
 #CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
 #CC# /x-pack/plugins/file_upload @elastic/kibana-gis
 /src/plugins/tile_map/ @elastic/kibana-gis

diff --git a/.telemetryrc.json b/.telemetryrc.json
@@ -2,6 +2,8 @@
   {
     "output": "src/plugins/telemetry/schema/oss_plugins.json",
     "root": "src/plugins/",
-    "exclude": []
+    "exclude": [
+      "src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts"
+    ]
   }
 ]
diff --git a/docs/api/alerting/list_rule_types.asciidoc b/docs/api/alerting/list_rule_types.asciidoc
@@ -4,7 +4,11 @@
 <titleabbrev>List rule types</titleabbrev>
 ++++
 
-Retrieve a list of alerting rule types.
+Retrieve a list of alerting rule types that the user is authorized to access.
+
+Each rule type includes a list of consumer features. Within these features, users are authorized to perform either `read` or `all` operations on rules of that type. This helps determine which rule types users can read, but not create or modify.
+
+NOTE: Some rule types are limited to specific features.  These rule types are not available when <<defining-alerts, defining rules>> in <<management,Stack Management>>.
 
 [[list-rule-types-api-request]]
 ==== Request

diff --git a/docs/apm/agent-configuration.asciidoc b/docs/apm/agent-configuration.asciidoc
@@ -46,7 +46,7 @@ Go Agent:: {apm-go-ref}/configuration.html[Configuration reference]
 Java Agent:: {apm-java-ref}/configuration.html[Configuration reference]
 .NET Agent:: {apm-dotnet-ref}/configuration.html[Configuration reference]
 Node.js Agent:: {apm-node-ref}/configuration.html[Configuration reference]
-PHP Agent:: _Not yet supported_
+PHP Agent:: {apm-php-ref}/configuration.html[Configuration reference]
 Python Agent:: {apm-py-ref}/configuration.html[Configuration reference]
 Ruby Agent:: {apm-ruby-ref}/configuration.html[Configuration reference]
 Real User Monitoring (RUM) Agent:: {apm-rum-ref}/configuration.html[Configuration reference]
diff --git a/docs/concepts/images/add-filter-popup.png b/docs/concepts/images/add-filter-popup.png
diff --git a/docs/concepts/images/refresh-every.png b/docs/concepts/images/refresh-every.png
diff --git a/docs/concepts/images/save-icon.png b/docs/concepts/images/save-icon.png
diff --git a/docs/concepts/images/saved-query-popup.png b/docs/concepts/images/saved-query-popup.png
diff --git a/docs/concepts/images/saved-query.png b/docs/concepts/images/saved-query.png
diff --git a/docs/concepts/images/time-filter-icon.png b/docs/concepts/images/time-filter-icon.png
diff --git a/docs/concepts/images/time-filter.png b/docs/concepts/images/time-filter.png
diff --git a/docs/concepts/images/time-relative.png b/docs/concepts/images/time-relative.png
diff --git a/docs/management/index-patterns.asciidoc → docs/concepts/index-patterns.asciidoc b/docs/management/index-patterns.asciidoc → docs/concepts/index-patterns.asciidoc
@@ -1,5 +1,5 @@
 [[index-patterns]]
-== Create an index pattern
+=== Create an index pattern
 
 {kib} requires an index pattern to access the {es} data that you want to explore.
 An index pattern selects the data to use and allows you to define properties of the fields.
@@ -126,7 +126,7 @@ pattern:
 ```
 
 You can use exclusions to exclude indices that might contain mapping errors.
-To match indices starting with `logstash-`, and exclude those starting with `logstash-old` from 
+To match indices starting with `logstash-`, and exclude those starting with `logstash-old` from
 all clusters having a name starting with `cluster_`, you can use `cluster_*:logstash-*,cluster*:logstash-old*`.
 To exclude a cluster, use `cluster_*:logstash-*,cluster_one:-*`.
 
@@ -152,7 +152,7 @@ move between {kib} apps.
 image:management/index-patterns/images/new-index-pattern.png["Create index pattern"]
 
 [float]
-==== Format the display of common field types
+=== Format the display of common field types
 
 Whenever possible, {kib} uses the same field type for display as
 {es}. However, some field types that {es} supports are not available

diff --git a/docs/concepts/index.asciidoc b/docs/concepts/index.asciidoc
@@ -1,5 +1,5 @@
 [[kibana-concepts-analysts]]
-== {kib} concepts for analysts
+== {kib} concepts
 **_Learn the shared concepts for analyzing and visualizing your data_**
 
 As an analyst, you will use a combination of {kib} apps to analyze and
@@ -65,7 +65,7 @@ Each app in {kib} provides a time filter, and most apps also include semi-struct
 image:concepts/images/top-bar.png["Time filter, semi-structured search, and filters in a {kib} app"]
 
 If you frequently use any of the search options, you can click the
-save icon
+save query icon
 image:concepts/images/save-icon.png["save icon"] next to the
 semi-structured search to save or load a previously saved query.
 The saved query will always contain the semi-structured search query,
@@ -127,6 +127,7 @@ filters is combined with AND logic on the rest of the query.
 [role="screenshot"]
 image:concepts/images/add-filter-popup.png["Add filter popup"]
 
+
 [float]
 === Saving objects
 {kib} lets you save objects for your own future use or for sharing with others.
@@ -147,3 +148,14 @@ Use the global search to quickly open a saved object.
 
 * Try the {kib} <<get-started,Quick start>>, which shows you how to put these concepts into action.
 * Go to <<discover, Discover>> for instructions on searching your data.
+
+
+include::index-patterns.asciidoc[]
+
+include::set-time-filter.asciidoc[]
+
+include::kuery.asciidoc[]
+
+include::lucene.asciidoc[]
+
+include::save-query.asciidoc[]
diff --git a/docs/discover/kuery.asciidoc → docs/concepts/kuery.asciidoc b/docs/discover/kuery.asciidoc → docs/concepts/kuery.asciidoc
diff --git a/docs/concepts/lucene.asciidoc b/docs/concepts/lucene.asciidoc
@@ -0,0 +1,51 @@
+[[lucene-query]]
+=== Lucene query syntax
+Lucene query syntax is available to {kib} users who opt out of the <<kuery-query>>.
+Full documentation for this syntax is available as part of {es}
+{ref}/query-dsl-query-string-query.html#query-string-syntax[query string syntax].
+
+The main reason to use the Lucene query syntax in {kib} is for advanced
+Lucene features, such as regular expressions or fuzzy term matching. However,
+Lucene syntax is not able to search nested objects or scripted fields.
+
+To perform a free text search, simply enter a text string. For example, if
+you're searching web server logs, you could enter `safari` to search all
+fields:
+
+[source,yaml]
+-------------------
+safari
+-------------------
+
+To search for a value in a specific field, prefix the value with the name
+of the field:
+
+[source,yaml]
+-------------------
+status:200
+-------------------
+
+To search for a range of values, use the bracketed range syntax,
+`[START_VALUE TO END_VALUE]`. For example, to find entries that have 4xx
+status codes, you could enter `status:[400 TO 499]`.
+
+[source,yaml]
+-------------------
+status:[400 TO 499]
+-------------------
+
+For an open range, use a wildcard:
+
+[source,yaml]
+-------------------
+status:[400 TO *]
+-------------------
+
+To specify more complex search criteria, use the boolean operators
+`AND`, `OR`, and `NOT`. For example, to find entries that have 4xx status
+codes and have an extension of `php` or `html`:
+
+[source,yaml]
+-------------------
+status:[400 TO 499] AND (extension:php OR extension:html)
+-------------------
diff --git a/docs/concepts/save-query.asciidoc b/docs/concepts/save-query.asciidoc
@@ -1,39 +1,45 @@
 [[save-load-delete-query]]
-== Save a query
-A saved query is a collection of query text and filters that you can
-reuse in any app with a query bar, like <<discover, *Discover*>> and <<dashboard, *Dashboard*>>. Save a query when you want to:
+=== Save a query
 
-* Retrieve results from the same query at a later time without having to reenter the query text, add the filters or set the time filter
-* View the results of the same query in multiple apps
-* Share your query
+Have you ever built a query that you wanted to reuse?
+With saved queries, you can save your query text, filters, and time range for
+reuse anywhere a query bar is present.
 
-Saved queries don't include information specific to *Discover*,
-such as the currently selected columns in the document table, the sort order, and the index pattern.
-To save your current view of *Discover* for later retrieval and reuse,
-create a <<save-open-search, saved search>> instead.
+For example, suppose you're in *Discover*, and you've put time into building
+a query that includes query input text, multiple filters, and a specific time range.
+Save this query, and you can embed the search results in dashboards,
+use them as a foundation for building a visualization,
+and share them in a link or CVS form.
+
+[role="screenshot"]
+image:concepts/images/saved-query.png["Example of the saved query management popover with a list of saved queries"]
 
-NOTE::
 
-If you have insufficient privileges to save queries, the *Save current query*
-button isn't visible in the saved query management popover.
+Saved queries are different than <<save-open-search,saved searches>>,
+which include the *Discover* configuration&mdash;selected columns in the document table, sort order, and
+index pattern&mdash;in addition to the query.
+Saved searches are primarily used for adding search results to a dashboard.
+
+[role="xpack"]
+==== Read-only access
+If you have insufficient privileges to save queries,
+the *Save* button isn't visible in the saved query management popover.
 For more information, see <<xpack-security-authorization, Granting access to Kibana>>
 
-. Click *#* in the query bar.
+==== Save a query
+
+. Once you’ve built a query worth saving, click the save query icon image:concepts/images/save-icon.png["save query icon"].
 . In the popover, click *Save current query*.
-+
-[role="screenshot"]
-image::discover/images/saved-query-management-component-all-privileges.png["Example of the saved query management popover with a list of saved queries with write access",width="80%"]
-+
-. Enter a name, a description, and then select the filter options.
+. Enter a unique name to identify the query and an optional description that will appear in a tooltip in the saved query popover.
+. Choose whether to include or exclude filters and a time range.
 By default, filters are automatically included, but the time filter is not.
 +
 [role="screenshot"]
-image::discover/images/saved-query-save-form-default-filters.png["Example of the saved query management save form with the filters option included and the time filter option excluded",width="80%"]
+image:concepts/images/saved-query-popup.png["Example of the saved query management popover with a list of saved queries"]
+
 . Click *Save*.
-. To load a saved query into *Discover* or *Dashboard*, open the *Saved search* popover, and select the query.
-. To manage your saved queries, use these actions in the popover:
+. To load a saved query, select it in the *Saved query* popover.
 +
-* Save as new:  Save changes to the current query.
-* Clear.  Clear a query that is currently loaded in an app.
-* Delete.  You can’t recover a deleted query.
-. To import and export saved queries, go to <<managing-saved-objects, Saved Objects in Management>>.
+The query text, filters, and time range are updated and your data refreshed.
+If you’re loading a saved query that did not include the filters or time range, those components remain as-is.
+. To clear, modify, and delete saved queries, use the *Saved query* popover.
diff --git a/docs/concepts/set-time-filter.asciidoc b/docs/concepts/set-time-filter.asciidoc
@@ -0,0 +1,31 @@
+[[set-time-filter]]
+=== Set the time range
+Display data within a
+specified time range when your index contains time-based events, and a time-field is configured for the
+selected <<index-patterns, index pattern>>.
+The default time range is 15 minutes, but you can customize
+it in <<advanced-options,Advanced Settings>>.
+
+. Click image:concepts/images/time-filter-icon.png[clock icon].
+
+. Choose one of the following:
+
+* *Quick select* to use a recent time range, then use the back and forward
+  arrows to move through the time ranges.
+
+* *Commonly used* to use a time range from options such as *Last 15 minutes*,
+  *Today*, and *Week to date*.
+
+* *Recently used date ranges* to use a previously selected data range.
+
+* *Refresh every* to specify an automatic refresh rate.
++
+[role="screenshot"]
+image::concepts/images/time-filter.png[Time filter menu]
+
+. To set start and end times, click the bar next to the time filter.
+In the popup, select *Absolute*, *Relative* or *Now*, then specify the required
+options.
++
+[role="screenshot"]
+image::concepts/images/time-relative.png[Time filter showing relative time]
diff --git a/docs/developer/getting-started/index.asciidoc b/docs/developer/getting-started/index.asciidoc
@@ -12,8 +12,11 @@ In order to support Windows development we currently require you to use one of t
 - https://git-scm.com/download/win[Git bash] (other bash emulators like https://cmder.net/[Cmder] could work but we did not test them)
 - https://docs.microsoft.com/en-us/windows/wsl/about[WSL]
 
-Before running the steps listed below, please make sure you have installed Git bash or WSL and that 
-you are running the mentioned commands through one of them.
+As well as installing https://www.microsoft.com/en-us/download/details.aspx?id=48145[Visual C++ Redistributable for Visual Studio 2015].
+
+Before running the steps listed below, please make sure you have installed everything 
+that we require and listed above and that you are running the mentioned commands 
+through Git bash or WSL.
 
 [discrete]
 [[get-kibana-code]]

diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -63,8 +63,11 @@ yarn kbn watch-bazel
 
 - @elastic/datemath
 - @kbn/apm-utils
+- @kbn/babel-code-parser
 - @kbn/babel-preset
 - @kbn/config-schema
+- @kbn/std
 - @kbn/tinymath
 - @kbn/utility-types
+- @kbn/utils
 
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -343,6 +343,7 @@ Failure to have auth enabled in Kibana will make for a broken UI. UI-based error
 
 |{kib-repo}blob/{branch}/x-pack/plugins/cloud/README.md[cloud]
 |The cloud plugin adds cloud specific features to Kibana.
+The client-side plugin configures following values:
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/console_extensions/README.md[consoleExtensions]
@@ -362,7 +363,7 @@ Failure to have auth enabled in Kibana will make for a broken UI. UI-based error
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/data_enhanced/README.md[dataEnhanced]
-|The data_enhanced plugin is the x-pack counterpart to the OSS data plugin.
+|The data_enhanced plugin is the x-pack counterpart to the src/plguins/data plugin.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/discover_enhanced/README.md[discoverEnhanced]
@@ -392,6 +393,10 @@ actitivies.
 |The features plugin enhance Kibana with a per-feature privilege system.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/file_data_visualizer[fileDataVisualizer]
+|WARNING: Missing README.
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload]
 |WARNING: Missing README.
 

diff --git a/docs/development/core/server/kibana-plugin-core-server.makeusagefromschema.md b/docs/development/core/server/kibana-plugin-core-server.makeusagefromschema.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; [MakeUsageFromSchema](./kibana-plugin-core-server.makeusagefromschema.md)
+
+## MakeUsageFromSchema type
+
+List of configuration values that will be exposed to usage collection. If parent node or actual config path is set to `true` then the actual value of these configs will be reoprted. If parent node or actual config path is set to `false` then the config will be reported as \[redacted\].
+
+<b>Signature:</b>
+
+```typescript
+export declare type MakeUsageFromSchema<T> = {
+    [Key in keyof T]?: T[Key] extends Maybe<object[]> ? false : T[Key] extends Maybe<any[]> ? boolean : T[Key] extends Maybe<object> ? MakeUsageFromSchema<T[Key]> | boolean : boolean;
+};
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
@@ -272,6 +272,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [LegacyElasticsearchClientConfig](./kibana-plugin-core-server.legacyelasticsearchclientconfig.md) |  |
 |  [LifecycleResponseFactory](./kibana-plugin-core-server.lifecycleresponsefactory.md) | Creates an object containing redirection or error response with error details, HTTP headers, and other data transmitted to the client. |
 |  [LoggerConfigType](./kibana-plugin-core-server.loggerconfigtype.md) |  |
+|  [MakeUsageFromSchema](./kibana-plugin-core-server.makeusagefromschema.md) | List of configuration values that will be exposed to usage collection. If parent node or actual config path is set to <code>true</code> then the actual value of these configs will be reoprted. If parent node or actual config path is set to <code>false</code> then the config will be reported as \[redacted\]. |
 |  [MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md) | APIs to retrieves metrics gathered and exposed by the core platform. |
 |  [MIGRATION\_ASSISTANCE\_INDEX\_ACTION](./kibana-plugin-core-server.migration_assistance_index_action.md) |  |
 |  [MIGRATION\_DEPRECATION\_LEVEL](./kibana-plugin-core-server.migration_deprecation_level.md) |  |

diff --git a/...t/core/server/kibana-plugin-core-server.pluginconfigdescriptor.exposetousage.md b/...t/core/server/kibana-plugin-core-server.pluginconfigdescriptor.exposetousage.md
@@ -0,0 +1,17 @@
+<!-- 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; [PluginConfigDescriptor](./kibana-plugin-core-server.pluginconfigdescriptor.md) &gt; [exposeToUsage](./kibana-plugin-core-server.pluginconfigdescriptor.exposetousage.md)
+
+## PluginConfigDescriptor.exposeToUsage property
+
+Expose non-default configs to usage collection to be sent via telemetry. set a config to `true` to report the actual changed config value. set a config to `false` to report the changed config value as \[redacted\].
+
+All changed configs except booleans and numbers will be reported as \[redacted\] unless otherwise specified.
+
+[MakeUsageFromSchema](./kibana-plugin-core-server.makeusagefromschema.md)
+
+<b>Signature:</b>
+
+```typescript
+exposeToUsage?: MakeUsageFromSchema<T>;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.pluginconfigdescriptor.md b/docs/development/core/server/kibana-plugin-core-server.pluginconfigdescriptor.md
@@ -46,5 +46,6 @@ export const config: PluginConfigDescriptor<ConfigType> = {
 |  --- | --- | --- |
 |  [deprecations](./kibana-plugin-core-server.pluginconfigdescriptor.deprecations.md) | <code>ConfigDeprecationProvider</code> | Provider for the  to apply to the plugin configuration. |
 |  [exposeToBrowser](./kibana-plugin-core-server.pluginconfigdescriptor.exposetobrowser.md) | <code>{</code><br/><code>        [P in keyof T]?: boolean;</code><br/><code>    }</code> | List of configuration properties that will be available on the client-side plugin. |
+|  [exposeToUsage](./kibana-plugin-core-server.pluginconfigdescriptor.exposetousage.md) | <code>MakeUsageFromSchema&lt;T&gt;</code> | Expose non-default configs to usage collection to be sent via telemetry. set a config to <code>true</code> to report the actual changed config value. set a config to <code>false</code> to report the changed config value as \[redacted\].<!-- -->All changed configs except booleans and numbers will be reported as \[redacted\] unless otherwise specified.[MakeUsageFromSchema](./kibana-plugin-core-server.makeusagefromschema.md) |
 |  [schema](./kibana-plugin-core-server.pluginconfigdescriptor.schema.md) | <code>PluginConfigSchema&lt;T&gt;</code> | Schema to use to validate the plugin configuration.[PluginConfigSchema](./kibana-plugin-core-server.pluginconfigschema.md) |
 
diff --git a/...ment/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.error.md b/...ment/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.error.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-error: (msg: string, meta: LogMeta) => void;
+error: <Meta extends LogMeta = LogMeta>(msg: string, meta: Meta) => void;
 ```