diff --git a/redirects.yml b/redirects.yml index 2e47eed78b..360ef55b25 100644 --- a/redirects.yml +++ b/redirects.yml @@ -14,8 +14,8 @@ redirects: '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.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/fleet-managed-apm-server.md': 'solutions/observability/apm/apm-server-fleet-managed.md' + 'solutions/observability/apps/apm-server-binary.md': 'solutions/observability/apm/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' @@ -216,7 +216,7 @@ redirects: 'deploy-manage/security/traffic-filtering.md': 'deploy-manage/security/network-security.md' 'deploy-manage/security/private-link-traffic-filters.md': 'deploy-manage/security/private-connectivity.md' 'deploy-manage/security/ip-traffic-filtering.md': 'deploy-manage/security/ip-filtering.md' - 'deploy-manage/security/gcp-private-service-connect-traffic-filters.md': + 'deploy-manage/security/gcp-private-service-connect-traffic-filters.md': to: 'deploy-manage/security/private-connectivity-gcp.md' anchors: 'ec-psc-create-traffic-filter-psc-rule-set': 'create-private-connection-policy' @@ -224,7 +224,7 @@ redirects: 'ec-edit-traffic-filter-psc-rule-set': 'edit-private-connection-policy' 'remove-filter-deployment': 'remove-private-connection-policy' 'ec-delete-traffic-filter-psc-rule-set': 'delete-private-connection-policy' - 'deploy-manage/security/aws-privatelink-traffic-filters.md': + 'deploy-manage/security/aws-privatelink-traffic-filters.md': to: 'deploy-manage/security/private-connectivity-aws.md' anchors: 'ec-associate-traffic-filter-private-link-rule-set': 'associate-private-connection-policy' @@ -232,7 +232,7 @@ redirects: 'ec-delete-traffic-filter-private-link-rule-set': 'delete-private-connection-policy' 'remove-filter-deployment': 'remove-private-connection-policy' 'ec-create-traffic-filter-private-link-rule-set': 'create-private-connection-policy' - 'deploy-manage/security/azure-private-link-traffic-filters.md': + 'deploy-manage/security/azure-private-link-traffic-filters.md': to: 'deploy-manage/security/private-connectivity-azure.md' anchors: 'ec-associate-traffic-filter-private-link-rule-set': 'associate-private-connection-policy' @@ -240,7 +240,7 @@ redirects: 'remove-filter-deployment': 'remove-private-connection-policy' 'ec-azure-delete-traffic-filter-private-link-rule-set': 'delete-private-connection-policy' ec-azure-create-traffic-filter-private-link-rule-set': 'create-private-connection-policy' - 'deploy-manage/security/ec-traffic-filtering-through-the-api.md': + 'deploy-manage/security/ec-traffic-filtering-through-the-api.md': to: 'deploy-manage/security/network-security-api.md' anchors: 'ec-create-a-traffic-filter-rule-set': 'create-ip-filter-policy' @@ -253,13 +253,13 @@ redirects: 'ec-associate-rule-set-with-a-deployment': 'associate-policy-rs-with-deployment' 'ec-delete-rule-set-association-with-a-deployment': 'delete-policy-rs-association-with-deployment' 'ec-delete-a-rule-set': 'delete-policy-rs' - 'deploy-manage/security/claim-traffic-filter-link-id-ownership-through-api.md': + 'deploy-manage/security/claim-traffic-filter-link-id-ownership-through-api.md': to: 'deploy-manage/security/claim-private-connection-api.md' anchors: 'ec-claim-a-traffic-filter-link-id': 'claim-private-connection-id' 'ec-list-claimed-traffic-filter-link-id': 'list-claimed-private-connection-ids' 'ec-unclaim-a-traffic-filter-link-id': 'unclaim-private-connection-id' - 'solutions/observability/synthetics/traffic-filters.md': + 'solutions/observability/synthetics/traffic-filters.md': to: 'solutions/observability/synthetics/network-security.md' anchors: '_add_the_traffic_filter': '_add_the_ip_filter' @@ -283,7 +283,7 @@ redirects: to: 'deploy-manage/remote-clusters/ece-enable-ccs.md' anchors: 'ece-ccs-ccr-traffic-filtering': 'ece-ccs-ccr-network-security' - + # Related to https://github.com/elastic/docs-content/pull/2010 'manage-data/lifecycle/index-lifecycle-management/index-management-in-kibana.md': 'manage-data/data-store/index-basics.md' @@ -301,8 +301,8 @@ redirects: # 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' + 'solutions/observability/apm/get-started-fleet-managed-apm-server.md': 'solutions/observability/apm/apm-server-fleet-managed.md' + 'solutions/observability/apm/get-started-apm-server-binary.md': 'solutions/observability/apm/apm-server-binary.md' # Related to https://github.com/elastic/docs-content/pull/2396 'solutions/security/configure-elastic-defend/enable-access-for-macos-monterey.md': 'solutions/security/configure-elastic-defend/enable-access-for-macos.md' diff --git a/reference/apm/observability/apm.md b/reference/apm/observability/apm.md index e7a8465acc..4f900b4da8 100644 --- a/reference/apm/observability/apm.md +++ b/reference/apm/observability/apm.md @@ -21,19 +21,4 @@ Metrics are another vital source of information when debugging production system ## Give Elastic APM a try [_give_elastic_apm_a_try] -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). - - - - - - - - - - - - - - - +Want to quickly spin up an APM deployment? Refer to [Get started for APM](/solutions/observability/apm/get-started.md). To host everything yourself instead, refer to [Set up APM Server](/solutions/observability/apm/apm-server-setup.md). diff --git a/reference/fleet/toc.yml b/reference/fleet/toc.yml index fe5d705769..32c2b0d456 100644 --- a/reference/fleet/toc.yml +++ b/reference/fleet/toc.yml @@ -7,8 +7,6 @@ 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 diff --git a/solutions/_snippets/obs-apm-project.md b/solutions/_snippets/obs-apm-project.md index 865ba2705f..ba17150c89 100644 --- a/solutions/_snippets/obs-apm-project.md +++ b/solutions/_snippets/obs-apm-project.md @@ -14,7 +14,7 @@ The [Elastic Distribution of OpenTelemetry (EDOT) SDKs](opentelemetry://referenc :::{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). +Use the [APM agents](/solutions/observability/apm/elastic-apm-agents.md) to collect traces, metrics, and logs through {{apm-server-or-mis}}. 1. Select **Add data** from the main menu and then select **Application**. 2. Select **Elastic APM**. diff --git a/reference/fleet/images/observability-add-fleet-server.png b/solutions/images/observability-add-fleet-server.png similarity index 100% rename from reference/fleet/images/observability-add-fleet-server.png rename to solutions/images/observability-add-fleet-server.png diff --git a/reference/fleet/images/observability-apm-agent-policy-1.png b/solutions/images/observability-apm-agent-policy-1.png similarity index 100% rename from reference/fleet/images/observability-apm-agent-policy-1.png rename to solutions/images/observability-apm-agent-policy-1.png diff --git a/reference/fleet/images/observability-apm-architecture-diy.png b/solutions/images/observability-apm-architecture-diy.png similarity index 100% rename from reference/fleet/images/observability-apm-architecture-diy.png rename to solutions/images/observability-apm-architecture-diy.png diff --git a/solutions/images/observability-apm-help-me-decide.png b/solutions/images/observability-apm-help-me-decide.png new file mode 100644 index 0000000000..42539407d0 Binary files /dev/null and b/solutions/images/observability-apm-help-me-decide.png differ diff --git a/solutions/images/observability-apm-help-me-decide.svg b/solutions/images/observability-apm-help-me-decide.svg deleted file mode 100644 index dfd0c7fe7d..0000000000 --- a/solutions/images/observability-apm-help-me-decide.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/reference/fleet/images/observability-fm-ov.png b/solutions/images/observability-fm-ov.png similarity index 100% rename from reference/fleet/images/observability-fm-ov.png rename to solutions/images/observability-fm-ov.png diff --git a/reference/fleet/images/observability-kibana-apm-sample-data.png b/solutions/images/observability-kibana-apm-sample-data.png similarity index 100% rename from reference/fleet/images/observability-kibana-apm-sample-data.png rename to solutions/images/observability-kibana-apm-sample-data.png diff --git a/reference/fleet/images/observability-kibana-fleet-integrations-apm-overview.png b/solutions/images/observability-kibana-fleet-integrations-apm-overview.png similarity index 100% rename from reference/fleet/images/observability-kibana-fleet-integrations-apm-overview.png rename to solutions/images/observability-kibana-fleet-integrations-apm-overview.png diff --git a/reference/fleet/images/observability-kibana-fleet-integrations-apm.png b/solutions/images/observability-kibana-fleet-integrations-apm.png similarity index 100% rename from reference/fleet/images/observability-kibana-fleet-integrations-apm.png rename to solutions/images/observability-kibana-fleet-integrations-apm.png diff --git a/solutions/observability/apm/apm-server-advanced-setup.md b/solutions/observability/apm/apm-server-advanced-setup.md index a481c0dacc..e21da7e920 100644 --- a/solutions/observability/apm/apm-server-advanced-setup.md +++ b/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](/reference/fleet/get-started-managed-apm-server.md) for basic installation and running instructions. +Before reading this section, refer to [](/solutions/observability/apm/apm-server-setup.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](/reference/fleet/get-started-apm-server-binary.md#apm-running-on-docker) +* [Run APM Server on Docker](/solutions/observability/apm/apm-server-binary.md#apm-running-on-docker) diff --git a/reference/fleet/get-started-apm-server-binary.md b/solutions/observability/apm/apm-server-binary.md similarity index 99% rename from reference/fleet/get-started-apm-server-binary.md rename to solutions/observability/apm/apm-server-binary.md index a4b62fe1bb..6d2bd27514 100644 --- a/reference/fleet/get-started-apm-server-binary.md +++ b/solutions/observability/apm/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} /reference/fleet/images/observability-apm-architecture-diy.png +:::{image} /solutions/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} /reference/fleet/images/observability-kibana-apm-sample-data.png +:::{image} /solutions/images/observability-kibana-apm-sample-data.png :alt: Applications UI with data :screenshot: ::: @@ -924,4 +924,4 @@ It’s possible to embed your APM Server configuration in a custom image. Here i ```dockerfile FROM docker.elastic.co/apm/apm-server:9.0.0 COPY --chmod=0644 --chown=1000:1000 apm-server.yml /usr/share/apm-server/apm-server.yml -``` +``` \ No newline at end of file diff --git a/reference/fleet/get-started-managed-apm-server.md b/solutions/observability/apm/apm-server-fleet-managed.md similarity index 98% rename from reference/fleet/get-started-managed-apm-server.md rename to solutions/observability/apm/apm-server-fleet-managed.md index 1153fadcac..f6e60bb25f 100644 --- a/reference/fleet/get-started-managed-apm-server.md +++ b/solutions/observability/apm/apm-server-fleet-managed.md @@ -12,8 +12,9 @@ products: 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 +:::{image} /solutions/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. @@ -76,7 +77,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} /reference/fleet/images/observability-add-fleet-server.png + :::{image} /solutions/images/observability-add-fleet-server.png :alt: In-product instructions for adding a {{fleet-server}} :screenshot: ::: @@ -115,14 +116,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} /reference/fleet/images/observability-kibana-fleet-integrations-apm.png + :::{image} /solutions/images/observability-kibana-fleet-integrations-apm.png :alt: {{fleet}} showing APM integration :screenshot: ::: 3. Click **Add Elastic APM**. - :::{image} /reference/fleet/images/observability-kibana-fleet-integrations-apm-overview.png + :::{image} /solutions/images/observability-kibana-fleet-integrations-apm-overview.png :alt: {{fleet}} showing APM integration overview :screenshot: ::: @@ -137,7 +138,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} /reference/fleet/images/observability-apm-agent-policy-1.png + :::{image} /solutions/images/observability-apm-agent-policy-1.png :alt: {{fleet}} showing apm policy :screenshot: ::: @@ -792,7 +793,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} /reference/fleet/images/observability-kibana-apm-sample-data.png +:::{image} /solutions/images/observability-kibana-apm-sample-data.png :alt: Applications UI with data :screenshot: -::: +::: \ No newline at end of file diff --git a/solutions/observability/apm/apm-server-setup.md b/solutions/observability/apm/apm-server-setup.md new file mode 100644 index 0000000000..de9553b1b5 --- /dev/null +++ b/solutions/observability/apm/apm-server-setup.md @@ -0,0 +1,88 @@ +--- +navigation_title: Set up +applies_to: + stack: ga + serverless: unavailable +--- + +# Set up APM Server + +:::{tip} +Just getting started? +The fastest way to get started with Elastic APM is with Elastic Cloud Serverless. +Read more in [](/solutions/observability/apm/get-started.md). +::: + +APM Server receives performance data from your APM agents and Elastic Distribution of OpenTelemetry (EDOT) SDKs, validates and processes it, and then transforms the data into {{es}} documents. If you’re on this page, then you’ve chosen to self-manage the Elastic Stack, and you now must decide how to run and configure the APM Server. There are two options, and the components required are different for each: + +* [Fleet-managed APM Server](#apm-setup-fleet-managed-apm) +* [APM Server binary](#apm-setup-apm-server-binary) + +## Fleet-managed APM Server [apm-setup-fleet-managed-apm] + +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} /solutions/images/observability-fm-ov.png +:alt: APM Server fleet overview +::: + +**Pros**: + +* Conveniently manage one, some, or many different integrations from one central {{fleet}} UI. +* Centrally manage multiple APM Servers running on edge machines. + +**Supported outputs**: + +* {{es}} +* {{ech}} + +::::{note} +Fleet-managed APM Server does *not* support all the outputs that are supported by the APM Server binary method of running Elastic APM. +:::: + +**Required components**: + +* EDOT SDKs or APM agents +* {{agent}} (which runs multiple subprocesses including APM Server, Fleet Server, and {{stack}}) + +**Configuration method**: {{kib}} UI + +## APM Server binary [apm-setup-apm-server-binary] + +Install, configure, and run the APM Server binary wherever you need it. + +:::{image} /solutions/images/observability-bin-ov.png +:alt: APM Server binary overview +::: + +**Pros**: + +* Simplest self-managed option +* No addition component knowledge required +* YAML configuration simplifies automation + +**Supported outputs**: + +* {{es}} +* {{ech}} +* {{ls}} +* Kafka +* Redis +* File +* Console + +**Required components**: + +* EDOT SDKs or APM agents +* APM Server +* {{stack}} + +**Configuration method**: YAML + +## Help me decide [_help_me_decide] + +This decision tree highlights key factors to help you make an informed decision about implementing Elastic APM. It provides practical guidance and is not intended to serve as a comprehensive reference of all possible implementations and capabilities. + +:::{image} /solutions/images/observability-apm-help-me-decide.png +:alt: APM decision tree +::: \ No newline at end of file diff --git a/solutions/observability/apm/apm-server.md b/solutions/observability/apm/apm-server.md new file mode 100644 index 0000000000..d70eed3663 --- /dev/null +++ b/solutions/observability/apm/apm-server.md @@ -0,0 +1,20 @@ +--- +applies_to: + stack: ga + serverless: unavailable +--- + +# Work with APM Server + +When self-managing the Elastic Stack, APM Server receives performance data from APM agents, +validates and processes it, and transforms the data into {{es}} documents. + +This section contains information on working with APM Server including: + +* Learning how to [set up APM Server](/solutions/observability/apm/apm-server-setup.md) +* Browsing all available [APM Server configuration options](/solutions/observability/apm/configure-apm-server.md) +* [Monitoring the real-time health and performance](/solutions/observability/apm/monitor-apm-server.md) of your APM Server + +:::{tip} +If you're using {{serverless-full}}, there is no APM Server running. Instead the _managed intake service_ receives and transforms data. Read more in [](/solutions/observability/apm/get-started.md). +::: diff --git a/solutions/observability/apm/configure-apm-server.md b/solutions/observability/apm/configure-apm-server.md index 39b0bd521b..85c03334e2 100644 --- a/solutions/observability/apm/configure-apm-server.md +++ b/solutions/observability/apm/configure-apm-server.md @@ -1,4 +1,5 @@ --- +navigation_title: Configure mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-manage-apm-settings.html - https://www.elastic.co/guide/en/observability/current/apm-configuring-howto-apm-server.html diff --git a/solutions/observability/apm/index.md b/solutions/observability/apm/index.md index 68e89f4b56..80e3e7b48c 100644 --- a/solutions/observability/apm/index.md +++ b/solutions/observability/apm/index.md @@ -26,4 +26,4 @@ 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](/reference/fleet/get-started-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). \ No newline at end of file +Want to quickly spin up an APM deployment? Refer to [Get started for APM](/solutions/observability/apm/get-started.md). To host everything yourself instead, refer to [Set up APM Server](/solutions/observability/apm/apm-server-setup.md). \ No newline at end of file diff --git a/solutions/observability/apm/monitor-apm-server.md b/solutions/observability/apm/monitor-apm-server.md index b7d8bd0a2a..b620beebd8 100644 --- a/solutions/observability/apm/monitor-apm-server.md +++ b/solutions/observability/apm/monitor-apm-server.md @@ -1,4 +1,5 @@ --- +navigation_title: Monitor mapped_pages: - https://www.elastic.co/guide/en/observability/current/apm-monitor-apm.html applies_to: diff --git a/solutions/observability/apm/switch-self-installation-to-apm-integration.md b/solutions/observability/apm/switch-self-installation-to-apm-integration.md index 5889d8e2e5..16f27d55ae 100644 --- a/solutions/observability/apm/switch-self-installation-to-apm-integration.md +++ b/solutions/observability/apm/switch-self-installation-to-apm-integration.md @@ -47,7 +47,7 @@ The {{fleet}}-managed {{agent}} will run the Elastic APM integration on your edg The APM integration receives performance data from your APM agents, validates and processes it, and then transforms the data into {{es}} documents. -To add the APM integration, see [Step 2: Add and configure the APM integration](/reference/fleet/get-started-managed-apm-server.md#add-apm-integration). Only complete the linked step (not the entire quick start guide). If you’re adding the APM integration to a {{fleet}}-managed {{agent}}, you can use the default policy. If you’re adding the APM integration to the {{fleet-server}}, use the policy that the {{fleet-server}} is running on. +To add the APM integration, see [Step 2: Add and configure the APM integration](/solutions/observability/apm/apm-server-fleet-managed.md#add-apm-integration). Only complete the linked step (not the entire quick start guide). If you’re adding the APM integration to a {{fleet}}-managed {{agent}}, you can use the default policy. If you’re adding the APM integration to the {{fleet-server}}, use the policy that the {{fleet-server}} is running on. ::::{tip} You’ll configure the APM integration in this step. See [Configure APM Server](/solutions/observability/apm/configure-apm-server.md) for a reference of all available settings. As long as the APM integration is configured with the same secret token or you have API keys enabled on the same host, no reconfiguration is required in your APM agents. diff --git a/solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md b/solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md index d1547ee143..728d90bbf7 100644 --- a/solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md +++ b/solutions/observability/apm/upgrade-self-installation-of-apm-server-standalone-to-9.md @@ -34,7 +34,7 @@ This upgrade guide is for the standalone method of running APM Server. Only use 2. **Install the 9.0 APM Server release** - Refer to [install](/reference/fleet/get-started-apm-server-binary.md#apm-installing) to find the command that works with your system. + Refer to [install](/solutions/observability/apm/apm-server-binary.md#apm-installing) to find the command that works with your system. 3. **Review your configuration file** @@ -48,7 +48,7 @@ This upgrade guide is for the standalone method of running APM Server. Only use ./apm-server -e ``` - Additional details are available in [start the APM Server](/reference/fleet/get-started-apm-server-binary.md#apm-server-starting). + Additional details are available in [start the APM Server](/solutions/observability/apm/apm-server-binary.md#apm-server-starting). 5. When upgrading from 8.18 to 9.0, if you have 7.x indices, you need to either set the indices to `readonly`, or if reindexing, add [ILM privileges](https://www.elastic.co/guide/en/apm/guide/7.17/privileges-to-setup-beats.html#_set_up_ilm) for `reindexed-v*-apm*` indices. diff --git a/solutions/observability/apm/use-opentelemetry-with-apm.md b/solutions/observability/apm/use-opentelemetry-with-apm.md index 77b84ff65a..0c33dba69d 100644 --- a/solutions/observability/apm/use-opentelemetry-with-apm.md +++ b/solutions/observability/apm/use-opentelemetry-with-apm.md @@ -60,7 +60,7 @@ To understand the differences between Elastic Distributions of OpenTelemetry and ## Upstream OpenTelemetry with Elastic APM agent [apm-otel-api-sdk-elastic-agent] -You can use the OpenTelemetry API/SDKs with [Elastic APM agents](/reference/fleet/get-started-managed-apm-server.md#_step_3_install_apm_agents) to translate OpenTelemetry API calls to Elastic APM API calls. This allows you to reuse your existing OpenTelemetry instrumentation to create Elastic APM transactions and spans, avoiding vendor lock-in and having to redo manual instrumentation. +You can use the OpenTelemetry API/SDKs with [Elastic APM agents](/solutions/observability/apm/apm-server-fleet-managed.md#_step_3_install_apm_agents) to translate OpenTelemetry API calls to Elastic APM API calls. This allows you to reuse your existing OpenTelemetry instrumentation to create Elastic APM transactions and spans, avoiding vendor lock-in and having to redo manual instrumentation. However, not all features of the OpenTelemetry API are supported when using this approach, and not all Elastic APM agents support this approach. diff --git a/solutions/toc.yml b/solutions/toc.yml index 4d5eb55693..96992b0b73 100644 --- a/solutions/toc.yml +++ b/solutions/toc.yml @@ -214,47 +214,53 @@ toc: - file: observability/apm/storage-sizing-guide.md - file: observability/apm/reduce-storage.md - file: observability/apm/explore-data-in-elasticsearch.md - - file: observability/apm/configure-apm-server.md + - file: observability/apm/apm-server.md children: - - file: observability/apm/general-configuration-options.md - - file: observability/apm/configure-anonymous-authentication.md - - file: observability/apm/apm-agent-authorization.md - - file: observability/apm/configure-apm-agent-central-configuration.md - - file: observability/apm/configure-apm-instrumentation.md - - file: observability/apm/configure-kibana-endpoint.md - - file: observability/apm/configure-logging.md - - file: observability/apm/configure-output.md + - file: observability/apm/apm-server-setup.md children: - - file: observability/apm/configure-output-for-elasticsearch-service-on-elastic-cloud.md - - file: observability/apm/configure-elasticsearch-output.md - - file: observability/apm/configure-logstash-output.md - - file: observability/apm/configure-kafka-output.md - - file: observability/apm/configure-redis-output.md - - file: observability/apm/configure-console-output.md - - file: observability/apm/configure-project-paths.md - - file: observability/apm/configure-real-user-monitoring-rum.md - - file: observability/apm/ssl-tls-settings.md + - file: observability/apm/apm-server-fleet-managed.md + - file: observability/apm/apm-server-binary.md + - file: observability/apm/configure-apm-server.md children: - - file: observability/apm/ssl-tls-output-settings.md - - file: observability/apm/ssl-tls-input-settings.md - - file: observability/apm/tail-based-sampling.md - - file: observability/apm/use-environment-variables-in-configuration.md - - file: observability/apm/apm-server-advanced-setup.md + - file: observability/apm/general-configuration-options.md + - file: observability/apm/configure-anonymous-authentication.md + - file: observability/apm/apm-agent-authorization.md + - file: observability/apm/configure-apm-agent-central-configuration.md + - file: observability/apm/configure-apm-instrumentation.md + - file: observability/apm/configure-kibana-endpoint.md + - file: observability/apm/configure-logging.md + - file: observability/apm/configure-output.md + children: + - file: observability/apm/configure-output-for-elasticsearch-service-on-elastic-cloud.md + - file: observability/apm/configure-elasticsearch-output.md + - file: observability/apm/configure-logstash-output.md + - file: observability/apm/configure-kafka-output.md + - file: observability/apm/configure-redis-output.md + - file: observability/apm/configure-console-output.md + - file: observability/apm/configure-project-paths.md + - file: observability/apm/configure-real-user-monitoring-rum.md + - file: observability/apm/ssl-tls-settings.md + children: + - file: observability/apm/ssl-tls-output-settings.md + - file: observability/apm/ssl-tls-input-settings.md + - file: observability/apm/tail-based-sampling.md + - file: observability/apm/use-environment-variables-in-configuration.md + - file: observability/apm/apm-server-advanced-setup.md + children: + - file: observability/apm/installation-layout.md + - file: observability/apm/secrets-keystore-for-secure-settings.md + - file: observability/apm/apm-server-command-reference.md + - file: observability/apm/tune-data-ingestion.md + - file: observability/apm/high-availability.md + - file: observability/apm/apm-server-systemd.md + - file: observability/apm/monitor-apm-server.md children: - - file: observability/apm/installation-layout.md - - file: observability/apm/secrets-keystore-for-secure-settings.md - - file: observability/apm/apm-server-command-reference.md - - file: observability/apm/tune-data-ingestion.md - - file: observability/apm/high-availability.md - - file: observability/apm/apm-server-systemd.md - - file: observability/apm/monitor-apm-server.md - children: - - file: observability/apm/monitor-fleet-managed-apm-server.md - - file: observability/apm/monitor-apm-server-binary.md - children: - - file: observability/apm/use-internal-collection-to-send-monitoring-data.md - - file: observability/apm/use-metricbeat-to-send-monitoring-data.md - - file: observability/apm/use-select-metrics-emitted-directly-to-monitoring-cluster.md + - file: observability/apm/monitor-fleet-managed-apm-server.md + - file: observability/apm/monitor-apm-server-binary.md + children: + - file: observability/apm/use-internal-collection-to-send-monitoring-data.md + - file: observability/apm/use-metricbeat-to-send-monitoring-data.md + - file: observability/apm/use-select-metrics-emitted-directly-to-monitoring-cluster.md - file: observability/apm/apis.md children: - file: observability/apm/apm-ui-api.md