From 1866582fa5db33d7dc7e409b92da461659fad139 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 19 Oct 2021 12:28:28 -0700 Subject: [PATCH 1/2] docs: update APM links --- docs/en/observability/apm.asciidoc | 2 +- docs/en/observability/ingest-traces.asciidoc | 7 +------ .../monitor-k8s-application-performance.asciidoc | 6 +++--- docs/en/shared/configure-apm-server/content.asciidoc | 6 +----- docs/en/shared/spin-up-the-stack/content.asciidoc | 2 +- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/docs/en/observability/apm.asciidoc b/docs/en/observability/apm.asciidoc index eab506db25..c024ef9647 100644 --- a/docs/en/observability/apm.asciidoc +++ b/docs/en/observability/apm.asciidoc @@ -29,4 +29,4 @@ ifeval::["{is-current-version}"=="false"] image::images/apm-app-landing.png[APM app in Kibana] endif::[] -To learn more, see {apm-overview-ref-v}[APM Overview]. +To learn more, see {apm-guide-ref}/index.html[APM Overview]. diff --git a/docs/en/observability/ingest-traces.asciidoc b/docs/en/observability/ingest-traces.asciidoc index 7170dffec6..bfc487d117 100644 --- a/docs/en/observability/ingest-traces.asciidoc +++ b/docs/en/observability/ingest-traces.asciidoc @@ -5,8 +5,6 @@ Ingest traces ++++ -experimental::[] - This guide describes how to: * Collect Application Performance Monitoring (APM) data @@ -19,9 +17,6 @@ For feedback and questions, please contact us in the {forum}[discuss forum]. [[fleet-prereqs-traces]] == Prerequisites -* The APM integration is experimental and has a number of known limitations. -Please read the list of {apm-server-ref-v}/apm-integration.html[known limitations]. - * You need {es} for storing and searching your data, and {kib} for visualizing and managing it. You can use our {ess-product}[hosted {ess}] @@ -159,7 +154,7 @@ You should see application performance monitoring data flowing into the {stack}! NOTE: The built-in `apm_user` role is not compatible with the APM integration as it only provides read access to `apm-*` indices. For a list of indices users need access to, refer to -{apm-server-ref-v}/apm-integration-data-streams.html[APM data streams] +{apm-guide-ref}/apm-data-streams.html[APM data streams] [role="screenshot"] image::images/kibana-apm-sample-data.png[APM app with data] diff --git a/docs/en/observability/monitor-k8s/monitor-k8s-application-performance.asciidoc b/docs/en/observability/monitor-k8s/monitor-k8s-application-performance.asciidoc index 67561bd083..fe99e6e6f7 100644 --- a/docs/en/observability/monitor-k8s/monitor-k8s-application-performance.asciidoc +++ b/docs/en/observability/monitor-k8s/monitor-k8s-application-performance.asciidoc @@ -34,13 +34,13 @@ Useful when all pods in a node should share a single APM Server instance. * Deploy APM Server as a sidecar -- For environments that should not share an APM Server, like when directing traces from multiple applications to separate {es} clusters. -* {apm-server-ref-v}/installing.html[Download and install APM Server] -- The classic, non-Kubernetes option. +* {apm-guide-ref}/apm-quick-start.html[Download and install APM Server] -- The classic, non-Kubernetes option. ==== [discrete] === Step 2: Save your secret token -A {apm-server-ref-v}/secret-token.html[secret token] is used to secure communication between APM agents +A {apm-guide-ref}/input-apm.html[secret token] is used to secure communication between APM agents and APM Server. On the {ecloud} deployment page, select *APM* and copy your APM Server secret token. To avoid exposing the secret token, you can store it in a Kubernetes secret. For example: @@ -51,7 +51,7 @@ kubectl create secret generic apm-secret --from-literal=ELASTIC_APM_SECRET_TOKEN <1> Create the secret in the same namespace that you'll be deploying your applications in. If you're managing APM Server yourself, -see {apm-server-ref-v}/secret-token.html[secret token] for instructions on how to set up your secret token. +see {apm-guide-ref}/input-apm.html[secret token] for instructions on how to set up your secret token. If you are using ECK to set up APM Server, the operator automatically generates an `{APM-server-name}-apm-token` secret for you. diff --git a/docs/en/shared/configure-apm-server/content.asciidoc b/docs/en/shared/configure-apm-server/content.asciidoc index 2e56a1007b..45a86ff82c 100644 --- a/docs/en/shared/configure-apm-server/content.asciidoc +++ b/docs/en/shared/configure-apm-server/content.asciidoc @@ -10,10 +10,6 @@ Full details are available in the {cloud}/ec-manage-apm-settings.html[APM user s // tag::self-managed[] If you've installed APM Server yourself, you can edit the `apm-server.yml` configuration file to make changes. -More information is available in {apm-server-ref-v}/configuring-howto-apm-server.html[configuring APM Server]. - -Don't forget to also read about -{apm-server-ref-v}/securing-apm-server.html[securing APM Server], and -{apm-server-ref-v}/monitoring.html[monitoring APM Server]. +More information is available in {apm-guide-ref}/input-apm.html[configuring APM Server]. // end::self-managed[] \ No newline at end of file diff --git a/docs/en/shared/spin-up-the-stack/content.asciidoc b/docs/en/shared/spin-up-the-stack/content.asciidoc index e5a4d9ad0c..140d0ee352 100644 --- a/docs/en/shared/spin-up-the-stack/content.asciidoc +++ b/docs/en/shared/spin-up-the-stack/content.asciidoc @@ -10,6 +10,6 @@ version of {es}, {kib}, and APM Server. . {stack-gs}/get-started-elastic-stack.html#install-elasticsearch[Install {es}] . {stack-gs}/get-started-elastic-stack.html#install-kibana[Install Kibana] -. {apm-server-ref-v}/installing.html[Install APM server] +. {apm-guide-ref}/apm-quick-start.html[Install APM server] // end::self-managed[] \ No newline at end of file From 90f35c2a120c1e172ae4338fda5f24613ef84025 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Wed, 27 Oct 2021 15:59:57 -0700 Subject: [PATCH 2/2] docs: change includes --- docs/en/observability/ingest-traces.asciidoc | 2 +- docs/en/observability/instrument-apps.asciidoc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/en/observability/ingest-traces.asciidoc b/docs/en/observability/ingest-traces.asciidoc index bfc487d117..b085bafe41 100644 --- a/docs/en/observability/ingest-traces.asciidoc +++ b/docs/en/observability/ingest-traces.asciidoc @@ -141,7 +141,7 @@ TIP: You can edit your APM integration settings if you need to change the APM Se or secret token to match your APM agents. -- -include::{apm-repo-dir}/tab-widgets/install-agents-widget.asciidoc[] +include::{apm-repo-dir}/legacy/tab-widgets/install-agents-widget.asciidoc[] -- [discrete] diff --git a/docs/en/observability/instrument-apps.asciidoc b/docs/en/observability/instrument-apps.asciidoc index fb413339d6..a97561a370 100644 --- a/docs/en/observability/instrument-apps.asciidoc +++ b/docs/en/observability/instrument-apps.asciidoc @@ -20,11 +20,11 @@ visualizing and managing it, and APM Server. For more information, see <