Skip to content

Commit 32e4692

Browse files
authored
Rewrite APM get started docs (elastic#2310)
Fixes elastic#2309
1 parent 7fab2f5 commit 32e4692

28 files changed

+143
-598
lines changed

redirects.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ redirects:
1313
'solutions/observability/apps.md': 'solutions/observability/applications/index.md'
1414
'solutions/observability/apps/application-performance-monitoring-apm.md': 'solutions/observability/apm/index.md'
1515
'solutions/observability/apps/get-started-with-apm.md': 'solutions/observability/apm/get-started.md'
16-
'solutions/observability/apps/get-started-apm-serverless.md': 'solutions/observability/apm/get-started-serverless.md'
17-
'solutions/observability/apps/fleet-managed-apm-server.md': 'solutions/observability/apm/get-started-fleet-managed-apm-server.md'
18-
'solutions/observability/apps/apm-server-binary.md': 'solutions/observability/apm/get-started-apm-server-binary.md'
16+
'solutions/observability/apps/get-started-apm-serverless.md': 'solutions/observability/apm/get-started.md'
17+
'solutions/observability/apps/fleet-managed-apm-server.md': 'reference/fleet/get-started-managed-apm-server.md'
18+
'solutions/observability/apps/apm-server-binary.md': 'reference/fleet/get-started-apm-server-binary.md'
1919
'solutions/observability/apps/learn-about-application-data-types.md': 'solutions/observability/apm/data-types.md'
2020
'solutions/observability/apps/spans.md': 'solutions/observability/apm/spans.md'
2121
'solutions/observability/apps/transactions.md': 'solutions/observability/apm/transactions.md'
@@ -294,4 +294,9 @@ redirects:
294294
'solutions/search/retrievers-examples.md': 'elasticsearch://reference/elasticsearch/rest-apis/retrievers/retrievers-examples.md'
295295

296296
# Related to https://github.com/elastic/docs-content/pull/2136
297-
'deploy-manage/security/fips-140-2.md': 'deploy-manage/security/fips.md'
297+
'deploy-manage/security/fips-140-2.md': 'deploy-manage/security/fips.md'
298+
299+
# Related to
300+
'solutions/observability/apm/get-started-serverless.md': 'solutions/observability/apm/get-started.md'
301+
'solutions/observability/apm/get-started-fleet-managed-apm-server.md': 'reference/fleet/get-started-managed-apm-server.md'
302+
'solutions/observability/apm/get-started-apm-server-binary.md': 'reference/fleet/get-started-apm-server-binary.md'

reference/apm/observability/apm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Metrics are another vital source of information when debugging production system
2121

2222
## Give Elastic APM a try [_give_elastic_apm_a_try]
2323

24-
Use [Get started with application traces and APM](/solutions/observability/apm/get-started-fleet-managed-apm-server.md) to quickly spin up an APM deployment. Want to host everything yourself instead? See [Get started](/solutions/observability/apm/get-started.md).
24+
Use [Fleet-managed APM Server](/reference/fleet/get-started-managed-apm-server.md) to quickly spin up an APM deployment. Want to host everything yourself instead? See [Get started for APM](/solutions/observability/apm/get-started.md).
2525

2626

2727

solutions/observability/apm/get-started-apm-server-binary.md renamed to reference/fleet/get-started-apm-server-binary.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ You’ll need:
2323

2424
We recommend you use the same version of {{es}}, {{kib}}, and APM Server. See [Installing the {{stack}}](/get-started/the-stack.md) for more information about installing these products.
2525

26-
:::{image} /solutions/images/observability-apm-architecture-diy.png
26+
:::{image} /reference/fleet/images/observability-apm-architecture-diy.png
2727
:alt: Install Elastic APM yourself
2828
:::
2929

@@ -746,7 +746,7 @@ For more information on how to combine Elastic and OpenTelemetry, see [OpenTelem
746746
747747
Once you have at least one {{apm-agent}} sending data to APM Server, you can start visualizing your data in the [{{kib}} Applications UI](/solutions/observability/apm/overviews.md).
748748
749-
:::{image} /solutions/images/observability-kibana-apm-sample-data.png
749+
:::{image} /reference/fleet/images/observability-kibana-apm-sample-data.png
750750
:alt: Applications UI with data
751751
:screenshot:
752752
:::

solutions/observability/apm/get-started-fleet-managed-apm-server.md renamed to reference/fleet/get-started-managed-apm-server.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ products:
1010

1111
# Fleet-managed APM Server [get-started-with-fleet-apm-server]
1212

13+
Fleet is a web-based UI in {{kib}} that is used to centrally manage {{agent}}s. In this deployment model, use {{agent}} to spin up APM Server instances that can be centrally-managed in a custom-curated user interface.
14+
15+
:::{image} /reference/fleet/images/observability-fm-ov.png
16+
:alt: APM Server fleet overview
17+
1318
This guide will explain how to set up and configure a Fleet-managed APM Server.
1419

1520
## Prerequisites [_prerequisites_6]
@@ -71,7 +76,7 @@ You can install only a single {{agent}} per host, which means you cannot run {{f
7176
4. Save and apply the settings.
7277
5. Click the **Agents** tab and follow the in-product instructions to add a {{fleet}} server:
7378

74-
:::{image} /solutions/images/observability-add-fleet-server.png
79+
:::{image} /reference/fleet/images/observability-add-fleet-server.png
7580
:alt: In-product instructions for adding a {{fleet-server}}
7681
:screenshot:
7782
:::
@@ -110,14 +115,14 @@ If you don’t have a {{fleet}} setup already in place, the easiest way to get s
110115
1. In {{kib}}, find **Integrations** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
111116
2. Select **Elastic APM**.
112117

113-
:::{image} /solutions/images/observability-kibana-fleet-integrations-apm.png
118+
:::{image} /reference/fleet/images/observability-kibana-fleet-integrations-apm.png
114119
:alt: {{fleet}} showing APM integration
115120
:screenshot:
116121
:::
117122

118123
3. Click **Add Elastic APM**.
119124

120-
:::{image} /solutions/images/observability-kibana-fleet-integrations-apm-overview.png
125+
:::{image} /reference/fleet/images/observability-kibana-fleet-integrations-apm-overview.png
121126
:alt: {{fleet}} showing APM integration overview
122127
:screenshot:
123128
:::
@@ -132,7 +137,7 @@ If you don’t have a {{fleet}} setup already in place, the easiest way to get s
132137
6. Click **Save and continue**. This step takes a minute or two to complete. When it’s done, you’ll have an agent policy that contains an APM integration policy for the configuration you just specified.
133138
7. To view the new policy, click **Agent policy 1**.
134139

135-
:::{image} /solutions/images/observability-apm-agent-policy-1.png
140+
:::{image} /reference/fleet/images/observability-apm-agent-policy-1.png
136141
:alt: {{fleet}} showing apm policy
137142
:screenshot:
138143
:::
@@ -787,7 +792,7 @@ For more information on how to combine Elastic and OpenTelemetry, see [OpenTelem
787792
788793
Back in {{kib}}, under {{observability}}, select APM. You should see application performance monitoring data flowing into the {{stack}}!
789794
790-
:::{image} /solutions/images/observability-kibana-apm-sample-data.png
795+
:::{image} /reference/fleet/images/observability-kibana-apm-sample-data.png
791796
:alt: Applications UI with data
792797
:screenshot:
793798
:::

0 commit comments

Comments
 (0)