Skip to content

Commit

Permalink
docs: remove arbitrary python expressions
Browse files Browse the repository at this point in the history
  • Loading branch information
bmorelli25 committed Aug 19, 2019
1 parent 57f0429 commit 8b76ab2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions docs/copied-from-beats/command-reference.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -82,31 +82,31 @@ endif::[]
[options="header"]
|=======================
|Commands |
ifeval::[("{beatname_lc}"=="functionbeat")]
ifdef::functionbeat[]
|<<deploy-command,`deploy`>> | {deploy-command-short-desc}.
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}"=="functionbeat")]
ifdef::functionbeat[]
|<<package-command,`package`>> |{package-command-short-desc}.
|<<remove-command,`remove`>> |{remove-command-short-desc}.
endif::[]
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}.
|<<setup-command,`setup`>> |{setup-command-short-desc}.
|<<test-command,`test`>> |{test-command-short-desc}.
ifeval::[("{beatname_lc}"=="functionbeat")]
ifdef::functionbeat[]
|<<update-command,`update`>> |{update-command-short-desc}.
endif::[]
|<<version-command,`version`>> |{version-command-short-desc}.
|=======================

Also see <<global-flags,Global flags>>.

ifeval::[("{beatname_lc}"=="functionbeat")]
ifdef::functionbeat[]
[[deploy-command]]
==== `deploy` command

Expand Down Expand Up @@ -327,7 +327,7 @@ Shows help for the `keystore` command.

See <<keystore>> for more examples.

ifeval::[("{beatname_lc}"=="functionbeat")]
ifdef::functionbeat[]
[[package-command]]
==== `package` command

Expand Down Expand Up @@ -389,7 +389,7 @@ Shows help for the `remove` command.
-----
endif::[]

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

Expand Down Expand Up @@ -721,7 +721,7 @@ ifeval::["{beatname_lc}"=="metricbeat"]
-----
endif::[]

ifeval::[("{beatname_lc}"=="functionbeat")]
ifdef::functionbeat[]
[[update-command]]
==== `update` command

Expand Down
10 changes: 5 additions & 5 deletions docs/copied-from-beats/shared-docker.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ifndef::apm-server[]
Running {beatname_uc} with the setup command will create the index pattern and
load visualizations, dashboards, and machine learning jobs. Run this command:

ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="metricbeat") or ("{beatname_lc}"=="heartbeat") or ("{beatname_lc}"=="journalbeat")]
ifndef::apm-server[]
["source", "sh", subs="attributes"]
--------------------------------------------
docker run \
Expand Down Expand Up @@ -113,7 +113,7 @@ curl -L -O {dockerconfig}
One way to configure {beatname_uc} on Docker is to provide +{beatname_lc}.docker.yml+ via a volume mount.
With +docker run+, the volume mount can be specified like this:

ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="journalbeat")]
ifndef::apm-server[]
["source", "sh", subs="attributes"]
--------------------------------------------
docker run -d \
Expand Down Expand Up @@ -175,7 +175,7 @@ docker run -d \
--------------------------------------------
endif::[]

ifeval::[("{beatname_lc}"=="heartbeat") or ("{beatname_lc}"=="apm-server")]
ifdef::apm-server[]
["source", "sh", subs="attributes"]
--------------------------------------------
docker run -d \
Expand All @@ -195,7 +195,7 @@ using the syntax shown earlier.

===== Customize your configuration

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

The +{beatname_lc}.docker.yml+ file you downloaded earlier is configured to deploy Beats modules based on the Docker labels applied to your containers. See <<configuration-autodiscover-hints>> for more details. Add labels to your application Docker containers, and they will be picked up by the Beats autodiscover feature when they are deployed. Here is an example command for an Apache HTTP Server container with labels to configure the Filebeat and Metricbeat modules for the Apache HTTP Server:

Expand All @@ -216,7 +216,7 @@ docker run \

endif::[]

ifeval::[("{beatname_lc}"!="filebeat") and ("{beatname_lc}"!="metricbeat")]
ifdef::apm-server[]

The +{beatname_lc}.docker.yml+ downloaded earlier should be customized for your environment. See <<configuring-howto-{beatname_lc}>> for more details. Edit the configuration file and customize it to match your environment then re-deploy your {beatname_uc} container.
endif::[]
Expand Down

0 comments on commit 8b76ab2

Please sign in to comment.