Skip to content

Commit 770fb69

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into fix-another-flaky-status-test
2 parents 9a23c05 + 30f469c commit 770fb69

114 files changed

Lines changed: 1713 additions & 1864 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/apm/error-reports-watcher.asciidoc‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎docs/apm/how-to-guides.asciidoc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Learn how to perform common APM app tasks.
88
* <<agent-configuration>>
99
* <<apm-alerts>>
1010
* <<custom-links>>
11-
* <<errors-alerts-with-watcher>>
1211
* <<filters>>
1312
* <<machine-learning-integration>>
1413
* <<advanced-queries>>
@@ -21,8 +20,6 @@ include::apm-alerts.asciidoc[]
2120

2221
include::custom-links.asciidoc[]
2322

24-
include::error-reports-watcher.asciidoc[]
25-
2623
include::filters.asciidoc[]
2724

2825
include::machine-learning.asciidoc[]

‎docs/redirects.asciidoc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,13 @@ This page was deleted. See <<development-visualize-index>>.
8080
== Developing Visualizations
8181

8282
This page was deleted. See <<development-visualize-index>>.
83+
84+
[role="exclude",id="errors-alerts-with-watcher"]
85+
== Error reports with Watcher
86+
87+
deprecated::[7.9.0]
88+
89+
Watcher error reports have been removed and replaced with Kibana's <<apm-alerts,alerting and actions>> feature.
90+
To create error alerts with new tool, select **Alerts** - **Create threshold alert** - **Error rate**.
91+
92+
More information on this new feature is available in <<apm-alerts>>.

‎docs/user/index.asciidoc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ include::getting-started.asciidoc[]
66

77
include::setup.asciidoc[]
88

9-
include::monitoring/configuring-monitoring.asciidoc[]
9+
include::monitoring/configuring-monitoring.asciidoc[leveloffset=+1]
10+
include::monitoring/monitoring-metricbeat.asciidoc[leveloffset=+2]
11+
include::monitoring/viewing-metrics.asciidoc[leveloffset=+2]
12+
include::monitoring/monitoring-kibana.asciidoc[leveloffset=+2]
1013

1114
include::security/securing-kibana.asciidoc[]
1215

‎docs/user/monitoring/beats-details.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[beats-page]]
3-
== Beats Monitoring Metrics
3+
= Beats Monitoring Metrics
44
++++
55
<titleabbrev>Beats Metrics</titleabbrev>
66
++++

‎docs/user/monitoring/cluster-alerts-license.asciidoc‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎docs/user/monitoring/cluster-alerts.asciidoc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[cluster-alerts]]
3-
== Cluster Alerts
3+
= Cluster Alerts
44

55
The *Stack Monitoring > Clusters* page in {kib} summarizes the status of your
66
{stack}. You can drill down into the metrics to view more information about your
@@ -39,11 +39,12 @@ valid for 30 days.
3939
The {monitor-features} check the cluster alert conditions every minute. Cluster
4040
alerts are automatically dismissed when the condition is resolved.
4141

42-
include::cluster-alerts-license.asciidoc[]
42+
NOTE: {watcher} must be enabled to view cluster alerts. If you have a Basic
43+
license, Top Cluster Alerts are not displayed.
4344

4445
[float]
4546
[[cluster-alert-email-notifications]]
46-
==== Email Notifications
47+
== Email Notifications
4748
To receive email notifications for the Cluster Alerts:
4849

4950
. Configure an email account as described in

‎docs/user/monitoring/configuring-monitoring.asciidoc‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[configuring-monitoring]]
3-
== Configure monitoring in {kib}
3+
= Configure monitoring in {kib}
44
++++
55
<titleabbrev>Configure monitoring</titleabbrev>
66
++++
@@ -16,7 +16,3 @@ You can also use {kib} to
1616

1717
To learn about monitoring in general, see
1818
{ref}/monitor-elasticsearch-cluster.html[Monitor a cluster].
19-
20-
include::monitoring-metricbeat.asciidoc[]
21-
include::viewing-metrics.asciidoc[]
22-
include::monitoring-kibana.asciidoc[]

‎docs/user/monitoring/dashboards.asciidoc‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎docs/user/monitoring/elasticsearch-details.asciidoc‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[elasticsearch-metrics]]
3-
== {es} Monitoring Metrics
3+
= {es} Monitoring Metrics
44
[subs="attributes"]
55
++++
66
<titleabbrev>{es} Metrics</titleabbrev>
@@ -18,7 +18,7 @@ See also {ref}/monitor-elasticsearch-cluster.html[Monitor a cluster].
1818

1919
[float]
2020
[[cluster-overview-page]]
21-
==== Cluster Overview
21+
== Cluster Overview
2222

2323
To view the key metrics that indicate the overall health of an {es} cluster,
2424
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.
4444

4545
[float]
4646
[[nodes-page]]
47-
==== Nodes
47+
== Nodes
4848

4949
To view node metrics, click **Nodes**. The Nodes section shows the status
5050
of each node in your cluster.
@@ -54,7 +54,7 @@ image::user/monitoring/images/monitoring-nodes.png["Elasticsearch Nodes"]
5454

5555
[float]
5656
[[nodes-page-overview]]
57-
===== Node Overview
57+
=== Node Overview
5858

5959
Click the name of a node to view its node statistics over time. These represent
6060
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"]
6666

6767
[float]
6868
[[nodes-page-advanced]]
69-
===== Node Advanced
69+
=== Node Advanced
7070

7171
To view advanced node metrics, click the **Advanced** tab for a node. The
7272
*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.
8181

8282
[float]
8383
[[indices-overview-page]]
84-
==== Indices
84+
== Indices
8585

8686
To view index metrics, click **Indices**. The Indices section shows the same
8787
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"]
9191

9292
[float]
9393
[[indices-page-overview]]
94-
===== Index Overview
94+
=== Index Overview
9595

9696
From the Indices listing, you can view data for a particular index. To drill
9797
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
101101

102102
[float]
103103
[[indices-page-advanced]]
104-
===== Index Advanced
104+
=== Index Advanced
105105

106106
To view advanced index metrics, click the **Advanced** tab for an index. The
107107
*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.
116116

117117
[float]
118118
[[jobs-page]]
119-
==== Jobs
119+
== Jobs
120120

121121
To view {ml} job metrics, click **Jobs**. For each job in your cluster, it shows
122122
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="
127127

128128
[float]
129129
[[ccr-overview-page]]
130-
==== CCR
130+
== CCR
131131

132132
To view {ccr} metrics, click **CCR**. For each follower index on the cluster, it
133133
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}].
149149

150150
[float]
151151
[[logs-monitor-page]]
152-
==== Logs
152+
== Logs
153153

154154
If you use {filebeat} to collect log data from your cluster, you can see its
155155
recent logs in the *Stack Monitoring* application. The *Clusters* page lists the

0 commit comments

Comments
 (0)