Skip to content

Commit

Permalink
grammar or stuff that isn’t built to apm-server
Browse files Browse the repository at this point in the history
  • Loading branch information
bmorelli25 committed Apr 28, 2021
1 parent 79d9fb0 commit d77347f
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 13 deletions.
6 changes: 2 additions & 4 deletions docs/copied-from-beats/docs/command-reference.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -704,12 +704,10 @@ the end of the file is reached. By default harvesters are closed after
`close_inactive` is reached.
endif::[]

ifeval::["{beatname_lc}"=="metricbeat"]
*`--system.hostfs MOUNT_POINT`*::

Specifies the mount point of the host's filesystem for use in monitoring a host
from within a container.
endif::[]
Specifies the mount point of the host's filesystem for use in monitoring a host.


ifeval::["{beatname_lc}"=="packetbeat"]
*`-t`*::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,32 @@ For more information, see
<<configuration-monitor,Monitoring configuration options>>.
--

. Configure host (optional). +
+
--
// tag::set-http-host[]
If you intend to get metrics using {metricbeat} installed on another server, you need to bind the {beatname_uc} to host's IP:

[source,yaml]
----------------------------------
http.host: xxx.xxx.xxx.xxx
----------------------------------
// end::set-http-host[]
--

. Configure cluster uuid (optional). +
+
--
// tag::set-cluster-uuid[]
To see the Beats monitoring section in Kibana if you have a cluster, you need to associate the {beatname_uc} with cluster UUID:

[source,yaml]
----------------------------------
monitoring.cluster_uuid: "cluster-uuid"
----------------------------------
// end::set-cluster-uuid[]
--

ifndef::serverless[]
. Start {beatname_uc}.
endif::[]
Expand Down
19 changes: 10 additions & 9 deletions docs/copied-from-beats/docs/shared-docker.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Docker images for {beatname_uc} are available from the Elastic Docker
registry. The base image is https://hub.docker.com/_/centos/[centos:7].

A list of all published Docker images and tags is available at
https://www.docker.elastic.co[www.docker.elastic.co].
https://www.docker.elastic.co[www.docker.elastic.co].

These images are free to use under the Elastic license. They contain open source
and free commercial features and access to paid commercial features.
{kibana-ref}/managing-licenses.html[Start a 30-day trial] to try out all of the
paid commercial features. See the
https://www.elastic.co/subscriptions[Subscriptions] page for information about
These images are free to use under the Elastic license. They contain open source
and free commercial features and access to paid commercial features.
{kibana-ref}/managing-licenses.html[Start a 30-day trial] to try out all of the
paid commercial features. See the
https://www.elastic.co/subscriptions[Subscriptions] page for information about
Elastic license levels.

==== Pull the image
Expand All @@ -34,8 +34,8 @@ docker pull {dockerimage}
------------------------------------------------

Alternatively, you can download other Docker images that contain only features
available under the Apache 2.0 license. To download the images, go to
https://www.docker.elastic.co[www.docker.elastic.co].
available under the Apache 2.0 license. To download the images, go to
https://www.docker.elastic.co[www.docker.elastic.co].

endif::[]

Expand Down Expand Up @@ -129,7 +129,7 @@ endif::apm-server[]
==== Configure {beatname_uc} on Docker

The Docker image provides several methods for configuring {beatname_uc}. The
conventional approach is to provide a configuration file via a volume mount, but
conventional approach is to provide a configuration file via a volume mount, but
it's also possible to create a custom image with your
configuration included.

Expand Down Expand Up @@ -244,6 +244,7 @@ ifeval::["{beatname_lc}"=="apm-server"]
["source", "sh", subs="attributes"]
--------------------------------------------
docker run -d \
-p 8200:8200 \
--name={beatname_lc} \
--user={beatname_lc} \
--volume="$(pwd)/{beatname_lc}.docker.yml:/usr/share/{beatname_lc}/{beatname_lc}.yml:ro" \
Expand Down

0 comments on commit d77347f

Please sign in to comment.