From 6837c4109023c64ba7f92c3ae276e7544cd6aef1 Mon Sep 17 00:00:00 2001 From: Nityananda Gohain Date: Mon, 5 Feb 2024 11:26:45 +0530 Subject: [PATCH] fix: remove sending_queue and retry_on_failure settings (#3815) Co-authored-by: Prashant Shahi --- .../clickhouse-setup/otel-collector-config.yaml | 10 +--------- .../docker/clickhouse-setup/otel-collector-config.yaml | 9 +-------- .../tests/test-deploy/otel-collector-config.yaml | 9 +-------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml index 424d717b09..8f13b6506f 100644 --- a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml @@ -123,15 +123,7 @@ exporters: clickhouselogsexporter: dsn: tcp://clickhouse:9000/ docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER} - timeout: 5s - sending_queue: - queue_size: 100 - retry_on_failure: - enabled: true - initial_interval: 5s - max_interval: 30s - max_elapsed_time: 300s - + timeout: 10s extensions: health_check: endpoint: 0.0.0.0:13133 diff --git a/deploy/docker/clickhouse-setup/otel-collector-config.yaml b/deploy/docker/clickhouse-setup/otel-collector-config.yaml index f3d6900e6c..8211364efb 100644 --- a/deploy/docker/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker/clickhouse-setup/otel-collector-config.yaml @@ -135,14 +135,7 @@ exporters: clickhouselogsexporter: dsn: tcp://clickhouse:9000/ docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER} - timeout: 5s - sending_queue: - queue_size: 100 - retry_on_failure: - enabled: true - initial_interval: 5s - max_interval: 30s - max_elapsed_time: 300s + timeout: 10s service: telemetry: diff --git a/pkg/query-service/tests/test-deploy/otel-collector-config.yaml b/pkg/query-service/tests/test-deploy/otel-collector-config.yaml index 8a0e899826..d6ef6fcc35 100644 --- a/pkg/query-service/tests/test-deploy/otel-collector-config.yaml +++ b/pkg/query-service/tests/test-deploy/otel-collector-config.yaml @@ -115,14 +115,7 @@ exporters: clickhouselogsexporter: dsn: tcp://clickhouse:9000/ docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER} - timeout: 5s - sending_queue: - queue_size: 100 - retry_on_failure: - enabled: true - initial_interval: 5s - max_interval: 30s - max_elapsed_time: 300s + timeout: 10s service: telemetry: