GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-12 16:09:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(otelcol): remove the v2 metrics exporter configuration (#… …7105)" (#7118)

Browse Source
This commit is contained in:
Srikanth Chekuri 2025-02-15 16:29:56 +05:30 committed by GitHub
parent 43a1fa53aa
commit e7587612e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/docker-swarm/docker-compose.ha.yaml
View File

@ -224,7 +224,7 @@ services:
- ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf - ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector: otel-collector:
!!merge <<: *db-depend !!merge <<: *db-depend
image: signoz/signoz-otel-collector:0.111.27 image: signoz/signoz-otel-collector:0.111.28
command: command:
- --config=/etc/otel-collector-config.yaml - --config=/etc/otel-collector-config.yaml
- --manager-config=/etc/manager-config.yaml - --manager-config=/etc/manager-config.yaml
@ -248,7 +248,7 @@ services:
- query-service - query-service
schema-migrator: schema-migrator:
!!merge <<: *common !!merge <<: *common
image: signoz/signoz-schema-migrator:0.111.24 image: signoz/signoz-schema-migrator:0.111.28
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure

4
deploy/docker-swarm/docker-compose.yaml
View File

@ -160,7 +160,7 @@ services:
- ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf - ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector: otel-collector:
!!merge <<: *db-depend !!merge <<: *db-depend
image: signoz/signoz-otel-collector:0.111.27 image: signoz/signoz-otel-collector:0.111.28
command: command:
- --config=/etc/otel-collector-config.yaml - --config=/etc/otel-collector-config.yaml
- --manager-config=/etc/manager-config.yaml - --manager-config=/etc/manager-config.yaml
@ -184,7 +184,7 @@ services:
- query-service - query-service
schema-migrator: schema-migrator:
!!merge <<: *common !!merge <<: *common
image: signoz/signoz-schema-migrator:0.111.24 image: signoz/signoz-schema-migrator:0.111.28
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure

6
deploy/docker-swarm/otel-collector-config.yaml
View File

@ -66,6 +66,8 @@ exporters:
enabled: true enabled: true
clickhousemetricswrite/prometheus: clickhousemetricswrite/prometheus:
endpoint: tcp://clickhouse:9000/signoz_metrics endpoint: tcp://clickhouse:9000/signoz_metrics
signozclickhousemetrics:
dsn: tcp://clickhouse:9000/signoz_metrics
clickhouselogsexporter: clickhouselogsexporter:
dsn: tcp://clickhouse:9000/signoz_logs dsn: tcp://clickhouse:9000/signoz_logs
timeout: 10s timeout: 10s
@ -88,11 +90,11 @@ service:
metrics: metrics:
receivers: [otlp] receivers: [otlp]
processors: [batch] processors: [batch]
exporters: [clickhousemetricswrite] exporters: [clickhousemetricswrite, signozclickhousemetrics]
metrics/prometheus: metrics/prometheus:
receivers: [prometheus] receivers: [prometheus]
processors: [batch] processors: [batch]
exporters: [clickhousemetricswrite/prometheus] exporters: [clickhousemetricswrite/prometheus, signozclickhousemetrics]
logs: logs:
receivers: [otlp] receivers: [otlp]
processors: [batch] processors: [batch]

6
deploy/docker/docker-compose.ha.yaml
View File

@ -234,7 +234,7 @@ services:
# TODO: support otel-collector multiple replicas. Nginx/Traefik for loadbalancing? # TODO: support otel-collector multiple replicas. Nginx/Traefik for loadbalancing?
otel-collector: otel-collector:
!!merge <<: *db-depend !!merge <<: *db-depend
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.27} image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.28}
container_name: signoz-otel-collector container_name: signoz-otel-collector
command: command:
- --config=/etc/otel-collector-config.yaml - --config=/etc/otel-collector-config.yaml
@ -260,7 +260,7 @@ services:
condition: service_healthy condition: service_healthy
schema-migrator-sync: schema-migrator-sync:
!!merge <<: *common !!merge <<: *common
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.28}
container_name: schema-migrator-sync container_name: schema-migrator-sync
command: command:
- sync - sync
@ -271,7 +271,7 @@ services:
condition: service_healthy condition: service_healthy
schema-migrator-async: schema-migrator-async:
!!merge <<: *db-depend !!merge <<: *db-depend
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.28}
container_name: schema-migrator-async container_name: schema-migrator-async
command: command:
- async - async

6
deploy/docker/docker-compose.yaml
View File

@ -166,7 +166,7 @@ services:
- ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf - ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector: otel-collector:
!!merge <<: *db-depend !!merge <<: *db-depend
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.27} image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.28}
container_name: signoz-otel-collector container_name: signoz-otel-collector
command: command:
- --config=/etc/otel-collector-config.yaml - --config=/etc/otel-collector-config.yaml
@ -188,7 +188,7 @@ services:
condition: service_healthy condition: service_healthy
schema-migrator-sync: schema-migrator-sync:
!!merge <<: *common !!merge <<: *common
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.28}
container_name: schema-migrator-sync container_name: schema-migrator-sync
command: command:
- sync - sync
@ -199,7 +199,7 @@ services:
condition: service_healthy condition: service_healthy
schema-migrator-async: schema-migrator-async:
!!merge <<: *db-depend !!merge <<: *db-depend
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.28}
container_name: schema-migrator-async container_name: schema-migrator-async
command: command:
- async - async

6
deploy/docker/otel-collector-config.yaml
View File

@ -66,6 +66,8 @@ exporters:
enabled: true enabled: true
clickhousemetricswrite/prometheus: clickhousemetricswrite/prometheus:
endpoint: tcp://clickhouse:9000/signoz_metrics endpoint: tcp://clickhouse:9000/signoz_metrics
signozclickhousemetrics:
dsn: tcp://clickhouse:9000/signoz_metrics
clickhouselogsexporter: clickhouselogsexporter:
dsn: tcp://clickhouse:9000/signoz_logs dsn: tcp://clickhouse:9000/signoz_logs
timeout: 10s timeout: 10s
@ -88,11 +90,11 @@ service:
metrics: metrics:
receivers: [otlp] receivers: [otlp]
processors: [batch] processors: [batch]
exporters: [clickhousemetricswrite] exporters: [clickhousemetricswrite, signozclickhousemetrics]
metrics/prometheus: metrics/prometheus:
receivers: [prometheus] receivers: [prometheus]
processors: [batch] processors: [batch]
exporters: [clickhousemetricswrite/prometheus] exporters: [clickhousemetricswrite/prometheus, signozclickhousemetrics]
logs: logs:
receivers: [otlp] receivers: [otlp]
processors: [batch] processors: [batch]