Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions redirects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -216,31 +216,31 @@ 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'
'ec-psc-associate-traffic-filter-psc-rule-set': 'associate-private-connection-policy'
'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'
'ec-edit-traffic-filter-private-link-rule-set': 'edit-private-connection-policy'
'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'
'ec-azure-edit-traffic-filter-private-link-rule-set': 'edit-private-connection-policy'
'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'
Expand All @@ -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'
Expand All @@ -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'

Expand All @@ -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'
Expand Down
17 changes: 1 addition & 16 deletions reference/apm/observability/apm.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
2 changes: 0 additions & 2 deletions reference/fleet/toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion solutions/_snippets/obs-apm-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 0 additions & 47 deletions solutions/images/observability-apm-help-me-decide.svg

This file was deleted.

4 changes: 2 additions & 2 deletions solutions/observability/apm/apm-server-advanced-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

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

Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

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

Is ## Step 4: Install APM agents [apm-next-steps] still something that we want to show in this level of detail for the apm-server choice? Asking as there is also https://docs-v3-preview.elastic.dev/elastic/docs-content/pull/2410/solutions/observability/apm/elastic-apm-agents

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm going to leave that section as is for now so we can at least get these guides back into the observability docs. Let's discuss this in a follow-up issue.

:alt: Install Elastic APM yourself
:::

Expand Down Expand Up @@ -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:
:::
Expand Down Expand Up @@ -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
```
```
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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:
:::
Expand Down Expand Up @@ -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:
:::
Expand All @@ -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:
:::
Expand Down Expand Up @@ -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:
:::
:::
88 changes: 88 additions & 0 deletions solutions/observability/apm/apm-server-setup.md
Original file line number Diff line number Diff line change
@@ -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
:::
20 changes: 20 additions & 0 deletions solutions/observability/apm/apm-server.md
Original file line number Diff line number Diff line change
@@ -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).
:::
1 change: 1 addition & 0 deletions solutions/observability/apm/configure-apm-server.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion solutions/observability/apm/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
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).
1 change: 1 addition & 0 deletions solutions/observability/apm/monitor-apm-server.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
navigation_title: Monitor
mapped_pages:
- https://www.elastic.co/guide/en/observability/current/apm-monitor-apm.html
applies_to:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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**

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

Expand Down
Loading
Loading