From 676fe892a517cfa3f183c06a7c71146fe802503c Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Thu, 9 Jun 2022 20:58:10 +0530 Subject: [PATCH] =?UTF-8?q?chore(release):=20=F0=9F=93=8C=20pin=20versions?= =?UTF-8?q?:=20OtelCollectors=200.45.1-0.2=20and=20config=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- deploy/docker-swarm/clickhouse-setup/docker-compose.yaml | 4 ++-- .../docker-swarm/clickhouse-setup/otel-collector-config.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.arm.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.yaml | 4 ++-- deploy/docker/clickhouse-setup/otel-collector-config.yaml | 4 ++-- pkg/query-service/tests/test-deploy/docker-compose.arm.yaml | 4 ++-- pkg/query-service/tests/test-deploy/docker-compose.yaml | 4 ++-- .../tests/test-deploy/otel-collector-config.yaml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 034ba36501..8806533caa 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -78,7 +78,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -104,7 +104,7 @@ services: - clickhouse otel-collector-metrics: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml diff --git a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml index 9d34907164..5f65e6eb5c 100644 --- a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml @@ -52,7 +52,7 @@ extensions: health_check: {} zpages: {} exporters: - clickhouse: + clickhousetraces: datasource: tcp://clickhouse:9000/?database=signoz_traces clickhousemetricswrite: endpoint: tcp://clickhouse:9000/?database=signoz_metrics @@ -66,7 +66,7 @@ service: traces: receivers: [jaeger, otlp] processors: [signozspanmetrics/prometheus, batch] - exporters: [clickhouse] + exporters: [clickhousetraces] metrics: receivers: [otlp, hostmetrics] processors: [batch] diff --git a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml index 842fd9f571..e4197cfbc3 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml @@ -76,7 +76,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -97,7 +97,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 12b2f28cc9..e6d2de2f3c 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -75,7 +75,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -96,7 +96,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml diff --git a/deploy/docker/clickhouse-setup/otel-collector-config.yaml b/deploy/docker/clickhouse-setup/otel-collector-config.yaml index c59a8f0e87..bcf7ce58ce 100644 --- a/deploy/docker/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker/clickhouse-setup/otel-collector-config.yaml @@ -52,7 +52,7 @@ extensions: health_check: {} zpages: {} exporters: - clickhouse: + clickhousetraces: datasource: tcp://clickhouse:9000/?database=signoz_traces clickhousemetricswrite: endpoint: tcp://clickhouse:9000/?database=signoz_metrics @@ -66,7 +66,7 @@ service: traces: receivers: [jaeger, otlp] processors: [signozspanmetrics/prometheus, batch] - exporters: [clickhouse] + exporters: [clickhousetraces] metrics: receivers: [otlp, hostmetrics] processors: [batch] diff --git a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml index 5b3bfc13a8..387daed353 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml @@ -51,7 +51,7 @@ services: condition: service_healthy otel-collector: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -64,7 +64,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml index ddee65d432..28bfb726af 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml @@ -56,7 +56,7 @@ services: condition: service_healthy otel-collector: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -69,7 +69,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.43.0-0.1 + image: signoz/otelcontribcol:0.45.1-0.2 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml 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 128d0fb6a2..d6c12ddcc1 100644 --- a/pkg/query-service/tests/test-deploy/otel-collector-config.yaml +++ b/pkg/query-service/tests/test-deploy/otel-collector-config.yaml @@ -49,7 +49,7 @@ extensions: health_check: {} zpages: {} exporters: - clickhouse: + clickhousetraces: datasource: tcp://clickhouse:9000/?database=signoz_traces clickhousemetricswrite: endpoint: tcp://clickhouse:9000/?database=signoz_metrics @@ -63,7 +63,7 @@ service: traces: receivers: [jaeger, otlp] processors: [signozspanmetrics/prometheus, batch] - exporters: [clickhouse] + exporters: [clickhousetraces] metrics: receivers: [otlp, hostmetrics] processors: [batch]