From 6d623c5d455b47851bd45d6fc6d3b84126bb5294 Mon Sep 17 00:00:00 2001 From: Nityananda Gohain Date: Thu, 11 Aug 2022 11:43:10 +0530 Subject: [PATCH] single otlp receiver (#1506) --- deploy/docker-swarm/clickhouse-setup/docker-compose.yaml | 1 - .../clickhouse-setup/otel-collector-config.yaml | 6 +----- deploy/docker/clickhouse-setup/docker-compose.yaml | 1 - deploy/docker/clickhouse-setup/otel-collector-config.yaml | 7 +------ 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 31f2182d66..8831dedfe0 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -90,7 +90,6 @@ services: # - "1777:1777" # pprof extension - "4317:4317" # OTLP gRPC receiver - "4318:4318" # OTLP HTTP receiver - - "4319:4319" # OTLP logs receiver # - "8888:8888" # OtelCollector internal metrics # - "8889:8889" # signoz spanmetrics exposed by the agent # - "9411:9411" # Zipkin port diff --git a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml index 43e529d836..c3203e4f77 100644 --- a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml @@ -30,10 +30,6 @@ receivers: disk: {} filesystem: {} network: {} - otlp/logs: - protocols: - grpc: - endpoint: 0.0.0.0:4319 processors: batch: @@ -121,6 +117,6 @@ service: receivers: [otlp/spanmetrics] exporters: [prometheus] logs: - receivers: [otlp/logs] + receivers: [otlp] processors: [batch] exporters: [clickhouselogsexporter] diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 1cad876503..c13cccc893 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -89,7 +89,6 @@ services: # - "1777:1777" # pprof extension - "4317:4317" # OTLP gRPC receiver - "4318:4318" # OTLP HTTP receiver - - "4319:4319" # OTLP logs receiver # - "8888:8888" # OtelCollector internal metrics # - "8889:8889" # signoz spanmetrics exposed by the agent # - "9411:9411" # Zipkin port diff --git a/deploy/docker/clickhouse-setup/otel-collector-config.yaml b/deploy/docker/clickhouse-setup/otel-collector-config.yaml index 265a943e4c..c264197352 100644 --- a/deploy/docker/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker/clickhouse-setup/otel-collector-config.yaml @@ -31,11 +31,6 @@ receivers: filesystem: {} network: {} - otlp/logs: - protocols: - grpc: - endpoint: 0.0.0.0:4319 - processors: batch: send_batch_size: 10000 @@ -126,6 +121,6 @@ service: receivers: [otlp/spanmetrics] exporters: [prometheus] logs: - receivers: [otlp/logs] + receivers: [otlp] processors: [batch] exporters: [clickhouselogsexporter] \ No newline at end of file