Skip to content

Commit

Permalink
docs: [7.x][apm] link to master in n.x branches (elastic#56539)
Browse files Browse the repository at this point in the history
  • Loading branch information
bmorelli25 committed May 11, 2020
1 parent c85a363 commit 659edb9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
9 changes: 9 additions & 0 deletions docs/Versions.asciidoc
Expand Up @@ -73,3 +73,12 @@ Shared attribute values are pulled from elastic/docs
///////

include::{asciidoc-dir}/../../shared/attributes.asciidoc[]

///////
APM does not build n.x documentation. Links from .x branches should point to master instead
///////
ifeval::["{source_branch}"=="7.x"]
:apm-server-ref: {apm-server-ref-m}
:apm-server-ref-v: {apm-server-ref-m}
:apm-overview-ref-v: {apm-overview-ref-m}
endif::[]
Expand Up @@ -179,7 +179,7 @@ for these users.
The `apm_system` user is used internally within APM when monitoring is enabled.

To enable this feature in APM, you need to update the
{apm-server-ref-70}/configuring-howto-apm-server.html[APM configuration file] to
{apm-server-ref-v}/configuring-howto-apm-server.html[APM configuration file] to
reference the correct username and password. For example:

[source,yaml]
Expand All @@ -188,7 +188,7 @@ xpack.monitoring.elasticsearch.username: apm_system
xpack.monitoring.elasticsearch.password: apmserverpassword
----------------------------------------------------------

See {apm-server-ref-70}/monitoring.html[Monitoring APM Server].
See {apm-server-ref-v}/monitoring.html[Monitoring APM Server].

If you have upgraded from an older version of {es}, then you may not have set a
password for the `apm_system` user. If this is the case,
Expand Down

0 comments on commit 659edb9

Please sign in to comment.