diff --git a/docs/apm-breaking.asciidoc b/docs/apm-breaking.asciidoc index 79c83efff5a..6fc931697cc 100644 --- a/docs/apm-breaking.asciidoc +++ b/docs/apm-breaking.asciidoc @@ -205,7 +205,7 @@ APM Server no longer supports installation via Homebrew. ==== All removed and changed settings Below is a list of all **removed settings** (in alphabetical order) for -users upgrading a standalone (legacy) APM Server to {stack} version 8.0. +users upgrading a standalone APM Server to {stack} version 8.0. [source,yml] ---- @@ -225,7 +225,7 @@ setup.* ---- Below is a list of **renamed settings** (in alphabetical order) for -users upgrading a standalone (legacy) APM Server to {stack} version 8.0. +users upgrading a standalone APM Server to {stack} version 8.0. [source,yml] ---- @@ -242,7 +242,7 @@ apm-server.secret_token --> apm-server.auth.secret_token ==== Supported {ecloud} settings Below is a list of all **supported settings** (in alphabetical order) for -users upgrading an {ecloud} standalone (legacy) cluster to {stack} version 8.0. +users upgrading an {ecloud} standalone cluster to {stack} version 8.0. Any previously supported settings not listed below will be removed when upgrading. [source,yml] diff --git a/docs/common-problems.asciidoc b/docs/common-problems.asciidoc index d0b3e44e65b..527833638cd 100644 --- a/docs/common-problems.asciidoc +++ b/docs/common-problems.asciidoc @@ -7,7 +7,7 @@ This section describes common problems you might encounter when using a Fleet-ma * <> * <> * <> -* <> +* <> * <> [float] @@ -18,7 +18,7 @@ If no data shows up in {es}, first make sure that your APM components are proper include::{tab-widget-dir}/no-data-indexed-widget.asciidoc[] -[[data-indexed-no-apm-legacy]] +[[data-indexed-no-apm]] [float] === Data is indexed but doesn't appear in the APM app @@ -165,7 +165,7 @@ APM agent --> Load Balancer --> APM Server The APM Server timeout can be configured by updating the <>. -[[field-limit-exceeded-legacy]] +[[field-limit-exceeded]] [float] === Field limit exceeded diff --git a/docs/integrations-index.asciidoc b/docs/integrations-index.asciidoc index 8033e576580..b375bf1c621 100644 --- a/docs/integrations-index.asciidoc +++ b/docs/integrations-index.asciidoc @@ -2,7 +2,6 @@ include::./version.asciidoc[] include::{asciidoc-dir}/../../shared/attributes.asciidoc[] :apm-integration-docs: -:apm-package-dir: {docdir}/apm-package :obs-repo-dir: {observability-docs-root}/docs/en :tab-widget-dir: {docdir}/tab-widgets @@ -14,9 +13,6 @@ endif::[] // OTHER ATTRS // TODO: Check that these are still relevant - -:libbeat-dir: {docdir}/legacy/copied-from-beats/docs -:libbeat-outputs-dir: {docdir}/legacy/copied-from-beats/outputs :version: {apm_server_version} :beatname_lc: apm-server :beatname_uc: APM Server @@ -50,7 +46,6 @@ endif::[] :docker_platform: :win_os: :linux_os: -:apm-package-dir: {docdir}/legacy/apm-package :downloads: https://artifacts.elastic.co/downloads/apm-server diff --git a/docs/upgrading-to-8.x.asciidoc b/docs/upgrading-to-8.x.asciidoc index 12fb1560bac..bde78f8d963 100644 --- a/docs/upgrading-to-8.x.asciidoc +++ b/docs/upgrading-to-8.x.asciidoc @@ -29,7 +29,7 @@ See the APM <>, <> f Starting in version 7.14, there are two ways to run Elastic APM. Determine which method you're using, then use the links below to find the correct upgrading guide. -* **Standalone (legacy)**: Users in this mode run and configure the APM Server binary. +* **Standalone**: Users in this mode run and configure the APM Server binary. This mode has been deprecated and will be removed in a future release. * **{fleet} and the APM integration**: Users in this mode run and configure {fleet} and the Elastic APM integration. @@ -49,10 +49,10 @@ This mode has been deprecated and will be removed in a future release. ==== Upgrade a self-installation of APM Server standalone to {version} ++++ -Self-installation standalone (legacy) +Self-installation standalone ++++ -This upgrade guide is for the standalone (legacy) method of running APM Server. +This upgrade guide is for the standalone method of running APM Server. Only use this guide if both of the following are true: * You have a self-installation of the {stack}, i.e. you're not using {ecloud}. @@ -182,10 +182,10 @@ For more details, or for bulk upgrade instructions, see ==== Upgrade {ecloud} APM Server standalone to {version} ++++ -{ecloud} standalone (legacy) +{ecloud} standalone ++++ -This upgrade guide is for the standalone (legacy) method of running APM Server. +This upgrade guide is for the standalone method of running APM Server. Only use this guide if both of the following are true: * You're using {ecloud}. diff --git a/docs/upgrading-to-integration.asciidoc b/docs/upgrading-to-integration.asciidoc index 1b3a8745236..4dd771c3efa 100644 --- a/docs/upgrading-to-integration.asciidoc +++ b/docs/upgrading-to-integration.asciidoc @@ -137,10 +137,10 @@ no reconfiguration is required in your APM agents. [discrete] [[apm-integration-upgrade-5]] -==== Stop the legacy APM Server +==== Stop the APM Server Once data from upgraded APM agents is visible in the {apm-app}, -it's safe to stop the legacy APM Server process. +it's safe to stop the APM Server process. Congratulations -- you now have the latest and greatest in Elastic APM!