Skip to content

Commit b31385b

Browse files
committed
Add EDOT references and tags across observability documentation
1 parent 126dfec commit b31385b

File tree

7 files changed

+32
-3
lines changed

7 files changed

+32
-3
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,18 @@ applies_to:
77
products:
88
- id: observability
99
- id: apm
10+
- id: edot-collector
11+
- id: edot-sdk
1012
---
1113

1214
# APM Server advanced setup [apm-setting-up-and-running]
1315

1416
Before reading this section, refer to [](/solutions/observability/apm/apm-server/setup.md) for basic installation and running instructions.
1517

18+
:::{note}
19+
This section covers APM Server setup. As an alternative, you can use the [Elastic Distribution of OpenTelemetry (EDOT) Collector](opentelemetry://reference/index.md) to collect application telemetry data using OpenTelemetry. For mobile applications, you can use the [EDOT Android SDK](apm-agent-android://reference/edot-android/index.md) or [EDOT iOS SDK](apm-agent-ios://reference/edot-ios/index.md).
20+
:::
21+
1622
This section includes additional information on how to set up and run APM Server, including:
1723

1824
* [Installation layout](/solutions/observability/apm/apm-server/installation-layout.md)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
mapped_pages:
33
- https://www.elastic.co/guide/en/observability/current/apm-mobile-service-overview.html
44
applies_to:
5-
stack: all
5+
stack: ga
66
products:
77
- id: observability
88
- id: apm
9+
- id: edot-sdk
910
---
1011

1112
# Mobile service overview [apm-mobile-service-overview]

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ applies_to:
55
stack: ga
66
products:
77
- id: observability
8+
- id: edot-sdk
89
---
910

1011
# Tutorial: Monitor a Java application [monitor-java-app]
@@ -19,6 +20,11 @@ You’ll learn how to:
1920
* Ingest logs using {{filebeat}} and view your logs in {{kib}}.
2021
* Ingest metrics using the [Metricbeat Prometheus Module](beats://reference/metricbeat/metricbeat-module-prometheus.md) and view your metrics in {{kib}}.
2122
* Instrument your application using the [Elastic APM Java agent](apm-agent-java://reference/index.md).
23+
24+
:::{tip}
25+
You can also instrument your Java application using the [Elastic Distribution of OpenTelemetry (EDOT) Java SDK](elastic-otel-java://reference/edot-java/setup/index.md) as an alternative to the Elastic APM Java agent. The EDOT Java SDK provides OpenTelemetry-based instrumentation and can send telemetry data to Elastic.
26+
:::
27+
2228
* Monitor your services using {{heartbeat}} and view your uptime data in {{kib}}.
2329

2430
## Before you begin [_before_you_begin]
@@ -1408,6 +1414,10 @@ The third piece of {{observability}} is Application Performance Management (APM)
14081414
14091415
The agent has two tasks: instrumenting the Java application to extract application performance information and sending that data to the APM Server.
14101416
1417+
:::{note}
1418+
This tutorial uses the Elastic APM Java agent. As an alternative, you can use the [Elastic Distribution of OpenTelemetry (EDOT) Java SDK](elastic-otel-java://reference/edot-java/setup/index.md) for OpenTelemetry-based instrumentation. Refer to the [EDOT Java SDK setup guide](elastic-otel-java://reference/edot-java/setup/index.md) for instructions.
1419+
:::
1420+
14111421
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.
14121422
14131423
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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ products:
1212
- id: observability
1313
- id: cloud-serverless
1414
- id: elastic-stack
15+
- id: edot-collector
1516
---
1617

1718
# Quickstart: Monitor hosts with {{agent}} [quickstart-monitor-hosts-with-elastic-agent]
@@ -22,6 +23,10 @@ To scan your host, you’ll run an auto-detection script that downloads and inst
2223

2324
The script also generates an {{agent}} configuration file that you can use with your existing Infrastructure-as-Code tooling.
2425

26+
:::{tip}
27+
You can also use the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) to collect system metrics and logs using OpenTelemetry.
28+
:::
29+
2530

2631
## Prerequisites [_prerequisites]
2732

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,16 @@ applies_to:
99
products:
1010
- id: cloud-serverless
1111
- id: observability
12+
- id: edot-collector
1213
---
1314

1415
# Quickstart: Monitor your Kubernetes cluster with {{agent}} [monitor-k8s-logs-metrics-with-elastic-agent]
1516

16-
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.
17+
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.
18+
19+
:::{tip}
20+
You can also use the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md) to collect Kubernetes logs, metrics, and application traces using OpenTelemetry.
21+
:::
1722

1823
:::{note}
1924
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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ applies_to:
88
products:
99
- id: observability
1010
- id: cloud-serverless
11+
- id: edot-collector
1112
---
1213

1314
# Get started with system metrics [logs-metrics-get-started]
1415

1516
In this guide you can learn how to onboard system metrics data from a machine or server using {{fleet}}-managed {{agent}}.
1617

1718
:::{tip}
18-
To get started quickly without {{fleet}}, follow the steps described in the [quickstarts](/solutions/observability/get-started/quickstarts.md).
19+
To get started quickly without {{fleet}}, follow the steps described in the [quickstarts](/solutions/observability/get-started/quickstarts.md). You can also use the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) as an alternative to collect system metrics and logs.
1920
:::
2021

2122
## Prerequisites [logs-metrics-prereqs]

solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ applies_to:
66
stack: ga
77
products:
88
- id: observability
9+
- id: edot-collector
910
---
1011

1112

0 commit comments

Comments
 (0)