honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docs: [7.x][apm] link to master in n.x branches (#56539)

This commit is contained in:
Brandon Morelli 2020-05-11 13:42:37 -07:00 committed by GitHub
parent c85a363b60
commit 659edb92ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/Versions.asciidoc
View File

@ -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::[]

4
x-pack/docs/en/security/authentication/built-in-users.asciidoc
View File

@ -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]
@ -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,