Skip to content

Commit

Permalink
Reverts #2995 (#3108) (#3109)
Browse files Browse the repository at this point in the history
With this commit we revert the migration instructions to version 8.9.0 for Universal Profiling. There were some edge cases that we did not anticipate and therefore we fallback to the prior upgrade procedure of requiring users to wipe data for the upgrade.

(cherry picked from commit 2206052)

Co-authored-by: Daniel Mitterdorfer <danielmitterdorfer@users.noreply.github.com>
  • Loading branch information
mergify[bot] and danielmitterdorfer authored Jul 26, 2023
1 parent 86260ba commit 2076b1b
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 536 deletions.
2 changes: 0 additions & 2 deletions docs/en/observability/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ include::profiling-use-a-proxy.asciidoc[leveloffset=+3]
include::profiling-probabilistic-profiling.asciidoc[leveloffset=+3]

include::profiling-upgrade.asciidoc[leveloffset=+2]
include::profiling-upgrade-fresh.asciidoc[leveloffset=+3]
include::profiling-upgrade-migrate.asciidoc[leveloffset=+3]

include::profiling-troubleshooting.asciidoc[leveloffset=+2]

Expand Down
13 changes: 8 additions & 5 deletions docs/en/observability/profiling-get-started.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,12 @@ NOTE: To configure data ingestion, you need elevated privileges, typically the `

If you're upgrading from a previous version with Universal Profiling enabled, see the <<profiling-upgrade,upgrade guide>>.

[discrete]
[[profiling-install-host-agent]]
== Install the host-agent
IMPORTANT: When upgrading, you must remove all existing profiling data.
We still recommend upgrading as the latest version contains several improvements and new features.

[discrete]
[[profiling-install-host-agent]]
== Install the host-agent
You have the following options when installing the host-agent:

. <<profiling-install-host-agent-standalone, Install the host-agent in standalone mode>>
Expand All @@ -112,12 +115,12 @@ image::images/profiling-k8s-hostagent.png[]

To install the host-agent using the {agent} and the Universal Profiling Agent integration, complete the following steps:

. Copy the `secret token` and `Universal Profiling Collector url` from the Elastic Agent Integration
. Copy the `secret token` and `Universal Profiling Collector url` from the Elastic Agent Integration
+
[role="screenshot"]
image::images/profiling-elastic-agent.png[]
+
. Click `Manage Universal Profiling Agent in Fleet` to complete the integration.
. Click `Manage Universal Profiling Agent in Fleet` to complete the integration.
. On the Integrations page, click **Add Universal Profiling Agent**.
. In **Universal Profiling Agent → Settings**, add the information you copied from the *Add profiling data* page:
.. Add the Universal Profiling collector URL to the **Universal Profiling collector endpoint** field.
Expand Down
89 changes: 0 additions & 89 deletions docs/en/observability/profiling-upgrade-fresh.asciidoc

This file was deleted.

Loading

0 comments on commit 2076b1b

Please sign in to comment.