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

.eslintrc.js

@@ -49,6 +49,11 @@ const ELASTIC_LICENSE_HEADER = `
  */
 `;
 
+const allMochaRules = {};
+Object.keys(require('eslint-plugin-mocha').rules).forEach(k => {
+  allMochaRules['mocha/' + k] = 'off';
+});
+
 module.exports = {
   root: true,
 
@@ -518,6 +523,14 @@ module.exports = {
       },
     },
 
+    /**
+     * Harden specific rules
+     */
+    {
+      files: ['test/harden/*.js'],
+      rules: allMochaRules,
+    },
+
     /**
      * APM overrides
      */

docs/apm/advanced-queries.asciidoc

@@ -21,22 +21,22 @@ TIP: Read the {kibana-ref}/kuery-query.html[Kibana Query Language Enhancements]
 
 [float]
 [[discover-advanced-queries]]
-=== Querying in the Discover app
+=== Querying in Discover
 
-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 APM app queries can also be used in the Discover app.
+It may also be helpful to view your APM data in {kibana-ref}/discover.html[*Discover*].
+Querying documents in *Discover* works the same way as querying in the APM app,
+and all of the example APM app queries can also be used in *Discover*.
 
 [float]
-==== Example Discover app query
+==== Example Discover query
 
-One example where you may want to make use of the Discover app,
+One example where you may want to make use of *Discover*,
 is for viewing  _all_ transactions for an endpoint, instead of just a sample.
 
 TIP: Starting in v7.6, you can view 10 samples per bucket in the APM app, instead of just one.
 
 Use the APM app to find a transaction name and time bucket that you're interested in learning more about.
-Then, switch to the Discover app and make a search:
+Then, switch to *Discover* and make a search:
 
 ["source","sh"]
 -----

docs/getting-started/tutorial-discovering.asciidoc

@@ -1,20 +1,19 @@
 [[tutorial-discovering]]
 === Discover your data
 
-Using the Discover application, you can enter
+Using *Discover*, enter
 an {ref}/query-dsl-query-string-query.html#query-string-syntax[Elasticsearch
 query] to search your data and filter the results.
 
-. Open *Discover*. 
+. Open *Discover*.
 +
-The current index pattern appears below the filter bar, in this case `shakes*`.
-You might need to click *New* in the menu bar to refresh the data.
+The `shakes*` index pattern appears.
 
-. Click the caret to the right of the current index pattern, and select `ba*`.
+. To make `ba*` the current index, click the index pattern dropdown, then select `ba*`.
 +
-By default, all fields are shown for each matching document. 
+By default, all fields are shown for each matching document.
 
-. In the search field, enter the following string:
+. In the search field, enter:
 +
 [source,text]
 account_number<100 AND balance>47500
@@ -25,11 +24,10 @@ excess of 47,500. Results appear for account numbers 8, 32, 78, 85, and 97.
 [role="screenshot"]
 image::images/tutorial-discover-2.png[]
 
-. To choose which
-fields to display, hover the pointer over the list of *Available fields*
-and then click *add* next to each field you want include as a column in the table.
+. Hover over the list of *Available fields*, then
+click *add* next to each field you want include as a column in the table.
 +
-For example, if you add the `account_number` field, the display changes to a list of five
+For example, when you add the `account_number` field, the display changes to a list of five
 account numbers.
 +
 [role="screenshot"]

docs/infrastructure/index.asciidoc

@@ -10,7 +10,7 @@ Then you can drill down to view more detailed metrics or other information for t
 
 You can:
 
-* View your infrastructure metrics by hosts, Kubernetes pods or Docker containers.
+* View your infrastructure metrics by hosts, Kubernetes pods, or Docker containers.
 You can group and filter the data in various ways to help you identify the items that interest you.
 
 * View current and historic values for metrics such as CPU usage, memory usage, and network traffic for each component.

docs/logs/index.asciidoc

@@ -16,6 +16,7 @@ In this case, you will only see the logs for the selected component.
 * <<xpack-logs-getting-started>>
 * <<xpack-logs-using>>
 * <<xpack-logs-configuring>>
+* <<xpack-logs-analysis>>
 
 [role="screenshot"]
 image::logs/images/logs-console.png[Log Console in Kibana]

docs/management/index-patterns.asciidoc

@@ -52,17 +52,20 @@ If {kib} detects an index with a timestamp, you’re asked to choose a field to
 filter your data by time. If you don’t specify a field, you won’t be able
 to use the time filter.
 
-
-
 [float]
+[[rollup-index-pattern]]
 ==== Rollup index pattern
 
 If a rollup index is detected in the cluster, clicking *Create index pattern*
 includes an item for creating a rollup index pattern.
 You can match an index pattern to only rolled up data, or mix both rolled
 up and raw data to explore and visualize all data together.
 An index pattern can match
-only one rollup index.
+only one rollup index. When matching multiple indices,
+use a comma to separate the names, with no space after the comma.
+
+For specific fields, the data in a rollup index includes only summarized metrics.
+From the original raw data, you are unable to search any other field.
 
 [float]
 [[management-cross-cluster-search]]

docs/management/managing-fields.asciidoc

@@ -1,17 +1,17 @@
 [[managing-fields]]
-== Index Patterns and Fields
+== Index patterns and fields
 
 The *Index patterns* UI helps you create and manage
-the index patterns that retrieve your data from Elasticsearch.
+the index patterns that retrieve your data from {es}.
 
 [role="screenshot"]
 image::images/management-index-patterns.png[]
 
 [float]
 === Create an index pattern
 
-An index pattern is the glue that connects Kibana to your Elasticsearch data. Create an
-index pattern whenever you load your own data into Kibana. To get started,
+An index pattern is the glue that connects {kib} to your {es} data. Create an
+index pattern whenever you load your own data into {kib}. To get started,
 click *Create index pattern*, and then follow the guided steps. Refer to
 <<index-patterns, Creating an index pattern>> for the types of index patterns
 that you can create.
@@ -33,7 +33,7 @@ you create is automatically designated as the default pattern. The default
 index pattern is loaded when you open *Discover*.
 
 * *Refresh the index fields list.* You can refresh the index fields list to
-pick up any newly-added fields. Doing so also resets Kibana’s popularity counters
+pick up any newly-added fields. Doing so also resets the {kib} popularity counters
 for the fields. The popularity counters are used in *Discover* to sort fields in lists.
 
 * [[delete-pattern]]*Delete the index pattern.* This action removes the pattern from the list of
@@ -60,7 +60,7 @@ Kibana has field formatters for the following field types:
 * <<field-formatters-numeric, Numbers>>
 
 [[field-formatters-string]]
-=== String Field Formatters
+=== String field formatters
 
 String fields support the `String` and `Url` formatters.
 
@@ -69,7 +69,7 @@ include::field-formatters/string-formatter.asciidoc[]
 include::field-formatters/url-formatter.asciidoc[]
 
 [[field-formatters-date]]
-=== Date Field Formatters
+=== Date field formatters
 
 Date fields support the `Date`, `Url`, and `String` formatters.
 
@@ -81,19 +81,19 @@ include::field-formatters/string-formatter.asciidoc[]
 include::field-formatters/url-formatter.asciidoc[]
 
 [[field-formatters-geopoint]]
-=== Geographic Point Field Formatters
+=== Geographic point field formatters
 
 Geographic point fields support the `String` formatter.
 
 include::field-formatters/string-formatter.asciidoc[]
 
 [[field-formatters-numeric]]
-=== Numeric Field Formatters
+=== Numeric field formatters
 
 Numeric fields support the `Url`, `Bytes`, `Duration`, `Number`, `Percentage`, `String`, and `Color` formatters.
 
 The `Bytes`, `Number`, and `Percentage` formatters enable you to choose the display formats of numbers in this field using
-the <<numeral, Elastic numeral pattern>> syntax that Kibana maintains.
+the <<numeral, Elastic numeral pattern>> syntax that {kib} maintains.
 
 include::field-formatters/url-formatter.asciidoc[]
 
@@ -104,70 +104,63 @@ include::field-formatters/duration-formatter.asciidoc[]
 include::field-formatters/color-formatter.asciidoc[]
 
 [[scripted-fields]]
-=== Scripted Fields
+=== Scripted fields
 
-Scripted fields compute data on the fly from the data in your Elasticsearch indices. Scripted field data is shown on
-the Discover tab as part of the document data, and you can use scripted fields in your visualizations.
-Scripted field values are computed at query time so they aren't indexed and cannot be searched using Kibana's default
-query language. However they can be queried using Kibana's new <<kuery-query, experimental query language>>. Scripted
-fields are also supported in the filter bar.
+Scripted fields compute data on the fly from the data in your {es} indices. The data is shown on
+the Discover tab as part of the document data, and you can use scripted fields in your visualizations. You query scripted fields with the <<kuery-query, {kib} query language>>, and can filter them using the filter bar. The scripted field values are computed at query time, so they aren't indexed and cannot be searched using the {kib} default
+query language.
 
 WARNING: Computing data on the fly with scripted fields can be very resource intensive and can have a direct impact on
-Kibana's performance. Keep in mind that there's no built-in validation of a scripted field. If your scripts are
+{kib} performance. Keep in mind that there's no built-in validation of a scripted field. If your scripts are
 buggy, you'll get exceptions whenever you try to view the dynamically generated data.
 
-When you define a scripted field in Kibana, you have a choice of scripting languages. Starting with 5.0, the default
+When you define a scripted field in {kib}, you have a choice of scripting languages. In 5.0 and later, the default
 options are {ref}/modules-scripting-expression.html[Lucene expressions] and {ref}/modules-scripting-painless.html[Painless].
-While you can use other scripting languages if you enable dynamic scripting for them in Elasticsearch, this is not recommended
+While you can use other scripting languages if you enable dynamic scripting for them in {es}, this is not recommended
 because they cannot be sufficiently {ref}/modules-scripting-security.html[sandboxed].
 
-WARNING: Use of Groovy, JavaScript, and Python scripting is deprecated starting in Elasticsearch 5.0, and support for those
-scripting languages will be removed in the future.
+WARNING: In 5.0 and later, Groovy, JavaScript, and Python scripting are deprecated and unsupported.
 
 You can reference any single value numeric field in your expressions, for example:
 
 ----
 doc['field_name'].value
 ----
 
-For more background on scripted fields and additional examples, refer to this blog:
-https://www.elastic.co/blog/using-painless-kibana-scripted-fields[Using Painless in Kibana scripted fields]
+For more information on scripted fields and additional examples, refer to
+https://www.elastic.co/blog/using-painless-kibana-scripted-fields[Using Painless in {kib} scripted fields]
 
 [float]
 [[create-scripted-field]]
-=== Creating a Scripted Field
-To create a scripted field:
+=== Create a scripted field
 
-. Go to *Management > Kibana > Index Patterns*
+. Go to *Management > {kib} > Index Patterns*
 . Select the index pattern you want to add a scripted field to.
-. Go to the pattern's *Scripted fields* tab.
-. Click *Add scripted field*.
+. Go to the *Scripted fields* tab for the index pattern, then click *Add scripted field*.
 . Enter a name for the scripted field.
 . Enter the expression that you want to use to compute a value on the fly from your index data.
 . Click *Create field*.
 
-For more information about scripted fields in Elasticsearch, see
+For more information about scripted fields in {es}, see
 {ref}/modules-scripting.html[Scripting].
 
 [float]
 [[update-scripted-field]]
-=== Updating a Scripted Field
-To modify a scripted field:
+=== Update a scripted field
 
-. Go to *Management > Kibana > Index Patterns*
-. Click the index pattern's *Scripted fields* tab.
+. Go to *Management > {kib} > Index Patterns*
+. Click the *Scripted fields* tab for the index pattern.
 . Click the *Edit* button for the scripted field you want to change.
-. Make your changes and then click *Save field* to update the field.
+. Make your changes, then click *Save field*.
 
-WARNING: Keep in mind that there's no built-in validation of a scripted field. If your scripts are buggy, you'll get
+WARNING: Built-in validation is unsupported for scripted fields. If your scripts are buggy, you'll get
 exceptions whenever you try to view the dynamically generated data.
 
 [float]
 [[delete-scripted-field]]
-=== Deleting a Scripted Field
-To delete a scripted field:
+=== Delete a scripted field
 
-. Go to *Management > Kibana > Index Patterns*
-. Click the index pattern's *Scripted fields* tab.
-. Click the *Delete* button for the scripted field you want to remove.
-. Click *Delete* in the confirmation window.
+. Go to *Management > {kib} > Index Patterns*
+. Click the *Scripted fields* tab for the index pattern.
+. Click *Delete* for the scripted field you want to remove.
+. Click *Delete* on the confirmation window.

docs/management/rollups/create_and_manage_rollups.asciidoc

@@ -56,6 +56,7 @@ job—reusing the same name can lead to problems with mismatched job configu
 You can read more at {ref}/rollup-job-config.html[rollup job configuration].
 
 [float]
+[[rollup-data-tutorial]]
 === Try it: Create and visualize rolled up data
 
 This example creates a rollup job to capture log data from sample web logs.
@@ -138,8 +139,7 @@ is `rollup_logstash,kibana_sample_data_logs`.
 image::images/management_rollup_job_vis.png[][Visualization of rolled up data]
 
 You can then create a dashboard that contains visualizations of the rolled up
-data, raw data, or both.  See <<visualize-rollup-data, Using rolled up data in a visualization>>
-for more information.
+data, raw data, or both. For more information, refer to <<rollup-index-pattern,rolled up data>>.
 
 [role="screenshot"]
 image::images/management_rollup_job_dashboard.png[][Dashboard with rolled up data]

docs/uptime/index.asciidoc

@@ -8,10 +8,11 @@ Uptime allows you to monitor the status of network endpoints via HTTP/S, TCP, an
 You can explore endpoint status over time, drill down into specific monitors,
 and easily view a high-level snapshot of your environment at any point in time.
 
-[float]
-== Get Started
+To get started with Elastic Uptime, refer to {uptime-guide}/install-uptime.html[Install Uptime].
+
+* <<uptime-overview>>
+* <<uptime-monitor>>
 
-See {uptime-guide}/install-uptime.html[Install Uptime] for instructions on getting started with Elastic Uptime.
 --
 
 include::overview.asciidoc[]