Merge branch '7.6' into backport/7.6/pr-59639

elasticmachine · web-flow · commit cdb2d0968122 · 2020-03-10T05:30:08.000-04:00
diff --git a/docs/apm/advanced-queries.asciidoc b/docs/apm/advanced-queries.asciidoc
@@ -5,7 +5,7 @@ When querying in the APM app, you're simply searching and selecting data from fi
 Queries entered into the query bar are also added as parameters to the URL,
 so it's easy to share a specific query or view with others.
 
-In the screenshot below, you can begin to see some of the transaction fields available for filtering on:  
+In the screenshot below, you can begin to see some of the transaction fields available for filtering on:
 
 [role="screenshot"]
 image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app in Kibana]
@@ -25,7 +25,7 @@ TIP: Read the {kibana-ref}/kuery-query.html[Kibana Query Language Enhancements]
 
 It may also be helpful to view your APM data in the {kibana-ref}/discover.html[Discover app].
 Querying documents in Discover works the same way as querying in the APM app,
-and all of the example queries listed above can also be used in the Discover app.
+and all of the example APM app queries can also be used in the Discover app.
 
 [float]
 ==== Example Discover app query
diff --git a/docs/canvas/canvas-function-reference.asciidoc b/docs/canvas/canvas-function-reference.asciidoc
diff --git a/docs/dev-tools/console/console.asciidoc b/docs/dev-tools/console/console.asciidoc
@@ -18,8 +18,8 @@ NOTE: You are unable to interact with the REST API of {kib} with the Console.
 [[console-api]]
 === Write requests
 
-Console understands commands in a cURL-like syntax. 
-For example, the following is a `GET` request to the {es} `_search` API. 
+Console understands commands in a cURL-like syntax.
+For example, the following is a `GET` request to the {es} `_search` API.
 
 [source,js]
 ----------------------------------
@@ -43,23 +43,23 @@ curl -XGET "http://localhost:9200/_search" -d'
 }'
 ----------------------------------
 
-If you paste the above command into Console, {kib} automatically converts it
+When you paste the command into Console, {kib} automatically converts it
 to Console syntax.  Alternatively, if you want to want to see Console syntax in cURL, 
-click the action icon (image:dev-tools/console/images/wrench.png[]) and select *Copy as cURL*. 
+click the action icon (image:dev-tools/console/images/wrench.png[]) and select *Copy as cURL*.
 
 [float]
 [[console-autocomplete]]
 ==== Autocomplete
 
 When you're typing a command, Console makes context-sensitive suggestions.
-These suggestions show you the parameters for each API and speed up your typing. 
-To configure your preferences for autocomplete, go to 
-<<configuring-console, Settings>>. 
+These suggestions show you the parameters for each API and speed up your typing.
+To configure your preferences for autocomplete, go to
+<<configuring-console, Settings>>.
 
 [float]
 [[auto-formatting]]
 ==== Auto-formatting
-The auto-formatting 
+The auto-formatting
 capability can help you format requests. Select one or more requests that you
 want to format, click the action icon (image:dev-tools/console/images/wrench.png[]),
 and then select *Auto indent*.
@@ -69,27 +69,27 @@ For example, you might have a request formatted like this:
 [role="screenshot"]
 image::dev-tools/console/images/copy-curl.png["Console close-up"]
 
-Console adjusts the JSON body of the request to apply the indents. 
+Console adjusts the JSON body of the request to apply the indents.
 
 [role="screenshot"]
 image::dev-tools/console/images/request.png["Console close-up"]
 
-If you select *Auto indent* on a request that is already well formatted, 
-Console collapses the request body to a single line per document. 
+If you select *Auto indent* on a request that is already well formatted,
+Console collapses the request body to a single line per document.
 This is helpful when working with the {es} {ref}/docs-bulk.html[bulk APIs].
 
 
 
 [float]
 [[console-request]]
-=== Submit requests 
+=== Submit requests
 
-When you're ready to submit the request to {es}, click the 
+When you're ready to submit the request to {es}, click the
 green triangle.
 
 You can select multiple requests and submit them together.
-Console sends the requests to {es} one by one and shows the output 
-in the response pane. Submitting multiple request is helpful when you're debugging an issue or trying query 
+Console sends the requests to {es} one by one and shows the output
+in the response pane. Submitting multiple request is helpful when you're debugging an issue or trying query
 combinations in multiple scenarios.
 
 
@@ -105,15 +105,15 @@ the action icon (image:dev-tools/console/images/wrench.png[]) and select
 [[console-history]]
 === Get your request history
 
-Console maintains a list of the last 500 requests that {es} successfully executed. 
+Console maintains a list of the last 500 requests that {es} successfully executed.
 To view your most recent requests, click *History*. If you select a request
 and click *Apply*, {kib} adds it to the editor at the current cursor position.
 
 [float]
 [[configuring-console]]
 === Configure Console settings
 
-You can configure the Console font size, JSON syntax, 
+You can configure the Console font size, JSON syntax,
 and autocomplete suggestions in *Settings*.
 
 [role="screenshot"]
@@ -130,9 +130,7 @@ shortcuts, click *Help*.
 [[console-settings]]
 === Disable Console
 
-If you don’t want to use Console, you can disable it by setting `console.enabled` 
-to `false` in your `kibana.yml` configuration file. Changing this setting 
-causes the server to regenerate assets on the next startup, 
+If you don’t want to use Console, you can disable it by setting `console.enabled`
+to `false` in your `kibana.yml` configuration file. Changing this setting
+causes the server to regenerate assets on the next startup,
 which might cause a delay before pages start being served.
-
-
diff --git a/docs/dev-tools/searchprofiler/more-complicated.asciidoc b/docs/dev-tools/searchprofiler/more-complicated.asciidoc
@@ -25,7 +25,7 @@ POST test/_bulk
 // CONSOLE
 --
 
-. From the {searchprofiler}, enter "test" in the Index field above the query editor to restrict profiled 
+. From the {searchprofiler}, enter "test" in the *Index* field to restrict profiled 
 queries to the `test` index.
 
 . Replace the default `match_all` query in the query editor with a query that has two sub-query
@@ -66,7 +66,7 @@ components and includes a simple aggregation, like the example below.
 // NOTCONSOLE
 --
 
-. Click *Profile* to profile the query and visualize the results. 
+. Click *Profile* to profile the query and visualize the results.
 . Select the shard to view the query details.
 +
 [role="screenshot"]
@@ -100,5 +100,5 @@ Select the name of the shard to view the aggregation details and timing breakdow
 image::dev-tools/searchprofiler/images/gs10.png["Drilling into the first shard's details"]
 
 For more information about how the {searchprofiler} works, how timings are calculated, and
-how to interpret various results, see 
+how to interpret various results, see
 {ref}/search-profile.html#profiling-queries[Profiling queries].
diff --git a/docs/developer/core/development-dependencies.asciidoc b/docs/developer/core/development-dependencies.asciidoc
@@ -96,8 +96,8 @@ module.exports = window.angular;
 
 What this shim does is fairly simple if you go line by line:
 
-. makes sure that jQuery is loaded before angular (which actually runs the shim above)
+. makes sure that jQuery is loaded before angular (which actually runs the shim)
 . load the angular.js file from the node_modules directory
 . load the angular-elastic plugin, a plugin we want to always be included whenever we import angular
 . use the `ui/modules` module to add the module exported by angular-elastic as a dependency to the `kibana` angular module
-. finally, export the window.angular variable. This means that writing `import angular from 'angular';` will properly set the angular variable to the angular library, rather than undefined which is the default behavior.
+. finally, export the window.angular variable. This means that writing `import angular from 'angular';` will properly set the angular variable to the angular library, rather than undefined which is the default behavior.
diff --git a/docs/developer/core/development-modules.asciidoc b/docs/developer/core/development-modules.asciidoc
@@ -20,7 +20,7 @@ certain components. Here is a breakdown of those modules:
     the required modules and import them were they are actually necessary.
 
 - *`import 'ui/autoload/all'`*
-    Imports all of the above modules
+    Imports all of the modules
 
 [float]
 ==== Resolving Require Paths
@@ -60,4 +60,4 @@ Here is how import/require statements are resolved to a file:
     ** path/index + '.js'
     ** path/index + '.json'
     ** path/index
-  * if none of the above paths matches then an error is thrown
+  * if none of the paths matches then an error is thrown
diff --git a/docs/developer/plugin/development-plugin-feature-registration.asciidoc b/docs/developer/plugin/development-plugin-feature-registration.asciidoc
@@ -175,7 +175,7 @@ init(server) {
 }
 -----------
 
-Unlike the Canvas example above, Dev Tools does not require access to any saved objects to function. Dev Tools does specify an API endpoint, however. When this is configured, the Security plugin will automatically authorize access to any server API route that is tagged with `access:console`, similar to the following:
+Unlike the Canvas example, Dev Tools does not require access to any saved objects to function. Dev Tools does specify an API endpoint, however. When this is configured, the Security plugin will automatically authorize access to any server API route that is tagged with `access:console`, similar to the following:
 
 ["source","javascript"]
 -----------
diff --git a/docs/developer/plugin/development-plugin-localization.asciidoc b/docs/developer/plugin/development-plugin-localization.asciidoc
@@ -68,7 +68,7 @@ This outputs a `en.json` file inside the `translations` directory. To localize o
 Checking i18n does the following:
 
 * Checks all existing labels for violations.
-* Takes translations from `.i18nrc.json` and compares them to the messages extracted and validated at the step above and:
+* Takes translations from `.i18nrc.json` and compares them to the messages extracted and validated.
 ** Checks for unused translations. If you remove a label that has a corresponding translation, you must also remove the label from the translations file.
 ** Checks for incompatible translations.  If you add or remove a new parameter from an existing string, you must also remove the label from the translations file.
 
@@ -86,7 +86,7 @@ node scripts/i18n_check --fix --include-config ../kibana-extra/myPlugin/.i18nrc.
 Kibana relies on several UI frameworks (ReactJS and AngularJS) and
 requires localization in different environments (browser and NodeJS).
 The internationalization engine is framework agnostic and consumable in
-all parts of Kibana (ReactJS, AngularJS and NodeJS). 
+all parts of Kibana (ReactJS, AngularJS and NodeJS).
 
 To simplify
 internationalization in UI frameworks, additional abstractions are
@@ -112,7 +112,7 @@ export const HELLO_WORLD = i18n.translate('hello.wonderful.world', {
 Full details are {repo}tree/master/packages/kbn-i18n#vanilla-js[here].
 
 [float]
-===== i18n for React 
+===== i18n for React
 
 To localize strings in React, use either `FormattedMessage` or `i18n.translate`.
 
@@ -138,7 +138,7 @@ Full details are {repo}tree/master/packages/kbn-i18n#react[here].
 
 
 [float]
-===== i18n for Angular 
+===== i18n for Angular
 
 You are encouraged to use `i18n.translate()` by statically importing `i18n` from `@kbn/i18n` wherever possible in your Angular code. Angular wrappers use the translation `service` with the i18n engine under the hood.
 
diff --git a/docs/developer/pr-review.asciidoc b/docs/developer/pr-review.asciidoc
@@ -67,7 +67,7 @@ Enhancements are pretty much always going to have extensive unit tests as a base
 [float]
 === Product level review
 
-Reviewers are not simply evaluating the code itself, they are also evaluating the quality of the user-facing change in the product. This generally means they need to check out the branch locally and "play around" with it. In addition to the "do we want this change in the product" details from above, the reviewer should be looking for bugs and evaluating how approachable and useful the feature is as implemented. Special attention should be given to error scenarios and edge cases to ensure they are all handled well within the product.
+Reviewers are not simply evaluating the code itself, they are also evaluating the quality of the user-facing change in the product. This generally means they need to check out the branch locally and "play around" with it. In addition to the "do we want this change in the product" details, the reviewer should be looking for bugs and evaluating how approachable and useful the feature is as implemented. Special attention should be given to error scenarios and edge cases to ensure they are all handled well within the product.
 
 
 [float]
@@ -107,7 +107,7 @@ Conflicting opinions between reviewers and authors happen, and sometimes it is h
 
 Whether or not a bit of feedback is appropriate for a pull request is often dependent on the motivation for giving the feedback in the first place.
 
-_Demanding_ an author make changes based primarily on the mindset of "how would I write this code?" isn't appropriate. The reviewer didn't write the code, and their critical purpose in the review process is not to craft the contribution into a form that is simply whatever they would have written if they had. If a reviewer wants to provide this type of feedback, they should qualify it as a "nit" as mentioned in the nitpicking section above to make it clear that the author can take it or leave it.
+_Demanding_ an author make changes based primarily on the mindset of "how would I write this code?" isn't appropriate. The reviewer didn't write the code, and their critical purpose in the review process is not to craft the contribution into a form that is simply whatever they would have written if they had. If a reviewer wants to provide this type of feedback, they should qualify it as a "nit" as mentioned in the nitpicking section to make it clear that the author can take it or leave it.
 
 Inflammatory feedback such as "this is crap" isn't feedback at all. It's both mean and unhelpful, and it is never appropriate.
 
diff --git a/docs/infrastructure/metrics-explorer.asciidoc b/docs/infrastructure/metrics-explorer.asciidoc
@@ -44,7 +44,7 @@ In this step we'll leave the aggregation dropdown set to *Average* but you can t
 
 4. In the *graph per* dropdown, enter `host.name` and select this field.
 You will see a separate graph for each host you are monitoring.
-If you are collecting metrics for multiple hosts, you will see something like the screenshot above.
+If you are collecting metrics for multiple hosts, multiple graphics are displayed.
 If you only have metrics for a single host, you will see a single graph.
 Congratulations! Either way, you've explored your first metric.
 
diff --git a/docs/logs/using.asciidoc b/docs/logs/using.asciidoc
@@ -31,9 +31,7 @@ If so, <<xpack-logs-configuring, configure the logs source data>> to change the
 
 Click image:images/time-filter-calendar.png[time filter calendar], then choose the time range for the logs.
 
-Log entries for the specified time appear in the middle of the page, with the earlier entries above and the later entries below.
-
-To quickly jump to a nearby point in time, click the minimap timeline to the right.
+Log entries for the specified time appear in the middle of the page. To quickly jump to a nearby point in time, click the minimap timeline to the right.
 // ++ what's this thing called? It's minimap in the UI. Would timeline be better?
 
 [float]
diff --git a/docs/management/rollups/create_and_manage_rollups.asciidoc b/docs/management/rollups/create_and_manage_rollups.asciidoc
@@ -128,7 +128,7 @@ rollup index, or you can remove or archive it using <<creating-index-lifecycle-p
 Your next step is to visualize your rolled up data in a vertical bar chart.
 Most visualizations support rolled up data, with the exception of Timelion, TSVB, and Vega visualizations.
 
-Using the information from the example rollup configuration described above,
+Using the information from the example rollup configuration,
 you can use `rollup_logstash` to match the rolled up index pattern,
 and `kibana_sample_data_logs` to match the index pattern for raw data.
 The notation for a combination index pattern with both raw and rolled up data
diff --git a/docs/maps/connect-to-ems.asciidoc b/docs/maps/connect-to-ems.asciidoc
@@ -19,7 +19,7 @@ EMS requests are made to the following domains:
 To connect to EMS when your Kibana server and browser are in an internal network:
 
 . Set `map.proxyElasticMapsServiceInMaps` to `true` in your <<settings, kibana.yml>> file to proxy EMS requests through the Kibana server.
-. Update your firewall rules to whitelist connections from your Kibana server to the EMS domains listed above.
+. Update your firewall rules to whitelist connections from your Kibana server to the EMS domains.
 
 NOTE: Coordinate map  and region map visualizations do not support `map.proxyElasticMapsServiceInMaps` and will not proxy EMS requests through the Kibana server.
 
diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc
@@ -7,11 +7,11 @@ A list of all published Docker images and tags is available at
 https://www.docker.elastic.co[www.docker.elastic.co]. The source code is in
 https://github.com/elastic/dockerfiles/tree/{branch}/kibana[GitHub].
 
-These images are free to use under the Elastic license. They contain open source 
-and free commercial features and access to paid commercial features.  
-{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the 
-paid commercial features. See the 
-https://www.elastic.co/subscriptions[Subscriptions] page for information about 
+These images are free to use under the Elastic license. They contain open source
+and free commercial features and access to paid commercial features.
+{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the
+paid commercial features. See the
+https://www.elastic.co/subscriptions[Subscriptions] page for information about
 Elastic license levels.
 
 [float]
@@ -35,8 +35,8 @@ ifeval::["{release-state}"!="unreleased"]
 docker pull {docker-repo}:{version}
 --------------------------------------------
 
-Alternatively, you can download other Docker images that contain only features 
-available under the Apache 2.0 license. To download the images, go to 
+Alternatively, you can download other Docker images that contain only features
+available under the Apache 2.0 license. To download the images, go to
 https://www.docker.elastic.co[www.docker.elastic.co].
 
 [float]
@@ -96,7 +96,7 @@ Some example translations are shown here:
 `KIBANA_DEFAULTAPPID`:: `kibana.defaultAppId`
 `XPACK_MONITORING_ENABLED`:: `xpack.monitoring.enabled`
 
-In general, any setting listed in <<settings>> can be 
+In general, any setting listed in <<settings>> can be
 configured with this technique.
 
 These variables can be set with +docker-compose+ like this:
@@ -135,5 +135,5 @@ with a <<bind-mount-config,custom `kibana.yml`>> or via
 <<environment-variable-config,environment variables>>.
 
 IMPORTANT: If replacing `kibana.yml` with a custom version, be sure to copy the
-above defaults to the custom file if you want to retain them. If not, they will
+defaults to the custom file if you want to retain them. If not, they will
 be "masked" by the new file.
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
@@ -240,8 +240,9 @@ object points to an external vector file that contains a geojson
 FeatureCollection. The file must use the
 https://en.wikipedia.org/wiki/World_Geodetic_System[WGS84 coordinate reference system]
 and only include polygons. If the file is hosted on a separate domain from
-Kibana, the server needs to be CORS-enabled so Kibana can download the file. The
-following example shows a valid regionmap configuration.
+Kibana, the server needs to be CORS-enabled so Kibana can download the file.
+[[region-map-configuration-example]]
+The following example shows a valid region map configuration.
 +
 --
     map.regionmap:
@@ -267,7 +268,7 @@ References the originating source of the geojson file. Supported on {ece}.
 
 [[regionmap-fields]]`map.regionmap.layers[].fields[]:`:: Mandatory. Each layer
 can contain multiple fields to indicate what properties from the geojson
-features you wish to expose. The example above shows how to define multiple
+features you wish to expose. This <<region-map-configuration-example,region map example>> shows how to define multiple
 properties. Supported on {ece}.
 
 [[regionmap-field-description]]`map.regionmap.layers[].fields[].description:`::
diff --git a/docs/siem/index.asciidoc b/docs/siem/index.asciidoc
@@ -4,7 +4,6 @@
 
 [partintro]
 --
-beta[]
 
 The SIEM app in Kibana provides an interactive workspace for security teams to
 triage events and perform initial investigations. It enables analysis of
diff --git a/docs/siem/siem-ui.asciidoc b/docs/siem/siem-ui.asciidoc
@@ -35,7 +35,7 @@ image::siem/images/network-ui.png[]
 
 [float]
 [[detections-ui]]
-=== Detections
+=== Detections (Beta)
 
 The Detections feature automatically searches for threats and creates 
 signals when they are detected. Signal detection rules define the conditions 
diff --git a/docs/user/introduction.asciidoc b/docs/user/introduction.asciidoc
diff --git a/docs/user/reporting/development/pdf-integration.asciidoc b/docs/user/reporting/development/pdf-integration.asciidoc
diff --git a/docs/user/security/securing-communications/elasticsearch-mutual-tls.asciidoc b/docs/user/security/securing-communications/elasticsearch-mutual-tls.asciidoc
diff --git a/docs/user/security/securing-communications/index.asciidoc b/docs/user/security/securing-communications/index.asciidoc
diff --git a/docs/user/security/securing-kibana.asciidoc b/docs/user/security/securing-kibana.asciidoc
diff --git a/docs/visualize/vega.asciidoc b/docs/visualize/vega.asciidoc

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ init(server) {`
`175`	`175`	`}`
`176`	`176`	`-----------`
`177`	`177`
`178`		-Unlike the Canvas example above, Dev Tools does not require access to any saved objects to function. Dev Tools does specify an API endpoint, however. When this is configured, the Security plugin will automatically authorize access to any server API route that is tagged with `access:console`, similar to the following:
	`178`	+Unlike the Canvas example, Dev Tools does not require access to any saved objects to function. Dev Tools does specify an API endpoint, however. When this is configured, the Security plugin will automatically authorize access to any server API route that is tagged with `access:console`, similar to the following:
`179`	`179`
`180`	`180`	`["source","javascript"]`
`181`	`181`	`-----------`