Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions docs/reference/monitoring/collecting-monitoring-data.asciidoc
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
[role="xpack"]
[testenv="gold"]
[[collecting-monitoring-data]]
== Collecting monitoring data
== Collecting monitoring data using legacy collectors
++++
<titleabbrev>Legacy collection methods</titleabbrev>
++++

[IMPORTANT]
=========================
{metricbeat} is the recommended method for collecting and shipping monitoring
data to a monitoring cluster.

If you have previously configured internal collection, you should migrate to
using {metricbeat} collection. Use either {metricbeat} collection or
internal collection; do not use both.
If you have previously configured legacy collection methods, you should migrate
to using {metricbeat} collection methods. Use either {metricbeat} collection or
legacy collection methods; do not use both.

Learn more about <<configuring-metricbeat>>.
=========================
Expand Down
6 changes: 3 additions & 3 deletions docs/reference/monitoring/collectors.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
{metricbeat} is the recommended method for collecting and shipping monitoring
data to a monitoring cluster.

If you have previously configured internal collection, you should migrate to
using {metricbeat} collection. Use either {metricbeat} collection or
internal collection; do not use both.
If you have previously configured legacy collection methods, you should migrate
to using {metricbeat} collection methods. Use either {metricbeat} collection or
legacy collection methods; do not use both.

Learn more about <<configuring-metricbeat>>.
=========================
Expand Down
6 changes: 3 additions & 3 deletions docs/reference/monitoring/exporters.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
{metricbeat} is the recommended method for collecting and shipping monitoring
data to a monitoring cluster.

If you have previously configured internal collection, you should migrate to
using {metricbeat} collection. Use either {metricbeat} collection or
internal collection; do not use both.
If you have previously configured legacy collection methods, you should migrate
to using {metricbeat} collection methods. Use either {metricbeat} collection or
legacy collection methods; do not use both.

Learn more about <<configuring-metricbeat>>.
=========================
Expand Down
6 changes: 3 additions & 3 deletions docs/reference/monitoring/http-export.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
{metricbeat} is the recommended method for collecting and shipping monitoring
data to a monitoring cluster.

If you have previously configured internal collection, you should migrate to
using {metricbeat} collection. Use either {metricbeat} collection or
internal collection; do not use both.
If you have previously configured legacy collection methods, you should migrate
to using {metricbeat} collection methods. Use either {metricbeat} collection or
legacy collection methods; do not use both.

Learn more about <<configuring-metricbeat>>.
=========================
Expand Down
12 changes: 5 additions & 7 deletions docs/reference/monitoring/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ performance of your {es} cluster.
* <<monitoring-production>>
* <<configuring-metricbeat>>
* <<configuring-filebeat>>
* <<collecting-monitoring-data>>
* <<config-monitoring-indices>>
* <<es-monitoring-collectors>>
* <<es-monitoring-exporters>>
* <<collecting-monitoring-data>>
* <<monitoring-troubleshooting>>

--
Expand All @@ -27,19 +25,19 @@ include::how-monitoring-works.asciidoc[]

include::production.asciidoc[]

include::collecting-monitoring-data.asciidoc[]
include::pause-export.asciidoc[]

include::configuring-metricbeat.asciidoc[]

include::configuring-filebeat.asciidoc[]

include::indices.asciidoc[]

include::collecting-monitoring-data.asciidoc[]
:leveloffset: +1
include::collectors.asciidoc[]

include::exporters.asciidoc[]
:leveloffset: -1
include::local-export.asciidoc[]
include::http-export.asciidoc[]
include::pause-export.asciidoc[]

include::troubleshooting.asciidoc[]
6 changes: 3 additions & 3 deletions docs/reference/monitoring/local-export.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
{metricbeat} is the recommended method for collecting and shipping monitoring
data to a monitoring cluster.

If you have previously configured internal collection, you should migrate to
using {metricbeat} collection. Use either {metricbeat} collection or
internal collection; do not use both.
If you have previously configured legacy collection methods, you should migrate
to using {metricbeat} collection methods. Use either {metricbeat} collection or
legacy collection methods; do not use both.

Learn more about <<configuring-metricbeat>>.
=========================
Expand Down
22 changes: 11 additions & 11 deletions docs/reference/monitoring/production.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ In production, you should send monitoring data to a separate _monitoring cluster
so that historical data is available even when the nodes you are monitoring are
not. For example, you can use {metricbeat} to ship monitoring data about {kib},
{es}, {ls}, and Beats to the monitoring cluster.
//If you are sending your data to the {esms-init}, see <<esms>>.
If you are sending your data to the {esms-init}, see <<esms>>.

[IMPORTANT]
=========================
{metricbeat} is the recommended method for collecting and shipping monitoring
data to a monitoring cluster.

If you have previously configured internal collection, you should migrate to
using {metricbeat} collection. Use either {metricbeat} collection or
internal collection; do not use both.
If you have previously configured legacy collection methods, you should migrate
to using {metricbeat} collection. Use either {metricbeat} collection or
legacy collection methods; do not use both.

Learn more about <<configuring-metricbeat>>.
=========================

If you have at least a gold license, using a dedicated monitoring cluster also
enables you to monitor multiple clusters from a central location.
If you have at least a Gold Subscription, using a dedicated monitoring cluster
also enables you to monitor multiple clusters from a central location.

To store monitoring data in a separate cluster:

Expand Down Expand Up @@ -99,11 +99,11 @@ Alternatively, use the `remote_monitoring_user` <<built-in-users,built-in user>>
--

. Configure your production cluster to collect data and send it to the
monitoring cluster.
monitoring cluster:

** <<configuring-metricbeat,Use {metricbeat}>>.
** <<configuring-metricbeat,{metricbeat} collection methods>>

** <<collecting-monitoring-data,Use HTTP exporters>>.
** <<collecting-monitoring-data,Legacy collection methods>>

. (Optional)
{logstash-ref}/configuring-logstash.html[Configure {ls} to collect data and send it to the monitoring cluster].
Expand All @@ -119,9 +119,9 @@ cluster.

. (Optional) Configure {kib} to collect data and send it to the monitoring cluster:

** {kibana-ref}/monitoring-metricbeat.html[Use {metricbeat}].
** {kibana-ref}/monitoring-metricbeat.html[{metricbeat} collection methods]

** {kibana-ref}/monitoring-kibana.html[Use HTTP exporters].
** {kibana-ref}/monitoring-kibana.html[Legacy collection methods]

. (Optional) Create a dedicated {kib} instance for monitoring, rather than using
a single {kib} instance to access both your production cluster and monitoring
Expand Down