Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverts #2995 #3108

Merged
merged 6 commits into from
Jul 26, 2023
Merged
Show file tree
Hide file tree
Changes from 5 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
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
2 changes: 1 addition & 1 deletion docs/en/observability/profiling-tag-data-query.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The only config setting you may want to change is `project-id` (default value is

The `-project-id` flag, or the `project-id` key in the host-agent configuration file, splits profiling data into logical groups that you control.

You can assign any non-zero, unsigned integer <= 4095 to a host-agent deployment you control. In Kibana, the KQL field `profiling.project.id` is mapped to `project-id` and you can use it to split or filter data.
You can assign any non-zero, unsigned integer <= 4095 to a host-agent deployment you control. In Kibana, the KQL field `service.name` is mapped to `project-id` and you can use it to split or filter data.
danielmitterdorfer marked this conversation as resolved.
Show resolved Hide resolved

You may want to set a per-environment project ID (for example, dev=3, staging=2, production=1), a per-datacenter project ID (for example,
DC1=1, DC2=2), or even a per-k8s-cluster project ID (for example, us-west2-production=100, eu-west1-production=101).
Expand Down
89 changes: 0 additions & 89 deletions docs/en/observability/profiling-upgrade-fresh.asciidoc

This file was deleted.

Loading
Loading