diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 21ac9dab0a..c813a0a736 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -193,6 +193,7 @@ services: - /var/lib/docker/containers:/var/lib/docker/containers:ro environment: - OTEL_RESOURCE_ATTRIBUTES=host.name={{.Node.Hostname}},os.type={{.Node.Platform.OS}},dockerswarm.service.name={{.Service.Name}},dockerswarm.task.name={{.Task.Name}} + - DOCKER_MULTI_NODE_CLUSTER=false ports: # - "1777:1777" # pprof extension - "4317:4317" # OTLP gRPC receiver diff --git a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml index 1c3b59c1c5..c198c2f57c 100644 --- a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml @@ -103,6 +103,8 @@ processors: exporters: clickhousetraces: datasource: tcp://clickhouse:9000/?database=signoz_traces + docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER} + clickhousemetricswrite: endpoint: tcp://clickhouse:9000/?database=signoz_metrics resource_to_telemetry_conversion: @@ -112,6 +114,7 @@ exporters: # logging: {} clickhouselogsexporter: dsn: tcp://clickhouse:9000/ + docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER} timeout: 5s sending_queue: queue_size: 100 diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index d66c1f4cf6..35b844b6cd 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -194,6 +194,7 @@ services: - /var/lib/docker/containers:/var/lib/docker/containers:ro environment: - OTEL_RESOURCE_ATTRIBUTES=host.name=signoz-host,os.type=linux + - DOCKER_MULTI_NODE_CLUSTER=false ports: # - "1777:1777" # pprof extension - "4317:4317" # OTLP gRPC receiver diff --git a/deploy/docker/clickhouse-setup/otel-collector-config.yaml b/deploy/docker/clickhouse-setup/otel-collector-config.yaml index 46bd7a87d4..2829bf966f 100644 --- a/deploy/docker/clickhouse-setup/otel-collector-config.yaml +++ b/deploy/docker/clickhouse-setup/otel-collector-config.yaml @@ -111,6 +111,8 @@ extensions: exporters: clickhousetraces: datasource: tcp://clickhouse:9000/?database=signoz_traces + docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER} + clickhousemetricswrite: endpoint: tcp://clickhouse:9000/?database=signoz_metrics resource_to_telemetry_conversion: @@ -121,6 +123,7 @@ exporters: clickhouselogsexporter: dsn: tcp://clickhouse:9000/ + docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER} timeout: 5s sending_queue: queue_size: 100 diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml index 48454b1044..4fb2c9b2f5 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml @@ -177,6 +177,7 @@ services: - /var/lib/docker/containers:/var/lib/docker/containers:ro environment: - OTEL_RESOURCE_ATTRIBUTES=host.name=signoz-host,os.type=linux + - DOCKER_MULTI_NODE_CLUSTER=false ports: # - "1777:1777" # pprof extension - "4317:4317" # OTLP gRPC receiver 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 33600b35e6..9f7ee3fd18 100644 --- a/pkg/query-service/tests/test-deploy/otel-collector-config.yaml +++ b/pkg/query-service/tests/test-deploy/otel-collector-config.yaml @@ -110,6 +110,7 @@ extensions: exporters: clickhousetraces: datasource: tcp://clickhouse:9000/?database=signoz_traces + docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER} clickhousemetricswrite: endpoint: tcp://clickhouse:9000/?database=signoz_metrics resource_to_telemetry_conversion: @@ -118,6 +119,18 @@ exporters: endpoint: 0.0.0.0:8889 # logging: {} + 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 + service: telemetry: metrics: