Update quick starts for 7.16 (elastic#1248)

* docs: new screenshots

* docs: update text

* docs: use aboslute file paths instead of attrs

* docs: remove extra include

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

@@ -63,7 +63,7 @@ installation package.
 --
 // tag::install-elastic-agent[]
 
-include::{tab-widgets}/download-widget.asciidoc[]
+include::../tab-widgets/download-widget.asciidoc[]
 
 // end::install-elastic-agent[]
 --
@@ -94,7 +94,7 @@ service. The DEB and RPM packages include a service unit for Linux systems with
 systemd, so use the `enroll` command instead of `install`.
 +
 --
-include::{tab-widgets}/install-widget.asciidoc[]
+include::../tab-widgets/install-widget.asciidoc[]
 --
 +
 TIP: If you see an "x509: certificate signed by unknown authority" error, you

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

@@ -103,7 +103,7 @@ You use policies to manage settings across a group of agents. An agent policy ma
 contain any number of integrations for collecting observability data from the various
 services running on your host.
 
-. In {kib}, go to **Management > Integrations**,
+. In {kib}, select **Add integrations**,
 and search for the **Elastic Synthetics** integration.
 +
 [role="screenshot"]
@@ -163,12 +163,12 @@ them to agents.
 [role="screenshot"]
 image::images/add-synthetics-integration.png[{fleet} Add Synthetics integration page]
 
-. When you're done, click *Save integration*, then *Save and deploy changes*.
+. When you're done, click *Save and continue*, then *Save and deploy changes*.
 
 . To see the updated policy, click the *Default policy* link.
 +
 The newly added Elastic Synthetics integration should appear under **Integrations** in the
-default policy, along with the `system-1` integration.
+default policy, along with the System integration.
 +
 [role="screenshot"]
 image::images/kibana-fleet-policies-default-with-synthetics.png[{fleet} showing default agent policy with synthetics-1 datasource]
@@ -189,7 +189,7 @@ the default policy used by your agent.
 NOTE: For these steps, we assume that you have `nginx` running on some of your
 infrastructure, and want to collect logs and metrics from it.
 
-. In {kib}, go back to **Management > Integrations**,
+. In {kib}, go back to **Add integrations**,
 and search for the **Nginx** integration.
 +
 [role="screenshot"]
@@ -220,7 +220,7 @@ settings
 . To see the updated policy, click the *Default policy* link.
 +
 The newly added Nginx integration should appear under **Integrations** in the
-default policy, along with the `system-1` and `synthetics-1` integrations.
+default 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 datasource]

docs/en/observability/ingest-traces.asciidoc

@@ -5,6 +5,9 @@
 <titleabbrev>Ingest traces</titleabbrev>
 ++++
 
+// THIS CONTENT IS ALSO USED IN THE APM GUIDE
+// tag::apm-quick-start[]
+
 This guide describes how to:
 
 * Collect Application Performance Monitoring (APM) data
@@ -25,7 +28,7 @@ on {ecloud} (recommended), or self-manage the {stack} on your own hardware.
 Here's what you need for each deployment type:
 +
 --
-include::{tab-widgets}/prereq-widget.asciidoc[]
+include::../ingest-management/tab-widgets/prereq-widget.asciidoc[]
 --
 
 * An internet connection is required for {kib} to download integration packages
@@ -44,7 +47,7 @@ Use {fleet} in {kib} to get APM data into the {stack}.
 The first time you use {fleet}, you might need to set it up and add a
 {fleet-server}:
 
-include::{tab-widgets}/add-fleet-server/widget.asciidoc[]
+include::../ingest-management/tab-widgets/add-fleet-server/widget.asciidoc[]
 
 For more information, refer to {fleet-guide}/fleet-server.html[{fleet-server}].
 
@@ -68,7 +71,7 @@ If RUM is disabled, you should run {agent} on edge machines.
 
 To send APM data to the {stack}:
 
-include::{fleet-repo-dir}/elastic-agent/install-fleet-managed-elastic-agent.asciidoc[tag=agent-enroll]
+include::../ingest-management/elastic-agent/install-fleet-managed-elastic-agent.asciidoc[tag=agent-enroll]
 
 [discrete]
 [[add-apm-integration]]
@@ -80,23 +83,23 @@ across a group of agents. An agent policy may contain any number of integrations
 for collecting observability data from the various services running on your
 host.
 
-. In {kib}, go to **Management > Integrations**,
-and search for the **Elastic APM** integration.
+. In {kib}, select **Add integrations**.
 +
 [role="screenshot"]
 image::images/kibana-fleet-integrations-apm.png[{fleet} showing APM integration]
-. Click the APM integration to see more details about it, then click
+. Click the **Elastic APM** integration to see more details about it, then click
 **Add Elastic APM**.
 +
 [role="screenshot"]
 image::images/kibana-fleet-integrations-apm-overview.png[{fleet} showing APM integration overview]
 
-. On the **Add APM integration** page,
-click the down arrow next to Collect application traces.
-Under **Host**, define the host and port where APM Server will listen.
+. On the **Add Elastic APM integration** page,
+define the host and port where APM Server will listen.
+If you're using our hosted **Elastic Cloud** offering, the URL where APM Server listens will be predefined.
 Inspect or change other settings.
 
 . 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
@@ -109,8 +112,8 @@ image::images/add-integration-apm.png[{fleet} Add APM integration page]
 
 . To see the updated policy, click the *Default policy* link.
 +
-The newly added APM integration should appear under **Integrations** in the
-default policy, along with the default `system-1` integration.
+The newly added APM integration should appear under **Fleet** > **Agent policies** > **Default policy**,
+along with the default System integration.
 +
 [role="screenshot"]
 image::images/kibana-fleet-policies-default-with-apm.png[{fleet} showing default agent policy with apm-1 datasource]
@@ -141,7 +144,14 @@ TIP: You can edit your APM integration settings if you need to change the APM Se
 or secret token to match your APM agents.
 
 --
+// this if directive includes the same file, but changes the file path based on where this guide is built
+ifndef::apm-integration-docs[]
 include::{apm-repo-dir}/legacy/tab-widgets/install-agents-widget.asciidoc[]
+endif::[]
+
+ifdef::apm-integration-docs[]
+include::{docdir}/legacy/tab-widgets/install-agents-widget.asciidoc[]
+endif::[]
 --
 
 [discrete]
@@ -179,3 +189,5 @@ problems while sipping your favorite beverage poolside.
 
 * Got everything working like you want it? Roll out your agent policies to
 other hosts by deploying {agent}s across your infrastructure!
+
+// end::apm-quick-start[]

docs/en/observability/instrument-apps.asciidoc

@@ -19,10 +19,6 @@ visualizing and managing it, and APM Server. For more information, see <<spin-up
 [[install-apm-agents]]
 == Step 1: Install APM agents
 
-:leveloffset: -1
-include::{apm-repo-dir}/apm-quick-start.asciidoc[tag=apm-agent]
-:leveloffset: +1
-
 --
 include::{apm-repo-dir}/legacy/tab-widgets/install-agents-widget.asciidoc[]
 --