From 8f69f90f53fe4dd33bb7fae6277e05516b078ae5 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 5 Apr 2019 14:01:45 -0700 Subject: [PATCH 1/2] Updating monitoring docs with direct monitoring configuration --- .../docs/monitoring/monitoring-beats.asciidoc | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libbeat/docs/monitoring/monitoring-beats.asciidoc b/libbeat/docs/monitoring/monitoring-beats.asciidoc index 112adcb1e1a..2b84ada422e 100644 --- a/libbeat/docs/monitoring/monitoring-beats.asciidoc +++ b/libbeat/docs/monitoring/monitoring-beats.asciidoc @@ -33,32 +33,31 @@ information, see {xpack-ref}/setting-up-authentication.html[Setting Up User Authentication] and {xpack-ref}/built-in-roles.html[Built-in Roles]. -. Add the `xpack.monitoring` settings in the {beatname_uc} configuration file. If you -configured {es} output, specify the following minimal configuration: +. Add the `monitoring` settings in the {beatname_uc} configuration file. If you +configured the {es} output and want to send {beatname_uc} monitoring events to +the same {es} cluster, specify the following minimal configuration: + -- [source, yml] -------------------- -xpack.monitoring.enabled: true +monitoring.enabled: true -------------------- -If you configured a different output, such as {ls}, you must specify additional -configuration options. For example: +If you configured a different output, such as {ls} or you want to send {beatname_uc} +monitoring events to a separate {es} cluster (referred to as the _monitoring cluster_), +you must specify additional configuration options. For example: ["source","yml",subs="attributes"] -------------------- -xpack.monitoring: +monitoring: enabled: true elasticsearch: - hosts: ["https://example.com:9200", "https://example2.com:9200"] + hosts: ["https://example.com:9200", "https://example2.com:9200"] <1> username: {beat_monitoring_user} password: somepassword -------------------- - -NOTE: Currently you must send monitoring data to the same cluster as all other events. -If you configured {es} output, do not specify additional hosts in the monitoring -configuration. - +<1> This setting identifies the hosts and port numbers of {es} nodes +that are part of the monitoring cluster. -- . {kibana-ref}/monitoring-xpack-kibana.html[Configure monitoring in {kib}]. From 77d49abeef34e06e9f49098627f4b8bdb36a5a87 Mon Sep 17 00:00:00 2001 From: lcawl Date: Fri, 5 Apr 2019 14:50:15 -0700 Subject: [PATCH 2/2] [DOCS] Fixes outdated terms and links --- libbeat/docs/monitoring/monitoring-beats.asciidoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libbeat/docs/monitoring/monitoring-beats.asciidoc b/libbeat/docs/monitoring/monitoring-beats.asciidoc index 2b84ada422e..f9dee1ed6f6 100644 --- a/libbeat/docs/monitoring/monitoring-beats.asciidoc +++ b/libbeat/docs/monitoring/monitoring-beats.asciidoc @@ -17,11 +17,11 @@ [partintro] -- -NOTE: {monitoring} for {beatname_uc} requires {es} {beat_monitoring_version} or later. +NOTE: The {monitor-features} for {beatname_uc} require {es} {beat_monitoring_version} or later. -{monitoring} enables you to easily monitor {beatname_uc} from {kib}. For more +The {stack} {monitor-features} enable you to easily monitor {beatname_uc} from {kib}. For more information, see -{xpack-ref}/xpack-monitoring.html[Monitoring the Elastic Stack] and +{stack-ov}/xpack-monitoring.html[Monitoring the {stack}] and {kibana-ref}/beats-page.html[Beats Monitoring Metrics]. To configure {beatname_uc} to collect and send monitoring metrics: @@ -30,8 +30,8 @@ To configure {beatname_uc} to collect and send monitoring metrics: data to {es}. For example, you can use the built-in +{beat_monitoring_user}+ user or assign the built-in +{beat_monitoring_user}+ role to another user. For more information, see -{xpack-ref}/setting-up-authentication.html[Setting Up User Authentication] and -{xpack-ref}/built-in-roles.html[Built-in Roles]. +{stack-ov}/setting-up-authentication.html[Setting Up User Authentication] and +{stack-ov}/built-in-roles.html[Built-in Roles]. . Add the `monitoring` settings in the {beatname_uc} configuration file. If you configured the {es} output and want to send {beatname_uc} monitoring events to