Skip to content

Commit bbfa552

Browse files
committed
docs: update APM links (elastic#1181)
* docs: update APM links * docs: change includes
1 parent 21c1a40 commit bbfa552

File tree

6 files changed

+12
-21
lines changed

6 files changed

+12
-21
lines changed

docs/en/observability/apm.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ ifeval::["{is-current-version}"=="false"]
2929
image::images/apm-app-landing.png[APM app in Kibana]
3030
endif::[]
3131

32-
To learn more, see {apm-overview-ref-v}[APM Overview].
32+
To learn more, see {apm-guide-ref}/index.html[APM Overview].

docs/en/observability/ingest-traces.asciidoc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<titleabbrev>Ingest traces</titleabbrev>
66
++++
77

8-
experimental::[]
9-
108
This guide describes how to:
119

1210
* Collect Application Performance Monitoring (APM) data
@@ -19,9 +17,6 @@ For feedback and questions, please contact us in the {forum}[discuss forum].
1917
[[fleet-prereqs-traces]]
2018
== Prerequisites
2119

22-
* The APM integration is experimental and has a number of known limitations.
23-
Please read the list of {apm-server-ref-v}/apm-integration.html[known limitations].
24-
2520
* You need {es} for storing and searching your data, and {kib} for visualizing and
2621
managing it. You can use our
2722
{ess-product}[hosted {ess}]
@@ -146,7 +141,7 @@ TIP: You can edit your APM integration settings if you need to change the APM Se
146141
or secret token to match your APM agents.
147142

148143
--
149-
include::{apm-repo-dir}/tab-widgets/install-agents-widget.asciidoc[]
144+
include::{apm-repo-dir}/legacy/tab-widgets/install-agents-widget.asciidoc[]
150145
--
151146

152147
[discrete]
@@ -159,7 +154,7 @@ You should see application performance monitoring data flowing into the {stack}!
159154
NOTE: The built-in `apm_user` role is not compatible with the APM integration
160155
as it only provides read access to `apm-*` indices.
161156
For a list of indices users need access to, refer to
162-
{apm-server-ref-v}/apm-integration-data-streams.html[APM data streams]
157+
{apm-guide-ref}/apm-data-streams.html[APM data streams]
163158

164159
[role="screenshot"]
165160
image::images/kibana-apm-sample-data.png[APM app with data]

docs/en/observability/instrument-apps.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ visualizing and managing it, and APM Server. For more information, see <<spin-up
2020
== Step 1: Install APM agents
2121

2222
:leveloffset: -1
23-
include::{apm-repo-dir}/guide/install-and-run.asciidoc[tag=apm-agent]
23+
include::{apm-repo-dir}/apm-quick-start.asciidoc[tag=apm-agent]
2424
:leveloffset: +1
2525

2626
--
27-
include::{apm-repo-dir}/tab-widgets/install-agents-widget.asciidoc[]
27+
include::{apm-repo-dir}/legacy/tab-widgets/install-agents-widget.asciidoc[]
2828
--
2929

3030
[discrete]
@@ -39,14 +39,14 @@ Luckily, there are many different ways to tweak and tune the Elastic ecosystem t
3939
*Configure APM Agents*
4040

4141
--
42-
include::{apm-repo-dir}/tab-widgets/configure-agent-widget.asciidoc[]
42+
include::{apm-repo-dir}/legacy/tab-widgets/configure-agent-widget.asciidoc[]
4343
--
4444

4545
[[configure-elastic-cloud]]
4646
*Configure APM Server*
4747

4848
--
49-
include::{apm-repo-dir}/tab-widgets/configure-server-widget.asciidoc[]
49+
include::{apm-repo-dir}/legacy/tab-widgets/configure-server-widget.asciidoc[]
5050
--
5151

5252
[discrete]

docs/en/observability/monitor-k8s/monitor-k8s-application-performance.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ Useful when all pods in a node should share a single APM Server instance.
3434
* Deploy APM Server as a sidecar -- For environments that should not share an APM Server,
3535
like when directing traces from multiple applications to separate {es} clusters.
3636
37-
* {apm-server-ref-v}/installing.html[Download and install APM Server] -- The classic, non-Kubernetes option.
37+
* {apm-guide-ref}/apm-quick-start.html[Download and install APM Server] -- The classic, non-Kubernetes option.
3838
====
3939

4040
[discrete]
4141
=== Step 2: Save your secret token
4242

43-
A {apm-server-ref-v}/secret-token.html[secret token] is used to secure communication between APM agents
43+
A {apm-guide-ref}/input-apm.html[secret token] is used to secure communication between APM agents
4444
and APM Server. On the {ecloud} deployment page, select *APM* and copy your APM Server secret token.
4545
To avoid exposing the secret token, you can store it in a Kubernetes secret. For example:
4646

@@ -51,7 +51,7 @@ kubectl create secret generic apm-secret --from-literal=ELASTIC_APM_SECRET_TOKEN
5151
<1> Create the secret in the same namespace that you'll be deploying your applications in.
5252

5353
If you're managing APM Server yourself,
54-
see {apm-server-ref-v}/secret-token.html[secret token] for instructions on how to set up your secret token.
54+
see {apm-guide-ref}/input-apm.html[secret token] for instructions on how to set up your secret token.
5555

5656
If you are using ECK to set up APM Server, the operator automatically generates an `{APM-server-name}-apm-token` secret for you.
5757

docs/en/shared/configure-apm-server/content.asciidoc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ Full details are available in the {cloud}/ec-manage-apm-settings.html[APM user s
1010
// tag::self-managed[]
1111

1212
If you've installed APM Server yourself, you can edit the `apm-server.yml` configuration file to make changes.
13-
More information is available in {apm-server-ref-v}/configuring-howto-apm-server.html[configuring APM Server].
14-
15-
Don't forget to also read about
16-
{apm-server-ref-v}/securing-apm-server.html[securing APM Server], and
17-
{apm-server-ref-v}/monitoring.html[monitoring APM Server].
13+
More information is available in {apm-guide-ref}/input-apm.html[configuring APM Server].
1814

1915
// end::self-managed[]

docs/en/shared/spin-up-the-stack/content.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ version of {es}, {kib}, and APM Server.
1010

1111
. {stack-gs}/get-started-elastic-stack.html#install-elasticsearch[Install {es}]
1212
. {stack-gs}/get-started-elastic-stack.html#install-kibana[Install Kibana]
13-
. {apm-server-ref-v}/installing.html[Install APM server]
13+
. {apm-guide-ref}/apm-quick-start.html[Install APM server]
1414

1515
// end::self-managed[]

0 commit comments

Comments
 (0)