From 232860888657d798d575f7928791cab31667b63e Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 9 Apr 2019 07:13:33 -0700 Subject: [PATCH] Updating config files with new direct x-pack monitoring settings (#11677) Beats now have the ability to send their monitoring data directly to the **monitoring** Elasticsearch cluster (#9260). This PR updates the default and reference configuration files for all Beats with the new monitoring settings. It also updates the configuration template used by Central Management. --- journalbeat.reference.yml | 22 ++++++++++++---------- journalbeat.yml | 14 ++++++++------ 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/journalbeat.reference.yml b/journalbeat.reference.yml index 00a03fae29a..49e6c4b4031 100644 --- a/journalbeat.reference.yml +++ b/journalbeat.reference.yml @@ -1117,20 +1117,22 @@ logging.files: #logging.json: false -#============================== Xpack Monitoring ===================================== -# journalbeat can export internal metrics to a central Elasticsearch monitoring cluster. -# This requires xpack monitoring to be enabled in Elasticsearch. -# The reporting is disabled by default. +#============================== Xpack Monitoring =============================== +# journalbeat can export internal metrics to a central Elasticsearch monitoring +# cluster. This requires xpack monitoring to be enabled in Elasticsearch. The +# reporting is disabled by default. # Set to true to enable the monitoring reporter. -#xpack.monitoring.enabled: false +#monitoring.enabled: false # Uncomment to send the metrics to Elasticsearch. Most settings from the -# Elasticsearch output are accepted here as well. Any setting that is not set is -# automatically inherited from the Elasticsearch output configuration, so if you -# have the Elasticsearch output configured, you can simply uncomment the -# following line, and leave the rest commented out. -#xpack.monitoring.elasticsearch: +# Elasticsearch output are accepted here as well. +# Note that the settings should point to your Elasticsearch *monitoring* cluster. +# Any setting that is not set is automatically inherited from the Elasticsearch +# output configuration, so if you have the Elasticsearch output configured such +# that it is pointing to your Elasticsearch monitoring cluster, you can simply +# uncomment the following line. +#monitoring.elasticsearch: # Array of hosts to connect to. # Scheme and port can be left out and will be set to the default (http and 9200) diff --git a/journalbeat.yml b/journalbeat.yml index 4807e40f995..bcbf0fc30f0 100644 --- a/journalbeat.yml +++ b/journalbeat.yml @@ -163,14 +163,16 @@ processors: # reporting is disabled by default. # Set to true to enable the monitoring reporter. -#xpack.monitoring.enabled: false +#monitoring.enabled: false # Uncomment to send the metrics to Elasticsearch. Most settings from the -# Elasticsearch output are accepted here as well. Any setting that is not set is -# automatically inherited from the Elasticsearch output configuration, so if you -# have the Elasticsearch output configured, you can simply uncomment the -# following line. -#xpack.monitoring.elasticsearch: +# Elasticsearch output are accepted here as well. +# Note that the settings should point to your Elasticsearch *monitoring* cluster. +# Any setting that is not set is automatically inherited from the Elasticsearch +# output configuration, so if you have the Elasticsearch output configured such +# that it is pointing to your Elasticsearch monitoring cluster, you can simply +# uncomment the following line. +#monitoring.elasticsearch: #================================= Migration ==================================