Merge branch 'master' into task-manager/fix-flaky-test

docs/apm/how-to-guides.asciidoc

@@ -8,7 +8,6 @@ Learn how to perform common APM app tasks.
 * <<agent-configuration>>
 * <<apm-alerts>>
 * <<custom-links>>
-* <<errors-alerts-with-watcher>>
 * <<filters>>
 * <<machine-learning-integration>>
 * <<advanced-queries>>
@@ -21,8 +20,6 @@ include::apm-alerts.asciidoc[]
 
 include::custom-links.asciidoc[]
 
-include::error-reports-watcher.asciidoc[]
-
 include::filters.asciidoc[]
 
 include::machine-learning.asciidoc[]

docs/redirects.asciidoc

@@ -80,3 +80,13 @@ This page was deleted. See <<development-visualize-index>>.
 == Developing Visualizations
 
 This page was deleted. See <<development-visualize-index>>.
+
+[role="exclude",id="errors-alerts-with-watcher"]
+== Error reports with Watcher
+
+deprecated::[7.9.0]
+
+Watcher error reports have been removed and replaced with Kibana's <<apm-alerts,alerting and actions>> feature.
+To create error alerts with new tool, select **Alerts** - **Create threshold alert** - **Error rate**.
+
+More information on this new feature is available in <<apm-alerts>>.

docs/user/index.asciidoc

@@ -6,7 +6,10 @@ include::getting-started.asciidoc[]
 
 include::setup.asciidoc[]
 
-include::monitoring/configuring-monitoring.asciidoc[]
+include::monitoring/configuring-monitoring.asciidoc[leveloffset=+1]
+include::monitoring/monitoring-metricbeat.asciidoc[leveloffset=+2]
+include::monitoring/viewing-metrics.asciidoc[leveloffset=+2]
+include::monitoring/monitoring-kibana.asciidoc[leveloffset=+2]
 
 include::security/securing-kibana.asciidoc[]
 

docs/user/monitoring/beats-details.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[beats-page]]
-== Beats Monitoring Metrics
+= Beats Monitoring Metrics
 ++++
 <titleabbrev>Beats Metrics</titleabbrev>
 ++++

docs/user/monitoring/cluster-alerts.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[cluster-alerts]]
-== Cluster Alerts
+= Cluster Alerts
 
 The *Stack Monitoring > Clusters* page in {kib} summarizes the status of your
 {stack}. You can drill down into the metrics to view more information about your
@@ -39,11 +39,12 @@ valid for 30 days.
 The {monitor-features} check the cluster alert conditions every minute. Cluster
 alerts are automatically dismissed when the condition is resolved.
 
-include::cluster-alerts-license.asciidoc[]
+NOTE: {watcher} must be enabled to view cluster alerts. If you have a Basic
+license, Top Cluster Alerts are not displayed.
 
 [float]
 [[cluster-alert-email-notifications]]
-==== Email Notifications
+== Email Notifications
 To receive email notifications for the Cluster Alerts:
 
 . Configure an email account as described in

docs/user/monitoring/configuring-monitoring.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[configuring-monitoring]]
-== Configure monitoring in {kib}
+= Configure monitoring in {kib}
 ++++
 <titleabbrev>Configure monitoring</titleabbrev>
 ++++
@@ -16,7 +16,3 @@ You can also use {kib} to
 
 To learn about monitoring in general, see
 {ref}/monitor-elasticsearch-cluster.html[Monitor a cluster].
-
-include::monitoring-metricbeat.asciidoc[]
-include::viewing-metrics.asciidoc[]
-include::monitoring-kibana.asciidoc[]

docs/user/monitoring/elasticsearch-details.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[elasticsearch-metrics]]
-== {es} Monitoring Metrics
+= {es} Monitoring Metrics
 [subs="attributes"]
 ++++
 <titleabbrev>{es} Metrics</titleabbrev>
@@ -18,7 +18,7 @@ See also {ref}/monitor-elasticsearch-cluster.html[Monitor a cluster].
 
 [float]
 [[cluster-overview-page]]
-==== Cluster Overview
+== Cluster Overview
 
 To view the key metrics that indicate the overall health of an {es} cluster,
 click **Overview** in the {es} section. Anything that needs your attention is
@@ -44,7 +44,7 @@ From there, you can dive into detailed metrics for particular nodes and indices.
 
 [float]
 [[nodes-page]]
-==== Nodes
+== Nodes
 
 To view node metrics, click **Nodes**. The Nodes section shows the status
 of each node in your cluster.
@@ -54,7 +54,7 @@ image::user/monitoring/images/monitoring-nodes.png["Elasticsearch Nodes"]
 
 [float]
 [[nodes-page-overview]]
-===== Node Overview
+=== Node Overview
 
 Click the name of a node to view its node statistics over time. These represent
 high-level statistics collected from {es} that provide a good overview of
@@ -66,7 +66,7 @@ image::user/monitoring/images/monitoring-node.png["Elasticsearch Node Overview"]
 
 [float]
 [[nodes-page-advanced]]
-===== Node Advanced
+=== Node Advanced
 
 To view advanced node metrics, click the **Advanced** tab for a node. The
 *Advanced* tab shows additional metrics, such as memory and garbage collection
@@ -81,7 +81,7 @@ more advanced knowledge of {es}, such as poor garbage collection performance.
 
 [float]
 [[indices-overview-page]]
-==== Indices
+== Indices
 
 To view index metrics, click **Indices**. The Indices section shows the same
 overall index and search metrics as the Overview and a table of your indices.
@@ -91,7 +91,7 @@ image::user/monitoring/images/monitoring-indices.png["Elasticsearch Indices"]
 
 [float]
 [[indices-page-overview]]
-===== Index Overview
+=== Index Overview
 
 From the Indices listing, you can view data for a particular index. To drill
 down into the data for a particular index, click its name in the Indices table.
@@ -101,7 +101,7 @@ image::user/monitoring/images/monitoring-index.png["Elasticsearch Index Overview
 
 [float]
 [[indices-page-advanced]]
-===== Index Advanced
+=== Index Advanced
 
 To view advanced index metrics, click the **Advanced** tab for an index. The
 *Advanced*  tab shows additional metrics, such as memory statistics reported
@@ -116,7 +116,7 @@ more advanced knowledge of {es}, such as wasteful index memory usage.
 
 [float]
 [[jobs-page]]
-==== Jobs
+== Jobs
 
 To view {ml} job metrics, click **Jobs**. For each job in your cluster, it shows
 information such as its status, the number of records processed, the size of the
@@ -127,7 +127,7 @@ image::user/monitoring/images/monitoring-jobs.png["Machine learning jobs",link="
 
 [float]
 [[ccr-overview-page]]
-==== CCR
+== CCR
 
 To view {ccr} metrics, click **CCR**. For each follower index on the cluster, it 
 shows information such as the leader index, an indication of how much the
@@ -149,7 +149,7 @@ For more information, see {ref}/xpack-ccr.html[{ccr-cap}].
 
 [float]
 [[logs-monitor-page]]
-==== Logs
+== Logs
 
 If you use {filebeat} to collect log data from your cluster, you can see its
 recent logs in the *Stack Monitoring* application. The *Clusters* page lists the

docs/user/monitoring/index.asciidoc

@@ -1,33 +1,7 @@
-[role="xpack"]
-[[xpack-monitoring]]
-= Stack Monitoring
-
-[partintro]
---
-
-The {kib} {monitor-features} serve two separate purposes:
-
-. To visualize monitoring data from across the {stack}. You can view health and 
-performance data for {es}, {ls}, and Beats in real time, as well as analyze past 
-performance. 
-. To monitor {kib} itself and route that data to the monitoring cluster.
-
-If you enable monitoring across the {stack}, each {es} node, {ls} node, {kib} 
-instance, and Beat is considered unique based on its persistent
-UUID, which is written to the <<settings,`path.data`>> directory when the node
-or instance starts. 
-
-NOTE: Watcher must be enabled to view cluster alerts. If you have a Basic
-license, Top Cluster Alerts are not displayed.
-
-For more information, see <<configuring-monitoring>> and 
-{ref}/monitor-elasticsearch-cluster.html[Monitor a cluster].  
-
---
-
-include::beats-details.asciidoc[]
-include::cluster-alerts.asciidoc[]
-include::elasticsearch-details.asciidoc[]
-include::kibana-details.asciidoc[]
-include::logstash-details.asciidoc[]
-include::monitoring-troubleshooting.asciidoc[]
+include::xpack-monitoring.asciidoc[]
+include::beats-details.asciidoc[leveloffset=+1]
+include::cluster-alerts.asciidoc[leveloffset=+1]
+include::elasticsearch-details.asciidoc[leveloffset=+1]
+include::kibana-details.asciidoc[leveloffset=+1]
+include::logstash-details.asciidoc[leveloffset=+1]
+include::monitoring-troubleshooting.asciidoc[leveloffset=+1]

docs/user/monitoring/kibana-details.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[kibana-page]]
-== {kib} Monitoring Metrics
+= {kib} Monitoring Metrics
 [subs="attributes"]
 ++++
 <titleabbrev>{kib} Metrics</titleabbrev>

docs/user/monitoring/logstash-details.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[logstash-page]]
-== Logstash Monitoring Metrics
+= Logstash Monitoring Metrics
 ++++
 <titleabbrev>Logstash Metrics</titleabbrev>
 ++++

docs/user/monitoring/monitoring-kibana.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[monitoring-kibana]]
-=== Collect monitoring data using legacy collectors
+= Collect monitoring data using legacy collectors
 ++++
 <titleabbrev>Legacy collection methods</titleabbrev>
 ++++

docs/user/monitoring/monitoring-metricbeat.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[monitoring-metricbeat]]
-=== Collect {kib} monitoring data with {metricbeat}
+= Collect {kib} monitoring data with {metricbeat}
 [subs="attributes"]
 ++++
 <titleabbrev>Collect monitoring data with {metricbeat}</titleabbrev>