diff --git a/docs/copied-from-beats/command-reference.asciidoc b/docs/copied-from-beats/command-reference.asciidoc index 6cd537acc37..43d6825c4ba 100644 --- a/docs/copied-from-beats/command-reference.asciidoc +++ b/docs/copied-from-beats/command-reference.asciidoc @@ -81,7 +81,7 @@ endif::[] |<> |{export-command-short-desc}. |<> |{help-command-short-desc}. |<> |{keystore-command-short-desc}. -ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="metricbeat")] +ifndef::apm-server[] |<> |{modules-command-short-desc}. endif::[] |<> |{run-command-short-desc}. @@ -253,7 +253,7 @@ Shows help for the `keystore` command. see <> for more examples. -ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="metricbeat")] +ifndef::apm-server[] [[modules-command]] ==== `modules` command diff --git a/docs/copied-from-beats/outputconfig.asciidoc b/docs/copied-from-beats/outputconfig.asciidoc index 61ad03be0de..4383cf4b43f 100644 --- a/docs/copied-from-beats/outputconfig.asciidoc +++ b/docs/copied-from-beats/outputconfig.asciidoc @@ -313,13 +313,13 @@ endif::[] ===== `max_retries` -ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="winlogbeat")] +ifndef::apm-server[] {beatname_uc} ignores the `max_retries` setting and retries indefinitely. endif::[] -ifeval::[("{beatname_lc}"!="filebeat") and ("{beatname_lc}"!="winlogbeat")] +ifdef::apm-server[] The number of times to retry publishing an event after a publishing failure. After the specified number of retries, the events are typically dropped. @@ -588,13 +588,13 @@ The number of seconds to wait for responses from the Logstash server before timi ===== `max_retries` -ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="winlogbeat")] +ifndef::apm-server[] {beatname_uc} ignores the `max_retries` setting and retries indefinitely. endif::[] -ifeval::[("{beatname_lc}"!="filebeat") and ("{beatname_lc}"!="winlogbeat")] +ifdef::apm-server[] The number of times to retry publishing an event after a publishing failure. After the specified number of retries, the events are typically dropped. @@ -800,13 +800,13 @@ brokers, topics, partition, and active leaders to use for publishing. ===== `max_retries` -ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="winlogbeat")] +ifndef::apm-server[] {beatname_uc} ignores the `max_retries` setting and retries indefinitely. endif::[] -ifeval::[("{beatname_lc}"!="filebeat") and ("{beatname_lc}"!="winlogbeat")] +ifdef::apm-server[] The number of times to retry publishing an event after a publishing failure. After the specified number of retries, the events are typically dropped. @@ -1050,7 +1050,7 @@ Redis after a network error. The default is 60s. ===== `max_retries` -ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="winlogbeat")] +ifndef::apm-server[] {beatname_uc} ignores the `max_retries` setting and retries indefinitely. diff --git a/docs/copied-from-beats/shared-path-config.asciidoc b/docs/copied-from-beats/shared-path-config.asciidoc index a5e1bb653c9..9fae4b7014d 100644 --- a/docs/copied-from-beats/shared-path-config.asciidoc +++ b/docs/copied-from-beats/shared-path-config.asciidoc @@ -17,7 +17,7 @@ The `path` section of the +{beatname_lc}.yml+ config file contains configuration options that define where {beatname_uc} looks for its files. For example, {beatname_uc} looks for the Elasticsearch template file in the configuration path and writes log files in the logs path. -ifeval::["{beatname_lc}"=="filebeat" or "{beatname_lc}"=="winlogbeat"] +ifndef::apm-server[] {beatname_uc} looks for its registry files in the data path. endif::[] diff --git a/docs/index.asciidoc b/docs/index.asciidoc index 8e2baed8fe4..f26ea961b4e 100644 --- a/docs/index.asciidoc +++ b/docs/index.asciidoc @@ -19,6 +19,7 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[] :sample_date_2: 2018.05.12 :deprecate_dashboard_loading: 6.4.0 :repo: apm-server +:apm-server: ifdef::env-github[] NOTE: For the best reading experience,