Rewrite APM get started docs

redirects.yml

@@ -13,9 +13,9 @@ redirects:
   'solutions/observability/apps.md': 'solutions/observability/applications/index.md'
   'solutions/observability/apps/application-performance-monitoring-apm.md': 'solutions/observability/apm/index.md'
   'solutions/observability/apps/get-started-with-apm.md': 'solutions/observability/apm/get-started.md'
-  'solutions/observability/apps/get-started-apm-serverless.md': 'solutions/observability/apm/get-started-serverless.md'
-  'solutions/observability/apps/fleet-managed-apm-server.md': 'solutions/observability/apm/get-started-fleet-managed-apm-server.md'
-  'solutions/observability/apps/apm-server-binary.md': 'solutions/observability/apm/get-started-apm-server-binary.md'
+  'solutions/observability/apps/get-started-apm-serverless.md': 'solutions/observability/apm/get-started.md'
+  'solutions/observability/apps/fleet-managed-apm-server.md': 'reference/fleet/get-started-managed-apm-server.md'
+  'solutions/observability/apps/apm-server-binary.md': 'reference/fleet/get-started-apm-server-binary.md'
   'solutions/observability/apps/learn-about-application-data-types.md': 'solutions/observability/apm/data-types.md'
   'solutions/observability/apps/spans.md': 'solutions/observability/apm/spans.md'
   'solutions/observability/apps/transactions.md': 'solutions/observability/apm/transactions.md'
@@ -294,4 +294,9 @@ redirects:
   'solutions/search/retrievers-examples.md': 'elasticsearch://reference/elasticsearch/rest-apis/retrievers/retrievers-examples.md'
 
 # Related to https://github.com/elastic/docs-content/pull/2136
-  'deploy-manage/security/fips-140-2.md': 'deploy-manage/security/fips.md'
+  'deploy-manage/security/fips-140-2.md': 'deploy-manage/security/fips.md'
+
+# Related to
+  'solutions/observability/apm/get-started-serverless.md': 'solutions/observability/apm/get-started.md'
+  'solutions/observability/apm/get-started-fleet-managed-apm-server.md': 'reference/fleet/get-started-managed-apm-server.md'
+  'solutions/observability/apm/get-started-apm-server-binary.md': 'reference/fleet/get-started-apm-server-binary.md'

reference/apm/observability/apm.md

@@ -21,7 +21,7 @@ Metrics are another vital source of information when debugging production system
 
 ## Give Elastic APM a try [_give_elastic_apm_a_try]
 
-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).
+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).
 
 
 

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

@@ -23,7 +23,7 @@ You’ll need:
 
 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.
 
-:::{image} /solutions/images/observability-apm-architecture-diy.png
+:::{image} /reference/fleet/images/observability-apm-architecture-diy.png
 :alt: Install Elastic APM yourself
 :::
 
@@ -746,7 +746,7 @@ For more information on how to combine Elastic and OpenTelemetry, see [OpenTelem
 
 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).
 
-:::{image} /solutions/images/observability-kibana-apm-sample-data.png
+:::{image} /reference/fleet/images/observability-kibana-apm-sample-data.png
 :alt: Applications UI with data
 :screenshot:
 :::

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

@@ -10,6 +10,11 @@ products:
 
 # Fleet-managed APM Server [get-started-with-fleet-apm-server]
 
+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.
+
+:::{image} /reference/fleet/images/observability-fm-ov.png
+:alt: APM Server fleet overview
+
 This guide will explain how to set up and configure a Fleet-managed APM Server.
 
 ## Prerequisites [_prerequisites_6]
@@ -71,7 +76,7 @@ You can install only a single {{agent}} per host, which means you cannot run {{f
 4. Save and apply the settings.
 5. Click the **Agents** tab and follow the in-product instructions to add a {{fleet}} server:
 
-    :::{image} /solutions/images/observability-add-fleet-server.png
+    :::{image} /reference/fleet/images/observability-add-fleet-server.png
     :alt: In-product instructions for adding a {{fleet-server}}
     :screenshot:
     :::
@@ -110,14 +115,14 @@ If you don’t have a {{fleet}} setup already in place, the easiest way to get s
 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).
 2. Select **Elastic APM**.
 
-    :::{image} /solutions/images/observability-kibana-fleet-integrations-apm.png
+    :::{image} /reference/fleet/images/observability-kibana-fleet-integrations-apm.png
     :alt: {{fleet}} showing APM integration
     :screenshot:
     :::
 
 3. Click **Add Elastic APM**.
 
-    :::{image} /solutions/images/observability-kibana-fleet-integrations-apm-overview.png
+    :::{image} /reference/fleet/images/observability-kibana-fleet-integrations-apm-overview.png
     :alt: {{fleet}} showing APM integration overview
     :screenshot:
     :::
@@ -132,7 +137,7 @@ If you don’t have a {{fleet}} setup already in place, the easiest way to get s
 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.
 7. To view the new policy, click **Agent policy 1**.
 
-    :::{image} /solutions/images/observability-apm-agent-policy-1.png
+    :::{image} /reference/fleet/images/observability-apm-agent-policy-1.png
     :alt: {{fleet}} showing apm policy
     :screenshot:
     :::
@@ -787,7 +792,7 @@ For more information on how to combine Elastic and OpenTelemetry, see [OpenTelem
 
 Back in {{kib}}, under {{observability}}, select APM. You should see application performance monitoring data flowing into the {{stack}}!
 
-:::{image} /solutions/images/observability-kibana-apm-sample-data.png
+:::{image} /reference/fleet/images/observability-kibana-apm-sample-data.png
 :alt: Applications UI with data
 :screenshot:
 :::

reference/fleet/toc.yml

@@ -7,6 +7,8 @@ toc:
   - file: deployment-models.md
     children:
       - file: fleet-server.md
+      - file: get-started-managed-apm-server.md
+      - file: get-started-apm-server-binary.md
       - file: add-fleet-server-cloud.md
       - file: add-fleet-server-on-prem.md
       - file: add-fleet-server-mixed.md

solutions/_snippets/edot-reference-arch.md

@@ -0,0 +1,27 @@
+The following diagrams show the reference architecture for OpenTelemetry with Elastic, depending on your deployment model.
+
+:::::{tab-set}
+::::{tab-item} Serverless
+
+:::{image} /solutions/images/observability-apm-otel-distro-serverless.png
+:alt: APM data ingest path (Serverless)
+:::
+
+::::
+
+::::{tab-item} ECH
+
+:::{image} /solutions/images/observability-apm-otel-distro-ech.png
+:alt: APM data ingest path (ECH)
+:::
+
+::::
+
+::::{tab-item} Self-managed
+
+:::{image} /solutions/images/observability-apm-otel-distro-self-managed.png
+:alt: APM data ingest path (Self-managed)
+:::
+
+::::
+:::::

solutions/_snippets/obs-apm-project.md

@@ -0,0 +1,24 @@
+Bring traces, logs, and metrics into Elastic APM to help you troubleshoot and optimize your applications. You can collect this data using OpenTelemetry or APM Server.
+
+:::::{dropdown} Steps for collecting application traces, metrics, and logs
+
+::::{tab-set}
+:::{tab-item} OpenTelemetry
+
+The [Elastic Distribution of OpenTelemetry (EDOT) SDKs](opentelemetry://reference/edot-sdks/index.md) facilitate the collection of traces, metrics, and logs in OpenTelemetry format into Elastic APM.
+
+1. Select **Add data** from the main menu and then select **Application**.
+2. Select **OpenTelemetry**.
+3. Follow the instructions for your platform.
+:::
+
+:::{tab-item} APM agents
+
+Use the [APM agents](/solutions/observability/apm/elastic-apm-agents.md) to collect traces, metrics, and logs through [APM Server](/solutions/observability/apm/configure-apm-server.md).
+
+1. Select **Add data** from the main menu and then select **Application**.
+2. Select **Elastic APM**.
+3. Select the tab for your language or framework.
+4. Follow the instructions in the tab.
+:::
+:::::

solutions/_snippets/obs-serverless-project.md

@@ -0,0 +1,18 @@
+An {{obs-serverless}} project allows you to run {{obs-serverless}} in an autoscaled and fully-managed environment, where you don’t have to manage the underlying {{es}} cluster or {{kib}} instances.
+
+::::{dropdown} Steps for creating a project
+:::{note}
+The **Admin** role or higher is required to create projects. Refer to [Assign user roles and privileges](/deploy-manage/users-roles/cloud-organization/manage-users.md#general-assign-user-roles).
+:::
+
+1. Navigate to [cloud.elastic.co](https://cloud.elastic.co/) and log in to your account, or create one.
+2. Select **Create serverless project**.
+3. Under **Elastic for Observability**, select **Next**.
+4. Enter a name for your project.
+5. (Optional) Select **Edit settings** to change your project settings:
+
+    * **Cloud provider**: The cloud platform where you’ll deploy your project. We currently support Amazon Web Services (AWS).
+    * **Region**: The [region](/deploy-manage/deploy/elastic-cloud/regions.md) where your project will live.
+
+6. Select **Create project**. It takes a few minutes to create your project.
+7. When the project is ready, click **Continue**.

solutions/observability/apm/apm-server-advanced-setup.md

@@ -11,7 +11,7 @@ products:
 
 # APM Server advanced setup [apm-setting-up-and-running]
 
-Before reading this section, see the [getting started documentation](/solutions/observability/apm/get-started-fleet-managed-apm-server.md) for basic installation and running instructions.
+Before reading this section, see the [getting started documentation](/reference/fleet/get-started-managed-apm-server.md) for basic installation and running instructions.
 
 This section includes additional information on how to set up and run APM Server, including:
 
@@ -20,5 +20,5 @@ This section includes additional information on how to set up and run APM Server
 * [Command reference](/solutions/observability/apm/apm-server-command-reference.md)
 * [Tune data ingestion](/solutions/observability/apm/tune-data-ingestion.md)
 * [High Availability](/solutions/observability/apm/high-availability.md)
-* [Run APM Server on Docker](/solutions/observability/apm/get-started-apm-server-binary.md#apm-running-on-docker)
+* [Run APM Server on Docker](/reference/fleet/get-started-apm-server-binary.md#apm-running-on-docker)