Skip to content

Commit ed1cc85

Browse files
Edit Fleet and APM docs for OTel references (#1441)
Remove technical preview notices and edit links and other references. Contributes to https://github.com/elastic/observability-docs/issues/4891 --------- Co-authored-by: Aleksandra Spilkowska <[email protected]>
1 parent 85c3297 commit ed1cc85

File tree

6 files changed

+36
-52
lines changed

6 files changed

+36
-52
lines changed

reference/fleet/agent-command-reference.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -784,13 +784,7 @@ elastic-agent install --url=https://fleet-server:8220 \
784784

785785
## elastic-agent otel [elastic-agent-otel-command]
786786

787-
::::{warning}
788-
This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.
789-
::::
790-
791-
792-
Run {{agent}} as an [OpenTelemetry Collector](/reference/fleet/otel-agent.md).
793-
787+
Run {{agent}} as an [Elastic Distribution of OpenTelemetry Collector (EDOT Collector)](/reference/fleet/otel-agent.md).
794788

795789
### Synopsis [_synopsis_6]
796790

@@ -804,7 +798,6 @@ You can also run the `./otelcol` command, which calls `./elastic-agent otel` and
804798
::::
805799

806800

807-
808801
### Available commands [_available_commands]
809802

810803
`validate`
@@ -828,13 +821,13 @@ You can also run the `./otelcol` command, which calls `./elastic-agent otel` and
828821

829822
### Examples [_examples_15]
830823

831-
Run {{agent}} as on OTel Collector using the supplied `otel.yml` configuration file.
824+
Run {{agent}} as an EDOT Collector using the supplied `otel.yml` configuration file.
832825

833826
```shell
834827
./elastic-agent otel --config otel.yml
835828
```
836829

837-
Change the default verbosity setting in the {{agent}} OTel configuration from `detailed` to `normal`.
830+
Change the default verbosity setting in the {{agent}} EDOT Collector configuration from `detailed` to `normal`.
838831

839832
```shell
840833
./elastic-agent otel --config otel.yml --set "exporters::debug::verbosity=normal"

reference/fleet/otel-agent-transform.md

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,35 @@ mapped_pages:
44
products:
55
- id: fleet
66
- id: elastic-agent
7+
- id: edot-collector
78
---
89

9-
# Transform an installed {{agent}} to run as an OTel Collector [otel-agent-transform]
10+
# Transform an installed {{agent}} to run as an EDOT Collector [otel-agent-transform]
1011

11-
::::{warning}
12-
This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.
13-
::::
12+
If you have a currently installed standalone {{agent}}, you can configure it to run as an [Elastic Distribution of OpenTelemetry Collector](otel-agent.md). This allows you to run {{agent}} both as a service and in an OTel Collector mode.
1413

14+
To configure an installed standalone {{agent}} to run as an OTel Collector, include a valid [OTel Collector](otel-agent.md) configuration in the `elastic-agent.yml` file, as shown in the following example.
1515

16-
If you have a currently installed standalone {{agent}}, it can be configured to run as an [OTel Collector](otel-agent.md). This allows you to run {{agent}} both as a service and in an OTel Collector mode.
16+
## Example: Configure {{agent}} to ingest host logs and metrics into Elasticsearch using the OTel Collector [_example_configure_agent_to_ingest_host_logs_and_metrics_into_elasticsearch_using_the_otel_collector]
1717

18-
In order to configure an installed standalone {{agent}} to run as an OTel Collector, it’s enough to include a valid [OTel Collector](otel-agent.md) configuration in the `elastic-agent.yml` file, as shown in the following example.
18+
### Prerequisites
1919

20-
## Example: configure {{agent}} to ingest host logs and metrics into Elasticsearch using the OTel Collector [_example_configure_agent_to_ingest_host_logs_and_metrics_into_elasticsearch_using_the_otel_collector]
20+
To ingest host logs and metrics into Elasticsearch using the OTel Collector, you need the following:
2121

22-
**Prerequisites**
23-
24-
You’ll need the following:
25-
26-
1. A suitable [{{es}} API key](grant-access-to-elasticsearch.md#create-api-key-standalone-agent) for authenticating on Elasticsearch
27-
2. An installed standalone {{agent}}
28-
3. A valid OTel Collector configuration. In this example we’ll use the OTel sample configuration included in the {{agent}} repository: `otel_samples/platformlogs_hostmetrics.yml`.
22+
1. A suitable [{{es}} API key](grant-access-to-elasticsearch.md#create-api-key-standalone-agent) for authenticating on Elasticsearch.
23+
2. An installed standalone {{agent}}.
24+
3. A valid OTel Collector configuration. This example uses the OTel sample configuration included in the {{agent}} repository: `otel_samples/platformlogs_hostmetrics.yml`.
2925

3026
* [Linux version](https://github.com/elastic/elastic-agent/blob/main/internal/pkg/otel/samples/linux/platformlogs_hostmetrics.yml)
3127
* [MacOS version](https://github.com/elastic/elastic-agent/blob/main/internal/pkg/otel/samples/darwin/platformlogs_hostmetrics.yml)
3228

33-
34-
**Steps**
29+
### Steps
3530

3631
To change a running standalone {{agent}} to run as an OTel Collector:
3732

38-
1. Create a directory where the OTel Collector can save its state. In this example we use `<Elastic Agent install directory>/data/otelcol`.
33+
1. Create a directory where the OTel Collector can save its state. This example uses `<Elastic Agent install directory>/data/otelcol`.
3934
2. Open the `<Elastic Agent install directory>/otel_samples/platformlogs_hostmetrics.yml` file for editing.
40-
3. Set environment details to be used by OTel Collector:
35+
3. Set the environment variables to be used by the OTel Collector:
4136

4237
* **Option 1:** Define environment variables for the {{agent}} service:
4338

@@ -51,14 +46,14 @@ To change a running standalone {{agent}} to run as an OTel Collector:
5146
* `${env:ELASTIC_API_KEY}`: The API Key to use to authenticate with {{es}}
5247
* `${env:STORAGE_DIR}`: The directory where the OTel Collector can persist its state
5348

54-
4. Save the opened OTel configuration as `elastic-agent.yml`, overwriting the default configuration of the installed agent.
49+
4. Save the OTel configuration as `elastic-agent.yml`, overwriting the default configuration of the installed agent.
5550
5. Run the `elastic-agent status` command to verify that the new configuration has been correctly applied:
5651

5752
```shell
5853
elastic-agent status
5954
```
6055

61-
The OTel Collector running configuration should appear under `elastic-agent` key (note the `extensions` and `pipeline` keys):
56+
The OTel Collector running configuration appears under `elastic-agent` key (note the `extensions` and `pipeline` keys):
6257

6358
```shell
6459
┌─ fleet
@@ -93,4 +88,4 @@ To change a running standalone {{agent}} to run as an OTel Collector:
9388
└─ status: StatusOK
9489
```
9590

96-
6. Congratulations! 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 the [Elastic Distribution for OpenTelemetry Collector README](https://github.com/elastic/elastic-agent/tree/main/internal/pkg/otel#components).
91+
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).

reference/fleet/otel-agent.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@ mapped_pages:
44
products:
55
- id: fleet
66
- id: elastic-agent
7+
- id: edot-collector
78
---
89

9-
# Run Elastic Agent as an OTel Collector [otel-agent]
10+
# Run Elastic Agent as an EDOT Collector [otel-agent]
1011

11-
::::{warning}
12-
This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.
13-
::::
12+
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.
1413

14+
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.
1515

16-
The [OpenTelemetry Collector](https://opentelemetry.io/docs/collector/) is a vendor-neutral way to receive, process, and export telemetry data. {{agent}} includes an embedded OTel Collector, enabling you to instrument your applications and infrastructure once, and send data to multiple vendors and backends.
16+
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.
1717

18-
When you run {{agent}} in `otel` mode it supports the standard OTel Collector configuration format that defines a set of receivers, processors, exporters, and connectors. Logs, metrics, and traces can be ingested using OpenTelemetry data formats.
19-
20-
For a full overview and steps to configure {{agent}} in `otel` mode, including a guided onboarding, refer to [Elastic Distributions for OpenTelemetry](opentelemetry://reference/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.
21-
22-
If you have a currently running {{agent}} you can [transform it to run as an OTel Collector](/reference/fleet/otel-agent.md).
18+
If you have a currently running {{agent}} you can [transform it to run as an OTel Collector](/reference/fleet/otel-agent-transform.md).

solutions/observability/apm/attributes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ Use the `OTEL_RESOURCE_ATTRIBUTES` environment variable to pass resource attribu
3131
export OTEL_RESOURCE_ATTRIBUTES=deployment.environment=production
3232
```
3333

34-
### OpenTelemetry Collector
34+
### Elastic Distribution of OpenTelemetry Collector (EDOT Collector)
3535

36-
Use the [resource processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor) to set or apply changes to resource attributes when using the OTel Collector.
36+
Use the [resource processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor) to set or apply changes to resource attributes when using the EDOT Collector.
3737

3838
```yaml
3939
...

solutions/observability/apm/upstream-opentelemetry-collectors-language-sdks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ When using a layer 7 (L7) proxy like AWS ALB, requests must be proxied in a way
257257

258258
Many L7 load balancers handle HTTP and gRPC traffic separately and rely on explicitly defined routes and service configurations to correctly proxy requests. Since APM Server serves both protocols on the same port, it may not be compatible with some L7 load balancers. For example, to work around this issue in [Ingress NGINX Controller for Kubernetes](https://github.com/kubernetes/ingress-nginx), either:
259259

260-
* Use the `otlp` exporter in the OTel collector. Set annotation `nginx.ingress.kubernetes.io/backend-protocol: "GRPC"` on the K8s Ingress object proxying to APM Server.
261-
* Use the `otlphttp` exporter in the OTel collector. Set annotation `nginx.ingress.kubernetes.io/backend-protocol: "HTTP"` (or `"HTTPS"` if APM Server expects TLS) on the K8s Ingress object proxying to APM Server.
260+
* Use the `otlp` exporter in the EDOT collector. Set annotation `nginx.ingress.kubernetes.io/backend-protocol: "GRPC"` on the K8s Ingress object proxying to APM Server.
261+
* Use the `otlphttp` exporter in the EDOT collector. Set annotation `nginx.ingress.kubernetes.io/backend-protocol: "HTTP"` (or `"HTTPS"` if APM Server expects TLS) on the K8s Ingress object proxying to APM Server.
262262

263263
The preferred approach is to deploy a L4 (TCP) load balancer (e.g. [NLB](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html) on AWS) in front of APM Server, which forwards raw TCP traffic transparently without protocol inspection.
264264

solutions/observability/get-started/quickstart-elastic-cloud-otel-endpoint.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The Elastic Cloud Managed OTLP Endpoint ensures that OpenTelemetry data is store
2525
## Prerequisites
2626

2727
* An {{obs-serverless}} project. To learn more, refer to [create an Observability project](/solutions/observability/get-started/create-an-observability-project.md).
28-
* A system forwarding logs, metrics, or traces in OTLP (any OTel Collector or SDK—EDOT or community).
28+
* A system forwarding logs, metrics, or traces in OTLP (any EDOT Collector or SDK—EDOT or community).
2929

3030
### Limitations
3131

@@ -69,18 +69,18 @@ The Elastic Cloud Managed OTLP Endpoint ensures that OpenTelemetry data is store
6969

7070
### Send data to your Elastic Cloud Managed OTLP endpoint
7171

72-
* [I have an OTel Collector/SDK running](#otel-sdk-running)
73-
* [I need an OTel Collector/SDK](#no-sdk-running)
72+
* [I have an EDOT Collector/SDK running](#otel-sdk-running)
73+
* [I need an EDOT Collector/SDK](#no-sdk-running)
7474
* [I just want to use the instrumentation](#instrumentation-please)
7575

76-
#### I have an OTel Collector/SDK running [otel-sdk-running]
76+
#### I have an EDOT Collector/SDK running [otel-sdk-running]
7777

7878
If you have an OpenTelemetry Collector or SDK exporting telemetry data,
7979
configure it with the endpoint and API key generated in the previous steps.
8080

8181
**OpenTelemetry Collector configuration**
8282

83-
Configure your OTel Collector as follows:
83+
Configure your EDOT Collector as follows:
8484

8585
```yaml
8686
exporters:
@@ -117,7 +117,7 @@ For more information, see [OTLP Exporter configuration](https://opentelemetry.io
117117
Configure an EDOT SDK using the same method described above in **OpenTelemetry SDK configuration**.
118118
See the [EDOT Language SDK documentation](opentelemetry://reference/edot-sdks/index.md) for more information.
119119

120-
#### I need an OTel Collector/SDK [no-sdk-running]
120+
#### I need an EDOT Collector/SDK [no-sdk-running]
121121

122122
Don't have a collector or SDK running? No problem. Spin up an EDOT collector in just a few steps:
123123
@@ -143,7 +143,7 @@ Exporting failed. Dropping data.
143143
"Unauthenticated desc = ApiKey prefix not found"
144144
```
145145
146-
You must format your API key as `"Authorization": "ApiKey <api-key-value-here>"` or `"Authorization=ApiKey <api-key>"` depending on whether you're using a collector or SDK. See [I have an OTel Collector/SDK running](#otel-sdk-running) for more information.
146+
You must format your API key as `"Authorization": "ApiKey <api-key-value-here>"` or `"Authorization=ApiKey <api-key>"` depending on whether you're using a collector or SDK. See [I have an EDOT Collector/SDK running](#otel-sdk-running) for more information.
147147

148148
**Error: too many requests**
149149

0 commit comments

Comments
 (0)