Skip to content

docs: update APM links #1181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 29, 2021
Merged

docs: update APM links #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1866582
docs: update APM links
bmorelli25 Oct 19, 2021
aaafdd1
Merge branch 'master' of github.com:elastic/observability-docs into u…
bmorelli25 Oct 27, 2021
90f35c2
docs: change includes
bmorelli25 Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/en/observability/apm.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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].
9 changes: 2 additions & 7 deletions docs/en/observability/ingest-traces.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<titleabbrev>Ingest traces</titleabbrev>
++++

experimental::[]

This guide describes how to:

* Collect Application Performance Monitoring (APM) data
Expand All @@ -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}]
Expand Down Expand Up @@ -146,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]
Expand All @@ -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]
Expand Down
8 changes: 4 additions & 4 deletions docs/en/observability/instrument-apps.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ visualizing and managing it, and APM Server. For more information, see <<spin-up
== Step 1: Install APM agents

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

--
include::{apm-repo-dir}/tab-widgets/install-agents-widget.asciidoc[]
include::{apm-repo-dir}/legacy/tab-widgets/install-agents-widget.asciidoc[]
--

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

--
include::{apm-repo-dir}/tab-widgets/configure-agent-widget.asciidoc[]
include::{apm-repo-dir}/legacy/tab-widgets/configure-agent-widget.asciidoc[]
--

[[configure-elastic-cloud]]
*Configure APM Server*

--
include::{apm-repo-dir}/tab-widgets/configure-server-widget.asciidoc[]
include::{apm-repo-dir}/legacy/tab-widgets/configure-server-widget.asciidoc[]
--

[discrete]
Expand Down
6 changes: 3 additions & 3 deletions docs/en/observability/monitor-k8s/monitor-k8s-application-performance.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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.

Expand Down
6 changes: 1 addition & 5 deletions docs/en/shared/configure-apm-server/content.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Comment on lines -15 to -17
Copy link
Member Author

@bmorelli25 bmorelli25 Oct 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed as they don't apply to APM Server in 7.16+. More content rework will need to be done in a future PR.

More information is available in {apm-guide-ref}/input-apm.html[configuring APM Server].

// end::self-managed[]
2 changes: 1 addition & 1 deletion docs/en/shared/spin-up-the-stack/content.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]