Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[docs][6.7] Remove arbitrary python expressions #2601

Merged
merged 3 commits into from
Aug 21, 2019
Merged

[docs][6.7] Remove arbitrary python expressions #2601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8d985b
docs: remove complex conditionals
bmorelli25 Aug 20, 2019
da82da7
docs: one more
bmorelli25 Aug 20, 2019
b839224
docs: add apm-server attribute
bmorelli25 Aug 21, 2019
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
4 changes: 2 additions & 2 deletions docs/copied-from-beats/command-reference.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ endif::[]
|<<export-command,`export`>> |{export-command-short-desc}.
|<<help-command,`help`>> |{help-command-short-desc}.
|<<keystore-command,`keystore`>> |{keystore-command-short-desc}.
ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="metricbeat")]
ifndef::apm-server[]
|<<modules-command,`modules`>> |{modules-command-short-desc}.
endif::[]
|<<run-command,`run`>> |{run-command-short-desc}.
Expand Down Expand Up @@ -253,7 +253,7 @@ Shows help for the `keystore` command.
see <<keystore>> for more examples.


ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="metricbeat")]
ifndef::apm-server[]

[[modules-command]]
==== `modules` command
Expand Down
14 changes: 7 additions & 7 deletions docs/copied-from-beats/outputconfig.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/copied-from-beats/shared-path-config.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::[]

Expand Down
1 change: 1 addition & 0 deletions docs/index.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down