From b27ca0143c2aad699d935d7efb16a67bf39c7b21 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 31 Aug 2020 16:57:52 -0700 Subject: [PATCH 1/2] docs: updates to shared beats file --- libbeat/docs/shared/configuring-intro.asciidoc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libbeat/docs/shared/configuring-intro.asciidoc b/libbeat/docs/shared/configuring-intro.asciidoc index e7be5e4f24c..82812c34bd1 100644 --- a/libbeat/docs/shared/configuring-intro.asciidoc +++ b/libbeat/docs/shared/configuring-intro.asciidoc @@ -1,12 +1,14 @@ +ifndef::apm-server[] TIP: To get started quickly, read <<{beatname_lc}-installation-configuration>>. +endif::[] To configure {beatname_uc}, edit the configuration file. The default configuration file is called +{beatname_lc}.yml+. The location of the file -varies by platform. To locate the file, see <>. +varies by platform. To locate the file, see <>. -ifeval::["{beatname_lc}"!="apm-server"] -There’s also a full example configuration file called +{beatname_lc}.reference.yml+ +ifndef::apm-server[] +There’s also a full example configuration file called +{beatname_lc}.reference.yml+ that shows all non-deprecated options. endif::[] From 20e9e0f5cdb2c8238f3d4ab4bec47fc555711aa9 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 31 Aug 2020 17:02:35 -0700 Subject: [PATCH 2/2] docs: fix apm build --- libbeat/docs/howto/load-index-templates.asciidoc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libbeat/docs/howto/load-index-templates.asciidoc b/libbeat/docs/howto/load-index-templates.asciidoc index 0cdd4ed80fb..bd5e249b90c 100644 --- a/libbeat/docs/howto/load-index-templates.asciidoc +++ b/libbeat/docs/howto/load-index-templates.asciidoc @@ -4,7 +4,7 @@ {es} uses {ref}/indices-templates.html[index templates] to define: * Settings that control the behavior of your indices. The settings include the -lifecycle policy used to manage indices as they grow and age. +lifecycle policy used to manage indices as they grow and age. * Mappings that determine how fields are analyzed. Each mapping sets the {ref}/mapping-types.html[{es} datatype] to use for a specific data field. @@ -17,7 +17,7 @@ it's not overwritten unless you configure {beatname_uc} to do so. ifndef::no-output-logstash[] NOTE: A connection to {es} is required to load the index template. If the output is not {es} (or {ess}), you must -<>. +<>. endif::[] This page shows how to change the default template loading behavior to: @@ -83,9 +83,10 @@ The examples here assume that Logstash output is enabled. endif::[] You can omit the `-E` flags if {es} output is already enabled. - +ifndef::apm-server[] If you are connecting to a secured {es} cluster, make sure you've configured credentials as described in the <<{beatname_lc}-installation-configuration>>. +endif::[] If the host running {beatname_uc} does not have direct connectivity to {es}, see <>.