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][7.1] Remove arbitrary python expressions #2595

Merged
merged 2 commits into from
Aug 20, 2019
Merged

[docs][7.1] Remove arbitrary python expressions #2595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56adcc6
docs: remove arbitrary python expressions
bmorelli25 Aug 20, 2019
f82b76f
docs: one more
bmorelli25 Aug 20, 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 @@ -92,7 +92,7 @@ ifeval::[("{beatname_lc}"=="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}.
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
10 changes: 5 additions & 5 deletions docs/copied-from-beats/shared-docker.asciidoc
View file
Open in desktop
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