From 38c456eae62262832cb85595b11b54b28a8aa6b9 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Thu, 12 Oct 2023 17:49:05 -0400 Subject: [PATCH 1/3] merge otel o11y config Signed-off-by: Pierre Tessier --- docker-compose.minimal.yml | 3 +-- docker-compose.yml | 3 +-- src/otelcollector/otelcol-config-extras.yml | 15 ++++++++++++ src/otelcollector/otelcol-config.yml | 18 +++++++++++--- src/otelcollector/otelcol-observability.yml | 26 --------------------- 5 files changed, 32 insertions(+), 33 deletions(-) delete mode 100644 src/otelcollector/otelcol-observability.yml diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index b958a4b2ce..db7b394139 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -509,10 +509,9 @@ services: limits: memory: 125M restart: unless-stopped - command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-observability.yml", "--config=/etc/otelcol-config-extras.yml" ] + command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ] volumes: - ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml - - ./src/otelcollector/otelcol-observability.yml:/etc/otelcol-observability.yml - ./src/otelcollector/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml ports: - "4317" # OTLP over gRPC receiver diff --git a/docker-compose.yml b/docker-compose.yml index beeb763a0a..fbd3121f62 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -656,10 +656,9 @@ services: limits: memory: 125M restart: unless-stopped - command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-observability.yml", "--config=/etc/otelcol-config-extras.yml" ] + command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ] volumes: - ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml - - ./src/otelcollector/otelcol-observability.yml:/etc/otelcol-observability.yml - ./src/otelcollector/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml ports: - "4317" # OTLP over gRPC receiver diff --git a/src/otelcollector/otelcol-config-extras.yml b/src/otelcollector/otelcol-config-extras.yml index f557025eb0..2b647535b5 100644 --- a/src/otelcollector/otelcol-config-extras.yml +++ b/src/otelcollector/otelcol-config-extras.yml @@ -1,4 +1,19 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 + # extra settings to be merged into OpenTelemetry Collector configuration # do not delete this file + +## Example configuration for sending data to your own OTLP HTTP backend +## Note: the spanmetrics exporter must be included in the exporters array +## if overriding the traces pipeline. +## +#exporters: +# exporters: +# otlphttp/example: +# endpoint: +# +# service: +# pipelines: +# traces: +# exporters: [spanmetrics, otlphttp/example] diff --git a/src/otelcollector/otelcol-config.yml b/src/otelcollector/otelcol-config.yml index ca3e197f4b..f2568ae429 100644 --- a/src/otelcollector/otelcol-config.yml +++ b/src/otelcollector/otelcol-config.yml @@ -17,6 +17,18 @@ receivers: exporters: debug: + otlp: + endpoint: "jaeger:4317" + tls: + insecure: true + otlp/logs: + endpoint: "dataprepper:21892" + tls: + insecure: true + otlphttp/prometheus: + endpoint: "http://prometheus:9090/api/v1/otlp" + tls: + insecure: true processors: batch: @@ -44,12 +56,12 @@ service: traces: receivers: [otlp] processors: [batch] - exporters: [debug, spanmetrics] + exporters: [otlp, debug, spanmetrics] metrics: receivers: [httpcheck/frontendproxy, otlp, spanmetrics] processors: [filter/ottl, transform, batch] - exporters: [debug] + exporters: [otlphttp/prometheus, debug] logs: receivers: [otlp] processors: [batch] - exporters: [debug] + exporters: [otlp/logs, debug] diff --git a/src/otelcollector/otelcol-observability.yml b/src/otelcollector/otelcol-observability.yml deleted file mode 100644 index 6ea376a05b..0000000000 --- a/src/otelcollector/otelcol-observability.yml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright The OpenTelemetry Authors -# SPDX-License-Identifier: Apache-2.0 - - -exporters: - otlp: - endpoint: "jaeger:4317" - tls: - insecure: true - otlp/logs: - endpoint: "dataprepper:21892" - tls: - insecure: true - otlphttp/prometheus: - endpoint: "http://prometheus:9090/api/v1/otlp" - tls: - insecure: true - -service: - pipelines: - traces: - exporters: [otlp, debug, spanmetrics] - metrics: - exporters: [otlphttp/prometheus, debug] - logs: - exporters: [otlp/logs, debug] From 74e3fe8b297a2e3d42ccbb45e4805a942f090f7c Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Thu, 12 Oct 2023 18:10:54 -0400 Subject: [PATCH 2/3] merge otel o11y config Signed-off-by: Pierre Tessier --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f5601242b..3b1568924d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ release. ([#1150](https://github.com/open-telemetry/opentelemetry-demo/pull/1150)) * [otelcol] add httpcheck receiver for synthetic check of frontendproxy ([#1162](https://github.com/open-telemetry/opentelemetry-demo/pull/1162)) +* [otelcol] merge configuration files for base and observability configs + ([#1173](https://github.com/open-telemetry/opentelemetry-demo/pull/1173)) ## 1.5.0 From f9ad87ec276063083ea37e139d44b2b608fbece8 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Mon, 16 Oct 2023 10:27:59 +0200 Subject: [PATCH 3/3] Update otelcol-config-extras.yml Fixed lint --- src/otelcollector/otelcol-config-extras.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/otelcollector/otelcol-config-extras.yml b/src/otelcollector/otelcol-config-extras.yml index 2b647535b5..73dd011b2c 100644 --- a/src/otelcollector/otelcol-config-extras.yml +++ b/src/otelcollector/otelcol-config-extras.yml @@ -8,7 +8,6 @@ ## Note: the spanmetrics exporter must be included in the exporters array ## if overriding the traces pipeline. ## -#exporters: # exporters: # otlphttp/example: # endpoint: