diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index e4f535f672f61..92d29a280c12f 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -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::[] diff --git a/x-pack/docs/en/security/authentication/built-in-users.asciidoc b/x-pack/docs/en/security/authentication/built-in-users.asciidoc index f915af95ee911..aeb559439344a 100644 --- a/x-pack/docs/en/security/authentication/built-in-users.asciidoc +++ b/x-pack/docs/en/security/authentication/built-in-users.asciidoc @@ -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,