Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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: 1 addition & 1 deletion reference/fleet/otel-agent-transform.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ To change a running standalone {{agent}} to run as an OTel Collector:
└─ status: StatusOK
```

Host logs and metrics are now being collected and ingested by the {{agent}} service running an OTel Collector instance. For further details about OpenTelemetry Collector components supported by {{agent}}, refer to [Components](opentelemetry://reference/edot-collector/components.md).
Host logs and metrics are now being collected and ingested by the {{agent}} service running an OTel Collector instance. For further details about OpenTelemetry Collector components supported by {{agent}}, refer to [Components](elastic-agent://reference/edot-collector/components.md).
4 changes: 2 additions & 2 deletions reference/fleet/otel-agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ products:

# Run Elastic Agent as an EDOT Collector [otel-agent]

The [Elastic Distribution of OpenTelemetry (EDOT) Collector](opentelemetry://reference/edot-collector/index.md) is an open-source agent that can receive, process, and export telemetry data. {{agent}} includes an embedded EDOT Collector that allows you to instrument your applications and infrastructure once, and send data to multiple vendors and backends.
The [Elastic Distribution of OpenTelemetry (EDOT) Collector](elastic-agent://reference/edot-collector/index.md) is an open-source agent that can receive, process, and export telemetry data. {{agent}} includes an embedded EDOT Collector that allows you to instrument your applications and infrastructure once, and send data to multiple vendors and backends.

When you run {{agent}} in `otel` mode, it supports the standard OpenTelemetry Collector configuration format that defines a set of receivers, processors, exporters, and connectors. Logs, metrics, and traces can be collected and exported using OpenTelemetry data formats.

For a full overview and steps to configure {{agent}} in `otel` mode, including a guided onboarding, refer to [Elastic Distributions for OpenTelemetry](opentelemetry://reference/edot-collector/index.md). You can also check the [`elastic-agent otel` command](/reference/fleet/agent-command-reference.md#elastic-agent-otel-command) in the {{fleet}} and {{agent}} Command reference.
For a full overview and steps to configure {{agent}} in `otel` mode, including a guided onboarding, refer to [Elastic Distributions for OpenTelemetry](elastic-agent://reference/edot-collector/index.md). You can also check the [`elastic-agent otel` command](/reference/fleet/agent-command-reference.md#elastic-agent-otel-command) in the {{fleet}} and {{agent}} Command reference.

If you have a currently running {{agent}} you can [transform it to run as an OTel Collector](/reference/fleet/otel-agent-transform.md).
2 changes: 1 addition & 1 deletion solutions/observability/apm/limitations.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ products:
* The application logs data stream (`app_logs`) has dynamic mapping disabled. This means the automatic detection and mapping of new fields is disabled (see issue [#9093](https://github.com/elastic/apm-server/issues/9093)).

::::{note}
Logs ingest through the [EDOT Collector](opentelemetry://reference/edot-collector/index.md) is fully supported.
Logs ingest through the [EDOT Collector](elastic-agent://reference/edot-collector/index.md) is fully supported.
::::

## OpenTelemetry Line Protocol (OTLP) [apm-open-telemetry-otlp-limitations]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ With an [Elastic Distribution of OpenTelemetry language SDK](opentelemetry://ref

* You can get access to SDK improvements and bug fixes contributed by the Elastic team before the changes are available in the OpenTelemetry repositories.
* The distribution configures the collection of tracing and metrics signals, applying opinionated defaults, such as which sources are collected by default.
* By sending data through the [EDOT Collector](opentelemetry://reference/edot-collector/index.md), you make sure to onboard infrastructure logs and metrics.
* By sending data through the [EDOT Collector](elastic-agent://reference/edot-collector/index.md), you make sure to onboard infrastructure logs and metrics.

To set up OpenTelemetry with Elastic, refer to these guides for each language:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ The following sections provide troubleshooting information for the {{motlp}}.

Don't have a collector or SDK running? Spin up an EDOT collector in just a few steps:

* [Kubernetes Quickstart](opentelemetry://reference/quickstart/serverless/k8s.md)
* [Hosts & VMs Quickstart](opentelemetry://reference/quickstart/serverless/hosts_vms.md)
* [Docker Quickstart](opentelemetry://reference/quickstart/serverless/docker.md)
* [Kubernetes Quickstart](/solutions/observability/get-started/opentelemetry/quickstart/serverless/k8s.md)
* [Hosts & VMs Quickstart](/solutions/observability/get-started/opentelemetry/quickstart/serverless/hosts_vms.md)
* [Docker Quickstart](/solutions/observability/get-started/opentelemetry/quickstart/serverless/docker.md)

### Api Key prefix not found

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ In this quickstart guide, you’ll learn how to instrument your application usin

## Install the EDOT Collector [_install_edot_collector]

The EDOT Collector in [Agent mode](opentelemetry://reference/edot-collector/modes.md#edot-collector-as-agent) collects infrastructure and application telemetry data sent by the EDOT SDKs and forwards it to Elastic.
The EDOT Collector in [Agent mode](elastic-agent://reference/edot-collector/modes.md#edot-collector-as-agent) collects infrastructure and application telemetry data sent by the EDOT SDKs and forwards it to Elastic.

Refer to the [EDOT Quickstarts](opentelemetry://reference/quickstart/index.md) to install the EDOT Collector for your deployment mode.
Refer to the [EDOT Quickstarts](/solutions/observability/get-started/opentelemetry/quickstart/index.md) to install the EDOT Collector for your deployment mode.

## Collect application telemetry data [_collect_your_data]

Expand All @@ -66,7 +66,7 @@ Follow these steps to collect application telemetry data using the EDOT SDKs:
4. Configure your EDOT SDK to send data to the APM endpoint. The **OpenTelemetry** tab provides the required configuration values.

:::{note}
If your application runs on Kubernetes, the OpenTelemetry operator automatically instruments your application, provided you've added language-specific annotations. Refer to [Auto-instrument applications](opentelemetry://reference/quickstart/self-managed/k8s.md).
If your application runs on Kubernetes, the OpenTelemetry operator automatically instruments your application, provided you've added language-specific annotations. Refer to [Auto-instrument applications](/solutions/observability/get-started/opentelemetry/quickstart/self-managed/k8s.md).
:::

::::
Expand All @@ -88,7 +88,7 @@ If your application runs on Kubernetes, the OpenTelemetry operator automatically
4. Configure your EDOT SDK to send data to the [Managed OTLP endpoint](opentelemetry://reference/motlp.md). The **OpenTelemetry** tab provides the required configuration values.

:::{note}
If your application runs on Kubernetes, the OpenTelemetry operator automatically instruments your application, provided you've added language-specific annotations. Refer to [Auto-instrument applications](opentelemetry://reference/quickstart/serverless/k8s.md).
If your application runs on Kubernetes, the OpenTelemetry operator automatically instruments your application, provided you've added language-specific annotations. Refer to [Auto-instrument applications](/solutions/observability/get-started/opentelemetry/quickstart/serverless/k8s.md).
:::

::::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ To learn more about the metrics shown on this page, refer to the [Metrics refere
If you haven’t added data yet, click **Add data → Host** and select how you want to monitor your host—OpenTelemetry or Elastic Agent.

For more on collecting host data, refer to:
* [OpenTelemetry](opentelemetry://reference/edot-collector/config/configure-metrics-collection.md#process-metrics)
* [OpenTelemetry](elastic-agent://reference/edot-collector/config/configure-metrics-collection.md#process-metrics)
* [Elastic System integration](integration-docs://reference/system.md)

::::
Expand Down Expand Up @@ -226,7 +226,7 @@ The **Metrics** tab shows host metrics organized by type and is more complete th
:::::{dropdown} Processes
:::{note}
{applies_to}`{stack: "ga 9.2", serverless: "ga"}`
To view processes for OpenTelemetry hosts, you need to configure the EDOT collector to send process metrics. Refer to [Process metrics](opentelemetry://reference/edot-collector/config/configure-metrics-collection.md#process-metrics) for more information.
To view processes for OpenTelemetry hosts, you need to configure the EDOT collector to send process metrics. Refer to [Process metrics](elastic-agent://reference/edot-collector/config/configure-metrics-collection.md#process-metrics) for more information.
:::

The **Processes** tab lists the total number of processes (`system.process.summary.total`) running on the host, along with the total number of processes in these various states:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ The **Metrics** tab shows host metrics organized by type and is more complete th
:::::{dropdown} Processes
:::{note}
{applies_to}`{stack: "ga 9.2", serverless: "ga"}`
To view processes for OpenTelemetry hosts, you need to configure the EDOT collector to send process metrics. Refer to [Process metrics](opentelemetry://reference/edot-collector/config/configure-metrics-collection.md#process-metrics) for more information.
To view processes for OpenTelemetry hosts, you need to configure the EDOT collector to send process metrics. Refer to [Process metrics](elastic-agent://reference/edot-collector/config/configure-metrics-collection.md#process-metrics) for more information.
:::

The **Processes** tab lists the total number of processes (`system.process.summary.total`) running on the host, along with the total number of processes in these various states:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ products:

This guide shows you how to manually configure the {{edot}} (EDOT) Collector to send your log data to {{es}} by configuring the `otel.yml` file. For an Elastic Agent equivalent, refer to [Stream any log file using {{agent}}](/solutions/observability/logs/stream-any-log-file.md).

For more OpenTelemetry quickstarts, refer to [EDOT quickstarts](opentelemetry://reference/quickstart/index.md).
For more OpenTelemetry quickstarts, refer to [EDOT quickstarts](/solutions/observability/get-started/opentelemetry/quickstart/index.md).

## Prerequisites [logs-stream-edot-prereq]

Expand Down Expand Up @@ -356,7 +356,7 @@ If you're not seeing your log files in the UI, verify the following:
* The OTLP endpoint URL is correct and accessible.
* The Collector is running without errors (check the console output).

If you're still running into issues, see [EDOT Collector troubleshooting](/troubleshoot/ingest/opentelemetry/edot-collector/index.md) and [Configure EDOT Collector](opentelemetry://reference/edot-collector/config/index.md).
If you're still running into issues, see [EDOT Collector troubleshooting](/troubleshoot/ingest/opentelemetry/edot-collector/index.md) and [Configure EDOT Collector](elastic-agent://reference/edot-collector/config/index.md).

## Next steps [logs-stream-edot-next-steps]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ Your export endpoint URL is the value for the `OTEL_EXPORTER_OTLP_ENDPOINT` conf

### Cloud hosted and self-managed deployments

For Elastic Cloud Hosted (ECH) and self-managed deployments, the export endpoint, also known as [EDOT Collector](opentelemetry://reference/edot-collector/index.md), is not available out of the box at the moment. You can still create your own service by [downloading](elastic-agent://reference/edot-collector/download.md) and [configuring an EDOT Collector](elastic-agent://reference/edot-collector/config/default-config-standalone.md#gateway-mode).
For Elastic Cloud Hosted (ECH) and self-managed deployments, the export endpoint, also known as [EDOT Collector](elastic-agent://reference/edot-collector/index.md), is not available out of the box at the moment. You can still create your own service by [downloading](elastic-agent://reference/edot-collector/download.md) and [configuring an EDOT Collector](elastic-agent://reference/edot-collector/config/default-config-standalone.md#gateway-mode).

### Local testing deployment

You can quickly launch a local [EDOT Collector](opentelemetry://reference/edot-collector/index.md) service and use it as your export endpoint for testing by running the EDOT Collector launcher as mentioned in the [Sample application guide](https://github.com/elastic/apm-agent-android/tree/main/sample-app#how-to-run). Note that it's not necessary to follow the whole guide, only the parts relevant to launching the EDOT Collector.
You can quickly launch a local [EDOT Collector](elastic-agent://reference/edot-collector/index.md) service and use it as your export endpoint for testing by running the EDOT Collector launcher as mentioned in the [Sample application guide](https://github.com/elastic/apm-agent-android/tree/main/sample-app#how-to-run). Note that it's not necessary to follow the whole guide, only the parts relevant to launching the EDOT Collector.

## Create an API key [create-api-key]

Expand Down