docs: Update ingest traces (#1882)

* docs: update traces qs

* address feedback from DeDe

Author: bmorelli25

.gitignore

@@ -10,3 +10,5 @@ bin
 /html_docs
 html_docs
 .vscode
+
+workspace.code-workspace

docs/en/ingest-management/elastic-agent/install-fleet-managed-elastic-agent.asciidoc

@@ -72,7 +72,7 @@ image::images/kibana-agent-flyout.png[Add agent flyout in {kib}]
 // lint enable fleet
 
 After about a minute, the agent will enroll in {fleet}, download the
-configuration specified in the agent policy, and start collecting data. 
+configuration specified in the agent policy, and start collecting data.
 
 **Notes:**
 

docs/en/ingest-management/tab-widgets/add-fleet-server/content.asciidoc

@@ -56,7 +56,7 @@ image::images/add-fleet-server.png[In-product instructions for adding a {fleet-s
 * Make sure you download an x64 architecture installation package.
 
 * For the agent policy, choose one with a {fleet-server} integration, or click
-*Create policy* to create one now. Alternatively you can 
+*Create policy* to create one now. Alternatively you can
 {fleet-guide}/create-a-policy-no-ui.html[create a {fleet-server} policy without using the UI],
 then select the policy here.
 
@@ -78,7 +78,7 @@ sudo ./elastic-agent install \
   --fleet-server-es=http://localhost:9200 \
   --fleet-server-service-token=AAEbAWVsYXN0aWMvZmxlaXQtc2VydmVzL3Rva2VuLTE2MeIzNTY1NTQ3Mji6dERXeE9XbW5RRTZqNlJMWEdIRzAtZw \
   --fleet-server-policy=27467ed1-1bfd-11ec-9b88-a7c3d83e2897 \
-  --fleet-server-es-ca-trusted-fingerprint=3b24d33844d65532f0584d198b45006747521493522c1912608522bf175bc826 
+  --fleet-server-es-ca-trusted-fingerprint=3b24d33844d65532f0584d198b45006747521493522c1912608522bf175bc826
 ----
 +
 The following command installs a {fleet-server} and uses certificates you

docs/en/observability/ingest-logs-metrics-uptime.asciidoc

@@ -85,7 +85,7 @@ image::images/kibana-agent-add-log-path.png[Configuration page for adding log pa
 
 . Click **Save and continue**. This step takes a minute or two to complete. When
 it's done, you'll have an agent policy that contains a system integration policy
-for the configuration you just specified. 
+for the configuration you just specified.
 +
 --
 [role="screenshot"]
@@ -125,15 +125,15 @@ image::images/kibana-agent-flyout.png[Add agent flyout in {kib}]
 +
 It takes about a minute for {agent} to enroll in {fleet}, download the
 configuration specified in the policy you just created, and start collecting
-data. 
+data.
 
 [discrete]
 [[view-data]]
 == Step 4: Monitor host logs and metrics
 
 . Verify that data is flowing. Wait until agent enrollment is confirmed and
 incoming data is received, then click **View assets** to access dashboards
-related to the System integration.  
+related to the System integration.
 +
 --
 [role="screenshot"]
@@ -142,7 +142,7 @@ image::images/kibana-agent-confirm-data.png[Agent confirm data]
 
 . Choose a dashboard that is related to the operating system of your
 monitored system. Dashboards are available for Microsoft Windows systems
-and Unix-like systems (for example, Linux and macOS). 
+and Unix-like systems (for example, Linux and macOS).
 +
 --
 [role="screenshot"]
@@ -237,7 +237,7 @@ The newly added Elastic Synthetics integration should appear on the
 [role="screenshot"]
 image::images/kibana-fleet-policies-default-with-synthetics.png[{fleet} showing default agent policy with synthetics-1 data source]
 +
-All {agent}s that use this policy will collect logs, metrics, and uptime data from the host.
+Any {agent}s assigned to this policy will collect logs, metrics, and uptime data from the host.
 
 . To view the data in the {observability-guide}/view-monitor-status.html[{uptime-app}], go to
 **{observability} > Uptime** in the main menu.
@@ -280,7 +280,7 @@ your agent policy, along with the System and Elastic Synthetics integrations.
 [role="screenshot"]
 image::images/kibana-fleet-policies-default-with-nginx.png[{fleet} showing default agent policy with nginx-1 data source]
 +
-All {agent}s that use this policy will collect logs and metrics from the
+Any {agent}s assigned to this policy will collect logs and metrics from the
 Nginx server and the host, along with system logs and uptime data.
 
 . To view the data, go to **Management > {fleet}**, then click the

docs/en/observability/ingest-traces.asciidoc

@@ -46,11 +46,10 @@ you must use {fleet} to manage {agent}.
 
 [discrete]
 [[add-apm-integration]]
-== Step 2: Add the APM integration
+== Step 2: Configure the APM integration
 
-Next, add the APM integration to the default policy used by your {agent}.
-Policies manage settings across a group of {agent}s and may contain any number of integrations
-for collecting observability data from the various services running on your host.
+{ecloud} runs a hosted version of {integrations-server} that includes the APM integration.
+Self-managed users will need to add the APM integration before configuring it.
 
 include::./tab-widgets/add-apm-integration/widget.asciidoc[]
 
@@ -70,7 +69,7 @@ deploy monitoring across your infrastructure. Each agent has a single policy (a
 collection of input settings) that you can update to add integrations for new
 data sources, security protections, and more.
 
-Don't confuse {agent} with APM agents–they are different components.
+Don't confuse {agent} with APM agents--they are different components.
 In a later step, you'll instrument your code with APM agents and send the data
 to an APM Server instance that {agent} spins up.
 

docs/en/observability/tab-widgets/add-apm-integration/content.asciidoc

@@ -1,31 +1,20 @@
 // tag::ess[]
-. In {kib}, select **Add integrations** > **Elastic APM**.
-+
-[role="screenshot"]
-image::./images/kibana-fleet-integrations-apm.png[{fleet} showing APM integration]
-
-. Click **Manage APM integration in {fleet}**.
-+
-[role="screenshot"]
-image::./images/cloud-add-apm.png[Add APM integration]
-
-. On the **Elastic APM** page, select the **{ecloud} agent policy**.
+. In {kib}, navigate to **Fleet** > **Agent policies** and select the **Elastic Cloud agent policy**.
+This is the default agent policy for {agent}s hosted on {ecloud}.
 +
 [role="screenshot"]
-image::./images/cloud-apm-policy-view.png[Cloud APM policy view on the Elastic APM page]
+image::./images/cloud-agent-policy.png[Elastic Cloud agent policy]
 
-. As you can see, the APM integration has been added to the {ecloud} agent policy.
-This is the default policy for {agent}s hosted on {ecloud}.
-In the **Elastic APM** row of the table, in the **Actions** column, 
+. Next to **Elastic APM** in the **Actions** column,
 select **Edit integration** to configure the APM integration.
 +
 [role="screenshot"]
 image::./images/cloud-edit-apm.png[Edit the APM integration]
 
-. Make a note of the predefined Host and URL that the APM Server is listening on--you'll
-need these in the next step.
-If you made any changes to your configuration, click **save and continue**.
+. Make a note of the predefined URL that the APM Server is listening on--you'll
+need this in the next step.
 
+. If you made any changes to your configuration, click **save and continue**.
 // end::ess[]
 
 // tag::self-managed[]
@@ -41,25 +30,16 @@ image::./images/kibana-fleet-integrations-apm-overview.png[{fleet} showing APM i
 
 . On the **Add Elastic APM integration** page,
 define the host and port where APM Server will listen.
+Make a note of this value--you'll need it later.
 
-. Under **Apply to agent policy**, select the default policy.
-Click **Save and continue**.
-+
-In this guide, you add integrations to the default policy created by
-{kib}. After you learn the basics, you can create your own policies and assign
-them to agents.
-+
-[role="screenshot"]
-image::./images/add-integration-apm.png[{fleet} Add APM integration page]
+. Click **Save and continue**.
+This step takes a minute or two to complete. When it's done,
+you'll have an agent policy that contains an APM integration policy for the configuration you just specified.
 
-// lint disable apm-1
-. To see the updated policy, click the *Default policy* link.
-+
-The newly added APM integration should appear under **{fleet}** > **Agent policies** > **Default policy**,
-along with the default System integration.
+. To view the new policy, click **Agent policy 1**.
 +
 [role="screenshot"]
-image::./images/kibana-fleet-policies-default-with-apm.png[{fleet} showing default agent policy with apm-1 data source]
+image::./images/apm-agent-policy-1.png[{fleet} showing apm policy]
 +
-All {agent}s that use this policy will collect APM data from your instrumented services.
+Any {agent}s assigned to this policy will collect APM data from your instrumented services.
 // end::self-managed[]