Skip to content

Commit

Permalink
remove legacy (#11941)
Browse files Browse the repository at this point in the history
(cherry picked from commit 1b0b81b)
  • Loading branch information
colleenmcginnis authored and mergify[bot] committed Oct 26, 2023
1 parent f93f556 commit 126dacc
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 18 deletions.
6 changes: 3 additions & 3 deletions docs/apm-breaking.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
Expand All @@ -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]
----
Expand All @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions docs/common-problems.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This section describes common problems you might encounter when using a Fleet-ma
* <<common-response-codes>>
* <<common-ssl-problems>>
* <<io-timeout>>
* <<field-limit-exceeded-legacy>>
* <<field-limit-exceeded>>
* <<tail-based-sampling-memory-disk-io>>

[float]
Expand All @@ -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

Expand Down Expand Up @@ -165,7 +165,7 @@ APM agent --> Load Balancer --> APM Server
The APM Server timeout can be configured by updating the
<<read_timeout,maximum duration for reading an entire request>>.

[[field-limit-exceeded-legacy]]
[[field-limit-exceeded]]
[float]
=== Field limit exceeded

Expand Down
5 changes: 0 additions & 5 deletions docs/integrations-index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions docs/upgrading-to-8.x.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ See the APM <<release-notes,release notes>>, <<apm-breaking,breaking changes>> 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.

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

++++
<titleabbrev>Self-installation standalone (legacy)</titleabbrev>
<titleabbrev>Self-installation standalone</titleabbrev>
++++

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}.
Expand Down Expand Up @@ -182,10 +182,10 @@ For more details, or for bulk upgrade instructions, see
==== Upgrade {ecloud} APM Server standalone to {version}

++++
<titleabbrev>{ecloud} standalone (legacy)</titleabbrev>
<titleabbrev>{ecloud} standalone</titleabbrev>
++++

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}.
Expand Down
4 changes: 2 additions & 2 deletions docs/upgrading-to-integration.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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!

Expand Down

0 comments on commit 126dacc

Please sign in to comment.