diff --git a/docset.yml b/docset.yml
index df7dbc134d..0a8c3e9359 100644
--- a/docset.yml
+++ b/docset.yml
@@ -15,6 +15,7 @@ cross_links:
- apm-agent-rum-js
- apm-aws-lambda
- apm-k8s-attacher
+ - apm-server
- asciidocalypse
- beats
- cloud
diff --git a/release-notes/elastic-apm/breaking-changes.md b/release-notes/elastic-apm/breaking-changes.md
deleted file mode 100644
index bedf836627..0000000000
--- a/release-notes/elastic-apm/breaking-changes.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-navigation_title: "Breaking changes"
----
-
-# Elastic APM breaking changes [elastic-apm-breaking-changes]
-Breaking changes can impact your Elastic applications, potentially disrupting normal operations. Before you upgrade, carefully review the Elastic APM breaking changes and take the necessary steps to mitigate any issues. To learn how to upgrade, check [Upgrade](/deploy-manage/upgrade.md).
-
-% ## Next version [elastic-apm-nextversion-breaking-changes]
-% **Release date:** Month day, year
-
-% ::::{dropdown} Title of breaking change
-% Description of the breaking change.
-% For more information, check [PR #](PR link).
-
-% **Impact**
Impact of the breaking change.
-
-% **Action**
Steps for mitigating deprecation impact.
-% ::::
-
-## 9.0.0 [elastic-apm-9-0-0-breaking-changes]
-**Release date:** April 2, 2025
-
-% ::::{dropdown} Title of breaking change
-% Description of the breaking change.
-% For more information, check [PR #](PR link).
-% **Impact**
Impact of the breaking change.
-% **Action**
Steps for mitigating deprecation impact.
-% ::::
-
-::::{dropdown} Change server information endpoint "/" to only accept GET and HEAD requests
-This will surface any agent misconfiguration causing data to be sent to `/` instead of the correct endpoint (for example, `/v1/traces` for OTLP/HTTP).
-For more information, check [#15976]({{apm-pull}}15976).
-
-**Impact**
Any methods other than `GET` and `HEAD` to `/` will return HTTP 405 Method Not Allowed.
-
-**Action**
Update any existing usage, for example, update `POST /` to `GET /`.
-::::
diff --git a/release-notes/elastic-apm/deprecations.md b/release-notes/elastic-apm/deprecations.md
deleted file mode 100644
index a19775cbda..0000000000
--- a/release-notes/elastic-apm/deprecations.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-navigation_title: "Deprecations"
----
-
-# Elastic APM deprecations [elastic-apm-deprecations]
-Over time, certain Elastic functionality becomes outdated and is replaced or removed. To help with the transition, Elastic deprecates functionality for a period before removal, giving you time to update your applications.
-
-Review the deprecated functionality for Elastic APM. While deprecations have no immediate impact, we strongly encourage you update your implementation after you upgrade. To learn how to upgrade, check out [Upgrade](/deploy-manage/upgrade.md).
-
-% ## Next version
-% **Release date:** Month day, year
-
-% ::::{dropdown} Deprecation title
-% Description of the deprecation.
-% For more information, check [PR #](PR link).
-% **Impact**
Impact of deprecation.
-% **Action**
Steps for mitigating deprecation impact.
-% ::::
-
-% ## 9.0.0 [elastic-apm-900-deprecations]
-% **Release date:** April 2, 2025
-
-% ::::{dropdown} Deprecation title
-% Description of the deprecation.
-% For more information, check [PR #](PR link).
-% **Impact**
Impact of deprecation.
-% **Action**
Steps for mitigating deprecation impact.
-% ::::
\ No newline at end of file
diff --git a/release-notes/elastic-apm/known-issues.md b/release-notes/elastic-apm/known-issues.md
deleted file mode 100644
index 5c69977127..0000000000
--- a/release-notes/elastic-apm/known-issues.md
+++ /dev/null
@@ -1,320 +0,0 @@
----
-mapped_pages:
- - https://www.elastic.co/guide/en/observability/current/apm-known-issues.html
-
-navigation_title: "Known issues"
----
-
-# Elastic APM known issues [elastic-apm-known-issues]
-Known issues are significant defects or limitations that may impact your implementation. These issues are actively being worked on and will be addressed in a future release. Review the Elastic APM known issues to help you make informed decisions, such as upgrading to a new version.
-
-% Use the following template to add entries to this page.
-
-% :::{dropdown} Title of known issue
-% **Applicable versions for the known issue and the version for when the known issue was fixed**
-% On [Month Day, Year], a known issue was discovered that [description of known issue].
-% For more information, check [Issue #](Issue link).
-
-% **Workaround**
-% Workaround description.
-
-:::
-
-:::{dropdown} `prefer_ilm` required in component templates to create custom lifecycle policies
-
-*Elastic Stack versions: 8.15.1+*
-
-The issue occurs when creating a *new* cluster using version 8.15.1+. The issue occurs for any APM data streams created in 8.15.1+. The issue does *not* occur if custom component template has been created in or before version 8.15.0.
-
-In 8.15.0, APM Server began using the [apm-data plugin](https://github.com/elastic/elasticsearch/tree/main/x-pack/plugin/apm-data) to manage data streams, ingest pipelines, lifecycle policies, and more. In 8.15.1, a fix was introduced to address unmanaged indices in older clusters using default ILM policies. This fix added a fallback to the default ILM policy (if it exists) and set the `prefer_ilm` configuration to `false`. This setting impacts clusters where both ILM and data stream lifecycles (DSL) are in effect—such as when configuring custom ILM policies using `@custom` component templates, under the conditions mentioned above.
-
-To override ILM policies for these new clusters using component template, set the `prefer_ilm` configuration to `true` by following the [updated guide to customize ILM](/solutions/observability/apps/index-lifecycle-management.md).
-
-:::
-
-:::{dropdown} Upgrading to v8.15.x may cause ingestion to fail
-
-*Elastic Stack versions: 8.15.0, 8.15.1, 8.15.2, 8.15.3*
*Fixed in Elastic Stack version 8.15.4*
-
-The issue only occurs when *upgrading* the {{stack}} from 8.12.2 or lower directly to any 8.15.x version prior to 8.15.4. The issue does *not* occur when creating a *new* cluster using any 8.15.x version, or when upgrading from 8.12.2 to 8.13.x or 8.14.x and then to 8.15.x.
-
-In APM Servers versions prior to 8.13.0, an ingestion pipeline exists to perform a check on the version. The version check would fail any APM document produced with a different version of APM server compared to the version of the installed APM’s ingest pipeline. In 8.13.0 the version check in the ingest pipeline was removed. Due to the combination of an internal change in how apm data management assets are set up from 8.15 onwards and a bug in Elasticsearch, related to [lazy rollover of data streams](https://github.com/elastic/elasticsearch/issues/112781), the ingestion pipeline conducting the version check is not removed on upgrade and prevents the ingestion of data.
-
-If the deployment is running 8.15.0, upgrade the deployment to 8.15.1 or above. A manual rollover of all APM data streams is required to pick up the new index templates and remove the faulty ingest pipeline version check. Perform the following requests to Elasticsearch (they are assuming the `default` namespace is used, adjust if necessary):
-
-```txt
-POST /traces-apm-default/_rollover
-POST /traces-apm.rum-default/_rollover
-POST /logs-apm.error-default/_rollover
-POST /logs-apm.app-default/_rollover
-POST /metrics-apm.app-default/_rollover
-POST /metrics-apm.internal-default/_rollover
-POST /metrics-apm.service_destination.1m-default/_rollover
-POST /metrics-apm.service_destination.10m-default/_rollover
-POST /metrics-apm.service_destination.60m-default/_rollover
-POST /metrics-apm.service_summary.1m-default/_rollover
-POST /metrics-apm.service_summary.10m-default/_rollover
-POST /metrics-apm.service_summary.60m-default/_rollover
-POST /metrics-apm.service_transaction.1m-default/_rollover
-POST /metrics-apm.service_transaction.10m-default/_rollover
-POST /metrics-apm.service_transaction.60m-default/_rollover
-POST /metrics-apm.transaction.1m-default/_rollover
-POST /metrics-apm.transaction.10m-default/_rollover
-POST /metrics-apm.transaction.60m-default/_rollover
-```
-
-:::
-
-:::{dropdown} Upgrading to v8.15.0 may cause APM indices to lose their lifecycle policy
-
-*Elastic Stack versions: 8.15.0*
*Fixed in Elastic Stack version 8.15.1*
-
-The issue only occurs when *upgrading* the {{stack}} to 8.15.0. The issue does *not* occur when creating a *new* cluster using 8.15.0. The issue also does not occur if a custom ILM policy is configured using a custom component template.
-
-In 8.15.0, APM Server switched to use data stream lifecycle to manage data retention for APM indices for new deployments as well as for upgraded deployments with default lifecycle configurations. Unfortunately, since any data stream created before 8.15.0 does not have a data stream lifecycle configuration, such existing data streams become unmanaged for default lifecycle configurations.
-
-Upgrading to 8.15.1 resolves the lifecycle issue for any new indices created for APM data streams. However, indices created in version 8.15.0 will remain unmanaged if the default ILM policy is in place. To fix these unmanaged indices, consider one of the following approaches:
-
-1. Manually delete the unmanaged indices when they are no longer needed.
-2. Explicitly configure APM data streams to use the default data stream lifecycle configuration. This approach migrates all affected data streams to use data stream lifecycles, maintaining behavior equivalent to the default ILM policies. Apply this fix only to data streams that have unmanaged indices due to missing default ILM policies.
-
- ```txt
- PUT _data_stream/{{data_stream_name}}-{{data_stream_namespace}}/_lifecycle
- {
- "data_retention":
- }
- ```
-
-
-Default `` for each data stream is available in [this guide](/solutions/observability/apps/index-lifecycle-management.md).
-
-This issue is fixed in 8.15.1 ([elastic/elasticsearch#112432](https://github.com/elastic/elasticsearch/pull/112432)).
-
-:::
-
-:::{dropdown} Upgrading to v8.13.0 to v8.13.2 breaks APM anomaly rules
-*Elastic Stack versions: 8.13.0, 8.13.1, 8.13.2*
*Fixed in Elastic Stack version 8.13.3*
-
-This issue occurs when upgrading the Elastic Stack to version 8.13.0, 8.13.1, or 8.13.2. This issue may go unnoticed unless you actively monitor your {{kib}} logs. The following log indicates the presence of this issue:
-
-```shell
-"params invalid: [anomalyDetectorTypes]: expected value of type [array] but got [undefined]"
-```
-
-This issue occurs because a non-optional parameter, `anomalyDetectorTypes` was added in 8.13.0 without the presence of an automation migration script. This breaks pre-existing rules as they do not have this parameter and will fail validation. This issue is fixed in v8.13.3.
-
-There are three ways to fix this error:
-
-* Upgrade to version 8.13.3
-* Fix broken anomaly rules in the APM UI (no upgrade required)
-* Fix broken anomaly rules with Kibana APIs (no upgrade required)
-
-**Fix broken anomaly rules in the APM UI**
-
-1. From any APM page in Kibana, select **Alerts and rules** → **Manage rules**.
-2. Filter your rules by setting **Type** to **APM Anomaly**.
-3. For each anomaly rule in the list, select the pencil icon to edit the rule.
-4. Add one or more **DETECTOR TYPES** to the rule.
-
- The detector type determines when the anomaly rule triggers. For example, a latency anomaly rule will trigger when the latency of the service being monitored is abnormal. Supported detector types are `latency`, `throughput`, and `failed transaction rate`.
-
-5. Click **Save**.
-
-**Fix broken anomaly rules with Kibana APIs**
-
-1. Find broken rules
-
- :::::{note}
- To identify rules in this exact state, you can use the [find rules endpoint](https://www.elastic.co/docs/api/doc/kibana/v8/group/endpoint-alerting) and search for the APM anomaly rule type as well as this exact error message indicating that the rule is in the broken state. We will also use the `fields` parameter to specify only the fields required when making the update request later.
-
- * `search_fields=alertTypeId`
- * `search=apm.anomaly`
- * `filter=alert.attributes.executionStatus.error.message:"params invalid: [anomalyDetectorTypes]: expected value of type [array] but got [undefined]"`
- * `fields=[id, name, actions, tags, schedule, notify_when, throttle, params]`
-
- The encoded request might look something like this:
-
- ```shell
- curl -u "$KIBANA_USER":"$KIBANA_PASSWORD" "$KIBANA_URL/api/alerting/rules/_find?search_fields=alertTypeId&search=apm.anomaly&filter=alert.attributes.executionStatus.error.message%3A%22params%20invalid%3A%20%5BanomalyDetectorTypes%5D%3A%20expected%20value%20of%20type%20%5Barray%5D%20but%20got%20%5Bundefined%5D%22&fields=id&fields=name&fields=actions&fields=tags&fields=schedule&fields=notify_when&fields=throttle&fields=params"
- ```
-
- ::::{dropdown} Example result:
- ```json
- {
- "page": 1,
- "total": 1,
- "per_page": 10,
- "data": [
- {
- "id": "d85e54de-f96a-49b5-99d4-63956f90a6eb",
- "name": "APM Anomaly Jason Test FAILING [2]",
- "tags": [
- "test",
- "jasonrhodes"
- ],
- "throttle": null,
- "schedule": {
- "interval": "1m"
- },
- "params": {
- "windowSize": 30,
- "windowUnit": "m",
- "anomalySeverityType": "warning",
- "environment": "ENVIRONMENT_ALL"
- },
- "notify_when": null,
- "actions": []
- }
- ]
- }
- ```
-
- ::::
-
-
- :::::
-
-2. Prepare the update JSON doc(s)
-
- ::::{note}
- For each broken rule found, create a JSON rule document with what was returned from the API in the previous step. You will need to make two changes to each document:
-
- 1. Remove the `id` key but keep the value connected to this document (e.g. rename the file to `{{id}}.json`). **The `id` cannot be sent as part of the request body for the PUT request, but you will need it for the URL path.**
- 2. Add the `"anomalyDetectorTypes"` to the `"params"` block, using the default value as seen below to mimic the pre-8.13 behavior:
-
- ```json
- {
- "params": {
- // ... other existing params should stay here,
- // with the required one added to this object
- "anomalyDetectorTypes": [
- "txLatency",
- "txThroughput",
- "txFailureRate"
- ]
- }
- }
- ```
-
-
- ::::
-
-3. Update each rule using the `PUT /api/alerting/rule/{{id}}` API
-
- ::::{note}
- For each rule, submit a PUT request to the [update rule endpoint](https://www.elastic.co/docs/api/doc/kibana/v8/group/endpoint-alerting) using that rule’s ID and its stored update document from the previous step. For example, assuming the first broken rule’s ID is `046c0d4f`:
-
- ```shell
- curl -u "$KIBANA_USER":"$KIBANA_PASSWORD" -XPUT "$KIBANA_URL/api/alerting/rule/046c0d4f" -H 'Content-Type: application/json' -H 'kbn-xsrf: rule-update' -d @046c0d4f.json
- ```
-
- Once the PUT request executes successfully, the rule will no longer be broken.
-
- ::::
-
-:::
-
-:::{dropdown} Upgrading APM Server to 8.11+ might break event intake from older APM Java agents
-*APM Server versions: >=8.11.0*
*Elastic APM Java agent versions: < 1.43.0*
-
-If you are using APM Server (> v8.11.0) and the Elastic APM Java agent (< v1.43.0), the agent may be sending empty histogram metricsets.
-
-In previous APM Server versions some data validation was not properly applied, leading the APM Server to accept empty histogram metricsets where it shouldn’t. This bug was fixed in the APM Server in 8.11.0.
-
-The APM Java agent (< v1.43.0) was sending this kind of invalid data under certain circumstances. If you upgrade the APM Server to v8.11.0+ *without* upgrading the APM Java agent version, metricsets can be rejected by the APM Server and can result in additional error logs in the Java agent.
-
-The fix is to upgrade the Elastic APM Java agent to a version >= 1.43.0. Find details in [elastic/apm-data#157](https://github.com/elastic/apm-data/pull/157).
-
-:::
-
-:::{dropdown} traces-apm@custom ingest pipeline applied to certain data streams unintentionally
-*APM Server versions: 8.12.0*
-
-If you’re using the Elastic APM Server v8.12.0, the `traces-apm@custom` ingest pipeline is now additionally applied to data streams `traces-apm.sampled-*` and `traces-apm.rum-*`, and applied twice for `traces-apm-*`. This bug impacts users with a non-empty `traces-apm@custom` ingest pipeline.
-
-If you rely on this unintended behavior in 8.12.0, please rename your pipeline to `traces-apm.integration@custom` to preserve this behavior in later versions.
-
-A fix was released in 8.12.1: [elastic/kibana#175448](https://github.com/elastic/kibana/pull/175448).
-
-:::
-
-:::{dropdown} Ingesting new JVM metrics in 8.9 and 8.10 breaks upgrade to 8.11 and stops ingestion
-*APM Server versions: 8.11.0, 8.11.1*
*Elastic APM Java agent versions: 1.39.0+*
-
-If you’re using the Elastic APM Java agent v1.39.0+ to send new JVM metrics to APM Server v8.9.x and v8.10.x, upgrading to 8.11.0 or 8.11.1 will silently fail and stop ingesting APM metrics.
-
-After upgrading, you will see the following errors:
-
-* APM Server error logs:
-
- ```txt
- failed to index document in 'metrics-apm.internal-default' (fail_processor_exception): Document produced by APM Server v8.11.1, which is newer than the installed APM integration (v8.10.3-preview-1695284222). The APM integration must be upgraded.
- ```
-
-* Fleet error on integration package upgrade:
-
- ```txt
- Failed installing package [apm] due to error: [ResponseError: mapper_parsing_exception
- Root causes:
- mapper_parsing_exception: Field [jvm.memory.non_heap.pool.committed] attempted to shadow a time_series_metric]
- ```
-
-
-A fix was released in 8.11.2: [elastic/kibana#171712](https://github.com/elastic/kibana/pull/171712).
-
-:::
-
-:::{dropdown} APM integration package upgrade through Fleet causes excessive data stream rollovers
-*APM Server versions: <= 8.12.1 +*
-
-If you’re upgrading APM integration package to any versions <= 8.12.1, in some rare cases, the upgrade fails with a mapping conflict error. The upgrade process keeps rolling over the data stream in an unsuccessful attempt to work around the error. As a result, many empty backing indices for APM data streams are created.
-
-During upgrade, you will see errors similar to the one below:
-
-* Fleet error on integration package upgrade:
-
- ```txt
- Mappings update for metrics-apm.service_destination.10m-default failed due to ResponseError: illegal_argument_exception
- Root causes:
- illegal_argument_exception: Mapper for [metricset.interval] conflicts with existing mapper:
- Cannot update parameter [value] from [10m] to [null]
- ```
-
-
-A fix was released in 8.12.2: [elastic/apm-server#12219](https://github.com/elastic/apm-server/pull/12219).
-
-:::
-
-:::{dropdown} Performance regression: APM issues too many small bulk requests for Elasticsearch output
-*APM Server versions: >=8.13.0, <= 8.14.2*
-
-If you’re on APM server version >=8.13.0, <= 8.14.2_, using Elasticsearch output, do not specify any `output.elasticsearch.flush_bytes`, and do not disable compression explicitly by setting `output.elasticsearch.compression_level` to `0`, APM server will issue smaller bulk requests of 24KB size, and more bulk requests will need to be made to maintain the original throughput. This causes Elasticsearch to experience higher load, and APM server may exhibit Elasticsearch backpressure symptoms.
-
-This happens because a performance regression was introduced, such that the default value of bulk indexer flush bytes was reduced from 1MB to 24KB.
-
-Affected APM servers will emit the following log:
-
-```txt
-flush_bytes config value is too small (0) and might be ignored by the indexer, increasing value to 24576
-```
-
-To workaround the issue, modify the Elasticsearch output configuration in APM.
-
-* For APM Server binary
-
- * In `apm-server.yml`, set `output.elasticsearch.flush_bytes: 1mib`
-
-* For Fleet-managed APM (non-Elastic Cloud)
-
- * In Fleet, open the Settings tab.
- * Under Outputs, identify the Elasticsearch output that receives from APM, select the edit icon.
- * In the Edit output flyout, in "Advanced YAML configuration" field, add line `flush_bytes: 1mib`.
-
-* For Elastic Cloud
-
- * It is not possible to edit the Fleet "Elastic Cloud internal output".
-
-
-A fix will be released in 8.14.3: [elastic/apm-server#13576](https://github.com/elastic/apm-server/pull/13576).
-
-:::
\ No newline at end of file
diff --git a/release-notes/elastic-apm/release-notes.md b/release-notes/elastic-apm/release-notes.md
deleted file mode 100644
index 872ba371c1..0000000000
--- a/release-notes/elastic-apm/release-notes.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-navigation_title: "Elastic APM"
-mapped_pages:
- - https://www.elastic.co/guide/en/observability/current/apm-release-notes.html
- - https://www.elastic.co/guide/en/observability/master/release-notes-head.html
----
-
-# Elastic APM release notes [elastic-apm-release-notes]
-Review the changes, fixes, and more in each version of Elastic APM.
-
-To check for security updates, go to [Security announcements for the Elastic stack](https://discuss.elastic.co/c/announcements/security-announcements/31).
-
-% Release notes include only features, enhancements, and fixes. Add breaking changes, deprecations, and known issues to the applicable release notes sections.
-% For each new version section, include the Elastic APM and Kibana changes.
-
-% ## version.next [elastic-apm-next-release-notes]
-% **Release date:** Month day, year
-
-% ### Features and enhancements [elastic-apm-next-features-enhancements]
-
-% ### Fixes [elastic-apm-next-fixes]
-
-## 9.0.0 [elastic-apm-900-release-notes]
-**Release date:** April 2, 2025
-
-% ### Features and enhancements [elastic-apm-900-features-enhancements]
-
-### Fixes [elastic-apm-900-fixes]
-* Fixes overflow in validation of `apm-server.agent.config.cache.expiration` on 32-bit architectures [#15216]({{apm-pull}}15216)
\ No newline at end of file
diff --git a/release-notes/elastic-apm/toc.yml b/release-notes/elastic-apm/toc.yml
deleted file mode 100644
index f1433648e4..0000000000
--- a/release-notes/elastic-apm/toc.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-toc:
- - file: release-notes.md
- children:
- - file: known-issues.md
- - file: breaking-changes.md
- - file: deprecations.md
\ No newline at end of file
diff --git a/release-notes/toc.yml b/release-notes/toc.yml
index f480d83f94..8885312a53 100644
--- a/release-notes/toc.yml
+++ b/release-notes/toc.yml
@@ -5,11 +5,6 @@ toc:
- file: elastic-observability/known-issues.md
- file: elastic-observability/breaking-changes.md
- file: elastic-observability/deprecations.md
- - file: elastic-apm/release-notes.md
- children:
- - file: elastic-apm/known-issues.md
- - file: elastic-apm/breaking-changes.md
- - file: elastic-apm/deprecations.md
- file: elastic-security/release-notes.md
children:
- file: elastic-security/known-issues.md
diff --git a/solutions/observability/apps/apm-agent-compatibility.md b/solutions/observability/apps/apm-agent-compatibility.md
index 78dda41b89..1ec1b754cd 100644
--- a/solutions/observability/apps/apm-agent-compatibility.md
+++ b/solutions/observability/apps/apm-agent-compatibility.md
@@ -8,21 +8,21 @@ mapped_pages:
The chart below outlines the compatibility between different versions of Elastic APM agents and extensions with the APM integration.
-## APM AWS Lambda extension [_apm_aws_lambda_extension]
+## APM AWS Lambda extension [_apm_aws_lambda_extension]
| {{apm-agent}} version | APM integration version |
| --- | --- |
| `1.x` | ≥ `8.2` |
-## Android agent [_android_agent]
+## Android agent [_android_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
| `0.x` | ≥ `8.12` |
-## Go agent [_go_agent]
+## Go agent [_go_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
@@ -30,55 +30,55 @@ The chart below outlines the compatibility between different versions of Elastic
| `2.x` | ≥ `6.5` |
-## iOS agent [_ios_agent]
+## iOS agent [_ios_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
| `1.x` | ≥ `8.12` |
-## Java agent [_java_agent]
+## Java agent [_java_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
| `1.x` | ≥ `6.5` |
-::::{note}
-Java agent < 1.43.0 not fully compatible with APM Server >= 8.11.0. For more information, check [Elastic APM known issues](/release-notes/elastic-apm/known-issues.md).
+::::{note}
+Java agent < 1.43.0 not fully compatible with APM Server >= 8.11.0. For more information, check [Elastic APM known issues](apm-server://release-notes/known-issues.md).
::::
-## .NET agent [_net_agent]
+## .NET agent [_net_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
| `1.x` | ≥ `6.5` |
-## Node.js agent [_node_js_agent]
+## Node.js agent [_node_js_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
| `3.x` | ≥ `6.6` |
-## PHP agent [_php_agent]
+## PHP agent [_php_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
| `1.x` | ≥ `7.0` |
-## Python agent [_python_agent]
+## Python agent [_python_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
| `6.x` | ≥ `6.6` |
-## Ruby agent [_ruby_agent]
+## Ruby agent [_ruby_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
@@ -86,7 +86,7 @@ Java agent < 1.43.0 not fully compatible with APM Server >= 8.11.0. For more inf
| `4.x` | ≥ `6.5` |
-## JavaScript RUM agent [_javascript_rum_agent]
+## JavaScript RUM agent [_javascript_rum_agent]
| {{apm-agent}} version | APM integration version |
| --- | --- |
diff --git a/solutions/observability/apps/switch-self-installation-to-apm-integration.md b/solutions/observability/apps/switch-self-installation-to-apm-integration.md
index e6bdcd6d50..3ec0388401 100644
--- a/solutions/observability/apps/switch-self-installation-to-apm-integration.md
+++ b/solutions/observability/apps/switch-self-installation-to-apm-integration.md
@@ -20,7 +20,7 @@ mapped_pages:
The {{stack}} ({{es}} and {{kib}}) must be upgraded to version 7.14 or higher. See the [{{stack}} Installation and Upgrade Guide](../../../deploy-manage/upgrade/deployment-or-cluster.md) for guidance.
-Review the [Elastic APM release notes](/release-notes/elastic-apm/release-notes.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md) for important changes between your current APM version and this one.
+Review the [Elastic APM release notes](apm-server://release-notes/index.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md) for important changes between your current APM version and this one.
## Add a {{fleet}} Server [apm-integration-upgrade-2]
diff --git a/solutions/observability/apps/upgrade-elastic-cloud-apm-server-standalone-to-8.md b/solutions/observability/apps/upgrade-elastic-cloud-apm-server-standalone-to-8.md
index a51656f911..86ada97c31 100644
--- a/solutions/observability/apps/upgrade-elastic-cloud-apm-server-standalone-to-8.md
+++ b/solutions/observability/apps/upgrade-elastic-cloud-apm-server-standalone-to-8.md
@@ -16,7 +16,7 @@ This upgrade guide is for the standalone method of running APM Server. Only use
Follow these steps to upgrade:
-1. Review the [Elastic APM release notes](/release-notes/elastic-apm/release-notes.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md).
+1. Review the [Elastic APM release notes](apm-server://release-notes/index.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md).
2. Upgrade {{ecloud}} to 9.0.0-beta1, See [Upgrade versions](../../../deploy-manage/upgrade/deployment-or-cluster.md) for instructions.
3. (Optional) Upgrade to the APM integration. Got time for one more upgrade? See [Switch to the Elastic APM integration](switch-to-elastic-apm-integration.md).
diff --git a/solutions/observability/apps/upgrade-elastic-cloud-with-apm-integration-to-80.md b/solutions/observability/apps/upgrade-elastic-cloud-with-apm-integration-to-80.md
index 05905a3b40..c8933b6618 100644
--- a/solutions/observability/apps/upgrade-elastic-cloud-with-apm-integration-to-80.md
+++ b/solutions/observability/apps/upgrade-elastic-cloud-with-apm-integration-to-80.md
@@ -16,7 +16,7 @@ This upgrade guide is for the Elastic APM integration. Only use this guide if bo
Follow these steps to upgrade:
-1. Review the [Elastic APM release notes](/release-notes/elastic-apm/release-notes.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md).
+1. Review the [Elastic APM release notes](apm-server://release-notes/index.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md).
2. Upgrade your {{ecloud}} instance to 9.0.0-beta1. See [Upgrade versions](../../../deploy-manage/upgrade/deployment-or-cluster.md) for details. The APM integration will automatically be upgraded to version 9.0.0-beta1 as a part of this process.
::::{note}
diff --git a/solutions/observability/apps/upgrade-self-installation-of-apm-integration-to-8x.md b/solutions/observability/apps/upgrade-self-installation-of-apm-integration-to-8x.md
index 6908b3d019..700b2952e9 100644
--- a/solutions/observability/apps/upgrade-self-installation-of-apm-integration-to-8x.md
+++ b/solutions/observability/apps/upgrade-self-installation-of-apm-integration-to-8x.md
@@ -18,7 +18,7 @@ This upgrade guide is for the Elastic APM integration. Only use this guide if bo
## Prerequisites [_prerequisites_9]
1. Prior to upgrading to version 9.0.0-beta1, {{es}}, and {{kib}} must be upgraded to version 7.17. To upgrade {{es}} and {{kib}}, see the [{{stack}} Installation and Upgrade Guide](https://www.elastic.co/guide/en/elastic-stack/7.17/upgrading-elastic-stack.html)
-2. Review the [Elastic APM release notes](/release-notes/elastic-apm/release-notes.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md).
+2. Review the [Elastic APM release notes](apm-server://release-notes/index.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md).
## Upgrade steps [_upgrade_steps_2]
diff --git a/solutions/observability/apps/upgrade-self-installation-of-apm-server-standalone-to-8x.md b/solutions/observability/apps/upgrade-self-installation-of-apm-server-standalone-to-8x.md
index 94c77246f7..690980fd76 100644
--- a/solutions/observability/apps/upgrade-self-installation-of-apm-server-standalone-to-8x.md
+++ b/solutions/observability/apps/upgrade-self-installation-of-apm-server-standalone-to-8x.md
@@ -22,7 +22,7 @@ This upgrade guide is for the standalone method of running APM Server. Only use
* To upgrade {{es}} and {{kib}}, see the [{{stack}} Installation and Upgrade Guide](https://www.elastic.co/guide/en/elastic-stack/7.17/upgrading-elastic-stack.html)
* To upgrade APM Server to version 7.17, see [upgrade to version 7.17](https://www.elastic.co/guide/en/apm/guide/7.17/upgrading-to-717.html).
-2. Review the [Elastic APM release notes](/release-notes/elastic-apm/release-notes.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md).
+2. Review the [Elastic APM release notes](apm-server://release-notes/index.md) and [Elastic {{observability}} release notes](/release-notes/elastic-observability/release-notes.md).
## Upgrade steps [_upgrade_steps]
diff --git a/solutions/observability/apps/upgrade-to-version-8x.md b/solutions/observability/apps/upgrade-to-version-8x.md
index 3ac478fb64..4b1bb874c8 100644
--- a/solutions/observability/apps/upgrade-to-version-8x.md
+++ b/solutions/observability/apps/upgrade-to-version-8x.md
@@ -18,7 +18,7 @@ This guide explains the upgrade process for version 9.0.0-beta1. For a detailed
* APM Server now only writes to well-defined data streams; writing to classic indices is no longer supported.
* APM Server has a new {{es}} output implementation with defaults that should be sufficient for most use cases.
-As a result of the above changes, a number of index management and index tuning configuration variables have been removed. See the APM [release notes](/release-notes/elastic-apm/release-notes.md), [breaking changes](https://www.elastic.co/guide/en/observability/current/apm-breaking.html) for full details.
+As a result of the above changes, a number of index management and index tuning configuration variables have been removed. See the APM [release notes](apm-server://release-notes/index.md), [breaking changes](https://www.elastic.co/guide/en/observability/current/apm-breaking.html) for full details.
## Find your upgrade guide [_find_your_upgrade_guide]
diff --git a/solutions/observability/apps/upgrade.md b/solutions/observability/apps/upgrade.md
index f10dba0d15..12d0ecf043 100644
--- a/solutions/observability/apps/upgrade.md
+++ b/solutions/observability/apps/upgrade.md
@@ -8,6 +8,6 @@ mapped_pages:
This guide gives general recommendations for upgrading Elastic APM.
* [{{apm-agent}} compatibility](apm-agent-compatibility.md)
-* [Breaking Changes](/release-notes/elastic-apm/breaking-changes.md)
+* [Breaking Changes](apm-server://release-notes/breaking-changes.md)
* [Upgrade to version 9.0.0-beta1](upgrade-to-version-8x.md)
* [Switch to the Elastic APM integration](switch-to-elastic-apm-integration.md)