Merge branch 'main' into update-eck-ocp-support

Author: pebrc

solutions/observability/apm/apm-server/advanced-setup.md

@@ -11,7 +11,11 @@ products:
 
 # APM Server advanced setup [apm-setting-up-and-running]
 
-Before reading this section, refer to [](/solutions/observability/apm/apm-server/setup.md) for basic installation and running instructions.
+Before reading this section, refer to [](/solutions/observability/apm/apm-server/setup.md) for basic installation and deployment instructions.
+
+:::{note}
+This section covers {{apm-server}} setup. We recommend using the [{{edot}} Collector](opentelemetry://reference/index.md) as the preferred way to collect application telemetry data using OpenTelemetry.
+:::
 
 This section includes additional information on how to set up and run APM Server, including:
 

solutions/observability/apm/get-started.md

@@ -15,9 +15,9 @@ products:
 
 # Get started with traces and APM [apm-getting-started-apm-server]
 
-Elastic APM receives performance data from your APM agents, validates and processes it, and then transforms the data into {{es}} documents.
+Elastic APM receives performance data from your APM agents or [Elastic Distributions of OpenTelemetry (EDOT) SDKs](opentelemetry://reference/edot-sdks/index.md), validates and processes it, and then transforms the data into {{es}} documents.
 
-In this guide you’ll learn how to collect and send Application Performance Monitoring (APM) data to Elastic, then explore and visualize the data in real time.
+In this guide you'll learn how to collect and send Application Performance Monitoring (APM) data to Elastic, then explore and visualize the data in real time.
 
 ::::{note}
 For a general Elastic {{observability}} overview, refer to [Get started with observability](/solutions/observability/get-started.md).

solutions/observability/apm/mobile-service-overview.md

@@ -2,7 +2,7 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/observability/current/apm-mobile-service-overview.html
 applies_to:
-  stack: all
+  stack: ga
 products:
   - id: observability
   - id: apm

solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md

@@ -5,6 +5,7 @@ applies_to:
   stack: ga
 products:
   - id: observability
+  - id: edot-sdk
 ---
 
 # Tutorial: Monitor a Java application [monitor-java-app]
@@ -19,6 +20,11 @@ You’ll learn how to:
 * Ingest logs using {{filebeat}} and view your logs in {{kib}}.
 * Ingest metrics using the [Metricbeat Prometheus Module](beats://reference/metricbeat/metricbeat-module-prometheus.md) and view your metrics in {{kib}}.
 * Instrument your application using the [Elastic APM Java agent](apm-agent-java://reference/index.md).
+
+:::{tip}
+We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Java SDK](elastic-otel-java://reference/edot-java/setup/index.md) as the preferred way to instrument your Java application. The EDOT Java SDK provides OpenTelemetry-based instrumentation and can send telemetry data to Elastic.
+:::
+
 * Monitor your services using {{heartbeat}} and view your uptime data in {{kib}}.
 
 ## Before you begin [_before_you_begin]
@@ -1408,6 +1414,10 @@ The third piece of {{observability}} is Application Performance Management (APM)
 
 The agent has two tasks: instrumenting the Java application to extract application performance information and sending that data to the APM Server.
 
+:::{note}
+This tutorial uses the Elastic APM Java agent. We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Java SDK](elastic-otel-java://reference/edot-java/setup/index.md) as the preferred way to instrument your Java application with OpenTelemetry-based instrumentation. Refer to the [EDOT Java SDK setup guide](elastic-otel-java://reference/edot-java/setup/index.md) for instructions.
+:::
+
 One of the APM’s core ideas is the ability to follow the flow of a user session across your whole stack, regardless of whether you have dozens of microservices or a monolith answering your user requests. This implies the ability to tag a request across your entire stack.
 
 To fully capture user activity, you need to start in the browser of the user using Real User Monitoring (RUM) down to your application, which sends a SQL query to your database.

solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md

@@ -22,6 +22,10 @@ To scan your host, you’ll run an auto-detection script that downloads and inst
 
 The script also generates an {{agent}} configuration file that you can use with your existing Infrastructure-as-Code tooling.
 
+:::{tip}
+We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) as the preferred way to collect system metrics and logs using OpenTelemetry.
+:::
+
 
 ## Prerequisites [_prerequisites]
 

solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md

@@ -13,7 +13,11 @@ products:
 
 # Quickstart: Monitor your Kubernetes cluster with {{agent}} [monitor-k8s-logs-metrics-with-elastic-agent]
 
-In this quickstart guide, you’ll learn how to create the Kubernetes resources required to monitor your cluster infrastructure by using a single command to download, install, and configure {{agent}} in your Kubernetes cluster.
+In this quickstart guide, you'll learn how to create the Kubernetes resources required to monitor your cluster infrastructure by using a single command to download, install, and configure {{agent}} in your Kubernetes cluster.
+
+:::{tip}
+We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md) as the preferred way to collect Kubernetes logs, metrics, and application traces using OpenTelemetry.
+:::
 
 :::{note}
 In {{stack}} versions 9.0 and 9.1, the quickstart uses [Kubectl](https://kubernetes.io/docs/reference/kubectl/) to install {{agent}} in a Kubernetes cluster. However, these versions also support using [Helm](https://helm.sh/docs/) charts, which is now the preferred method for installing {{agent}} on Kubernetes. If your cluster is on version 9.0 or 9.1, we recommend that you follow the [Install Elastic Agent on Kubernetes using Helm](/reference/fleet/install-on-kubernetes-using-helm.md) guide to deploy {{agent}}.

solutions/observability/infra-and-hosts/get-started-with-system-metrics.md

@@ -15,7 +15,7 @@ products:
 In this guide you can learn how to onboard system metrics data from a machine or server using {{fleet}}-managed {{agent}}.
 
 :::{tip}
-To get started quickly without {{fleet}}, follow the steps described in the [quickstarts](/solutions/observability/get-started/quickstarts.md).
+To get started quickly without {{fleet}}, follow the steps described in the [quickstarts](/solutions/observability/get-started/quickstarts.md). We recommend using the [{{edot}} Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) as the preferred way to collect system metrics and logs.
 :::
 
 ## Prerequisites [logs-metrics-prereqs]