diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 1a047fec8e..e23c9abd7c 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -1,5 +1,4 @@ version: "3.9" - x-clickhouse-defaults: &clickhouse-defaults image: clickhouse/clickhouse-server:24.1.2-alpine tty: true @@ -16,14 +15,7 @@ x-clickhouse-defaults: &clickhouse-defaults max-file: "3" healthcheck: # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'" - test: - [ - "CMD", - "wget", - "--spider", - "-q", - "0.0.0.0:8123/ping" - ] + test: ["CMD", "wget", "--spider", "-q", "0.0.0.0:8123/ping"] interval: 30s timeout: 5s retries: 3 @@ -32,15 +24,12 @@ x-clickhouse-defaults: &clickhouse-defaults nofile: soft: 262144 hard: 262144 - x-db-depend: &db-depend depends_on: - clickhouse - otel-collector-migrator # - clickhouse-2 # - clickhouse-3 - - services: zookeeper-1: image: bitnami/zookeeper:3.7.1 @@ -57,7 +46,6 @@ services: # - ZOO_SERVERS=0.0.0.0:2888:3888,zookeeper-2:2888:3888,zookeeper-3:2888:3888 - ALLOW_ANONYMOUS_LOGIN=yes - ZOO_AUTOPURGE_INTERVAL=1 - # zookeeper-2: # image: bitnami/zookeeper:3.7.0 # hostname: zookeeper-2 @@ -89,9 +77,8 @@ services: # - ZOO_SERVERS=zookeeper-1:2888:3888,zookeeper-2:2888:3888,0.0.0.0:2888:3888 # - ALLOW_ANONYMOUS_LOGIN=yes # - ZOO_AUTOPURGE_INTERVAL=1 - clickhouse: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults hostname: clickhouse # ports: # - "9000:9000" @@ -103,7 +90,6 @@ services: - ./clickhouse-cluster.xml:/etc/clickhouse-server/config.d/cluster.xml # - ./clickhouse-storage.xml:/etc/clickhouse-server/config.d/storage.xml - ./data/clickhouse/:/var/lib/clickhouse/ - # clickhouse-2: # <<: *clickhouse-defaults # hostname: clickhouse-2 @@ -131,7 +117,6 @@ services: # - ./clickhouse-cluster.xml:/etc/clickhouse-server/config.d/cluster.xml # # - ./clickhouse-storage.xml:/etc/clickhouse-server/config.d/storage.xml # - ./data/clickhouse-3/:/var/lib/clickhouse/ - alertmanager: image: signoz/alertmanager:0.23.7 volumes: @@ -144,15 +129,9 @@ services: deploy: restart_policy: condition: on-failure - query-service: - image: signoz/query-service:0.64.0 - command: - [ - "-config=/root/config/prometheus.yml", - "--use-logs-new-schema=true", - "--use-trace-new-schema=true" - ] + image: signoz/query-service:0.65.0 + command: ["-config=/root/config/prometheus.yml", "--use-logs-new-schema=true", "--use-trace-new-schema=true"] # ports: # - "6060:6060" # pprof port # - "8080:8080" # query-service port @@ -170,24 +149,16 @@ services: - TELEMETRY_ENABLED=true - DEPLOYMENT_TYPE=docker-swarm healthcheck: - test: - [ - "CMD", - "wget", - "--spider", - "-q", - "localhost:8080/api/v1/health" - ] + test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/health"] interval: 30s timeout: 5s retries: 3 deploy: restart_policy: condition: on-failure - <<: *db-depend - + !!merge <<: *db-depend frontend: - image: signoz/frontend:0.64.0 + image: signoz/frontend:0.65.0 deploy: restart_policy: condition: on-failure @@ -198,15 +169,9 @@ services: - "3301:3301" volumes: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf - otel-collector: image: signoz/signoz-otel-collector:0.111.16 - command: - [ - "--config=/etc/otel-collector-config.yaml", - "--manager-config=/etc/manager-config.yaml", - "--feature-gates=-pkg.translator.prometheus.NormalizeName" - ] + command: ["--config=/etc/otel-collector-config.yaml", "--manager-config=/etc/manager-config.yaml", "--feature-gates=-pkg.translator.prometheus.NormalizeName"] user: root # required for reading docker container logs volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -236,22 +201,20 @@ services: - clickhouse - otel-collector-migrator - query-service - otel-collector-migrator: - image: signoz/signoz-schema-migrator:0.111.16 - deploy: - restart_policy: - condition: on-failure - delay: 5s - command: - - "sync" - - "--dsn=tcp://clickhouse:9000" - - "--up=" - depends_on: - - clickhouse - # - clickhouse-2 - # - clickhouse-3 - + image: signoz/signoz-schema-migrator:0.111.16 + deploy: + restart_policy: + condition: on-failure + delay: 5s + command: + - "sync" + - "--dsn=tcp://clickhouse:9000" + - "--up=" + depends_on: + - clickhouse + # - clickhouse-2 + # - clickhouse-3 logspout: image: "gliderlabs/logspout:v3.2.14" volumes: @@ -264,17 +227,15 @@ services: mode: global restart_policy: condition: on-failure - hotrod: image: jaegertracing/example-hotrod:1.30 - command: [ "all" ] + command: ["all"] environment: - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces logging: options: max-size: 50m max-file: "3" - load-hotrod: image: "signoz/locust:1.2.3" hostname: load-hotrod diff --git a/deploy/docker/clickhouse-setup/docker-compose-minimal.yaml b/deploy/docker/clickhouse-setup/docker-compose-minimal.yaml index d3ceb7bf42..7df95924f3 100644 --- a/deploy/docker/clickhouse-setup/docker-compose-minimal.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose-minimal.yaml @@ -13,14 +13,7 @@ x-clickhouse-defaults: &clickhouse-defaults max-file: "3" healthcheck: # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'" - test: - [ - "CMD", - "wget", - "--spider", - "-q", - "0.0.0.0:8123/ping" - ] + test: ["CMD", "wget", "--spider", "-q", "0.0.0.0:8123/ping"] interval: 30s timeout: 5s retries: 3 @@ -29,20 +22,17 @@ x-clickhouse-defaults: &clickhouse-defaults nofile: soft: 262144 hard: 262144 - x-db-depend: &db-depend depends_on: clickhouse: condition: service_healthy otel-collector-migrator-sync: condition: service_completed_successfully - # clickhouse-2: - # condition: service_healthy - # clickhouse-3: - # condition: service_healthy - + # clickhouse-2: + # condition: service_healthy + # clickhouse-3: + # condition: service_healthy services: - zookeeper-1: image: bitnami/zookeeper:3.7.1 container_name: signoz-zookeeper-1 @@ -59,7 +49,6 @@ services: # - ZOO_SERVERS=0.0.0.0:2888:3888,zookeeper-2:2888:3888,zookeeper-3:2888:3888 - ALLOW_ANONYMOUS_LOGIN=yes - ZOO_AUTOPURGE_INTERVAL=1 - # zookeeper-2: # image: bitnami/zookeeper:3.7.0 # container_name: signoz-zookeeper-2 @@ -93,9 +82,8 @@ services: # - ZOO_SERVERS=zookeeper-1:2888:3888,zookeeper-2:2888:3888,0.0.0.0:2888:3888 # - ALLOW_ANONYMOUS_LOGIN=yes # - ZOO_AUTOPURGE_INTERVAL=1 - clickhouse: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults container_name: signoz-clickhouse hostname: clickhouse ports: @@ -110,7 +98,6 @@ services: # - ./clickhouse-storage.xml:/etc/clickhouse-server/config.d/storage.xml - ./data/clickhouse/:/var/lib/clickhouse/ - ./user_scripts:/var/lib/clickhouse/user_scripts/ - # clickhouse-2: # <<: *clickhouse-defaults # container_name: signoz-clickhouse-2 @@ -128,7 +115,6 @@ services: # - ./data/clickhouse-2/:/var/lib/clickhouse/ # - ./user_scripts:/var/lib/clickhouse/user_scripts/ - # clickhouse-3: # <<: *clickhouse-defaults # container_name: signoz-clickhouse-3 @@ -145,7 +131,6 @@ services: # # - ./clickhouse-storage.xml:/etc/clickhouse-server/config.d/storage.xml # - ./data/clickhouse-3/:/var/lib/clickhouse/ # - ./user_scripts:/var/lib/clickhouse/user_scripts/ - alertmanager: image: signoz/alertmanager:${ALERTMANAGER_TAG:-0.23.7} container_name: signoz-alertmanager @@ -158,18 +143,11 @@ services: command: - --queryService.url=http://query-service:8085 - --storage.path=/data - # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md` - query-service: - image: signoz/query-service:${DOCKER_TAG:-0.64.0} + image: signoz/query-service:${DOCKER_TAG:-0.65.0} container_name: signoz-query-service - command: - [ - "-config=/root/config/prometheus.yml", - "--use-logs-new-schema=true", - "--use-trace-new-schema=true" - ] + command: ["-config=/root/config/prometheus.yml", "--use-logs-new-schema=true", "--use-trace-new-schema=true"] # ports: # - "6060:6060" # pprof port # - "8080:8080" # query-service port @@ -188,21 +166,13 @@ services: - DEPLOYMENT_TYPE=docker-standalone-amd restart: on-failure healthcheck: - test: - [ - "CMD", - "wget", - "--spider", - "-q", - "localhost:8080/api/v1/health" - ] + test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/health"] interval: 30s timeout: 5s retries: 3 - <<: *db-depend - + !!merge <<: *db-depend frontend: - image: signoz/frontend:${DOCKER_TAG:-0.64.0} + image: signoz/frontend:${DOCKER_TAG:-0.65.0} container_name: signoz-frontend restart: on-failure depends_on: @@ -212,7 +182,6 @@ services: - "3301:3301" volumes: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf - otel-collector-migrator-sync: image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.16} container_name: otel-migrator-sync @@ -223,11 +192,10 @@ services: depends_on: clickhouse: condition: service_healthy - # clickhouse-2: - # condition: service_healthy - # clickhouse-3: - # condition: service_healthy - + # clickhouse-2: + # condition: service_healthy + # clickhouse-3: + # condition: service_healthy otel-collector-migrator-async: image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.16} container_name: otel-migrator-async @@ -240,21 +208,14 @@ services: condition: service_healthy otel-collector-migrator-sync: condition: service_completed_successfully - # clickhouse-2: - # condition: service_healthy - # clickhouse-3: - # condition: service_healthy - + # clickhouse-2: + # condition: service_healthy + # clickhouse-3: + # condition: service_healthy otel-collector: image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.16} container_name: signoz-otel-collector - command: - [ - "--config=/etc/otel-collector-config.yaml", - "--manager-config=/etc/manager-config.yaml", - "--copy-path=/var/tmp/collector-config.yaml", - "--feature-gates=-pkg.translator.prometheus.NormalizeName" - ] + command: ["--config=/etc/otel-collector-config.yaml", "--manager-config=/etc/manager-config.yaml", "--copy-path=/var/tmp/collector-config.yaml", "--feature-gates=-pkg.translator.prometheus.NormalizeName"] user: root # required for reading docker container logs volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -284,7 +245,6 @@ services: condition: service_completed_successfully query-service: condition: service_healthy - logspout: image: "gliderlabs/logspout:v3.2.14" container_name: signoz-logspout diff --git a/deploy/docker/clickhouse-setup/docker-compose.testing.yaml b/deploy/docker/clickhouse-setup/docker-compose.testing.yaml index d99af9bc06..5317b1a8ce 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.testing.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.testing.yaml @@ -1,8 +1,6 @@ version: "2.4" - include: - test-app-docker-compose.yaml - x-clickhouse-defaults: &clickhouse-defaults restart: on-failure # addding non LTS version due to this fix https://github.com/ClickHouse/ClickHouse/commit/32caf8716352f45c1b617274c7508c86b7d1afab @@ -18,14 +16,7 @@ x-clickhouse-defaults: &clickhouse-defaults max-file: "3" healthcheck: # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'" - test: - [ - "CMD", - "wget", - "--spider", - "-q", - "0.0.0.0:8123/ping" - ] + test: ["CMD", "wget", "--spider", "-q", "0.0.0.0:8123/ping"] interval: 30s timeout: 5s retries: 3 @@ -34,20 +25,17 @@ x-clickhouse-defaults: &clickhouse-defaults nofile: soft: 262144 hard: 262144 - x-db-depend: &db-depend depends_on: clickhouse: condition: service_healthy otel-collector-migrator: condition: service_completed_successfully - # clickhouse-2: - # condition: service_healthy - # clickhouse-3: - # condition: service_healthy - + # clickhouse-2: + # condition: service_healthy + # clickhouse-3: + # condition: service_healthy services: - zookeeper-1: image: bitnami/zookeeper:3.7.1 container_name: signoz-zookeeper-1 @@ -64,7 +52,6 @@ services: # - ZOO_SERVERS=0.0.0.0:2888:3888,zookeeper-2:2888:3888,zookeeper-3:2888:3888 - ALLOW_ANONYMOUS_LOGIN=yes - ZOO_AUTOPURGE_INTERVAL=1 - # zookeeper-2: # image: bitnami/zookeeper:3.7.0 # container_name: signoz-zookeeper-2 @@ -98,9 +85,8 @@ services: # - ZOO_SERVERS=zookeeper-1:2888:3888,zookeeper-2:2888:3888,0.0.0.0:2888:3888 # - ALLOW_ANONYMOUS_LOGIN=yes # - ZOO_AUTOPURGE_INTERVAL=1 - clickhouse: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults container_name: signoz-clickhouse hostname: clickhouse ports: @@ -115,7 +101,6 @@ services: # - ./clickhouse-storage.xml:/etc/clickhouse-server/config.d/storage.xml - ./data/clickhouse/:/var/lib/clickhouse/ - ./user_scripts:/var/lib/clickhouse/user_scripts/ - # clickhouse-2: # <<: *clickhouse-defaults # container_name: signoz-clickhouse-2 @@ -133,7 +118,6 @@ services: # - ./data/clickhouse-2/:/var/lib/clickhouse/ # - ./user_scripts:/var/lib/clickhouse/user_scripts/ - # clickhouse-3: # <<: *clickhouse-defaults # container_name: signoz-clickhouse-3 @@ -150,7 +134,6 @@ services: # # - ./clickhouse-storage.xml:/etc/clickhouse-server/config.d/storage.xml # - ./data/clickhouse-3/:/var/lib/clickhouse/ # - ./user_scripts:/var/lib/clickhouse/user_scripts/ - alertmanager: image: signoz/alertmanager:${ALERTMANAGER_TAG:-0.23.7} container_name: signoz-alertmanager @@ -163,19 +146,11 @@ services: command: - --queryService.url=http://query-service:8085 - --storage.path=/data - # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md` - query-service: - image: signoz/query-service:${DOCKER_TAG:-0.64.0} + image: signoz/query-service:${DOCKER_TAG:-0.65.0} container_name: signoz-query-service - command: - [ - "-config=/root/config/prometheus.yml", - "-gateway-url=https://api.staging.signoz.cloud", - "--use-logs-new-schema=true", - "--use-trace-new-schema=true" - ] + command: ["-config=/root/config/prometheus.yml", "-gateway-url=https://api.staging.signoz.cloud", "--use-logs-new-schema=true", "--use-trace-new-schema=true"] # ports: # - "6060:6060" # pprof port # - "8080:8080" # query-service port @@ -195,21 +170,13 @@ services: - KAFKA_SPAN_EVAL=${KAFKA_SPAN_EVAL:-false} restart: on-failure healthcheck: - test: - [ - "CMD", - "wget", - "--spider", - "-q", - "localhost:8080/api/v1/health" - ] + test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/health"] interval: 30s timeout: 5s retries: 3 - <<: *db-depend - + !!merge <<: *db-depend frontend: - image: signoz/frontend:${DOCKER_TAG:-0.64.0} + image: signoz/frontend:${DOCKER_TAG:-0.65.0} container_name: signoz-frontend restart: on-failure depends_on: @@ -219,7 +186,6 @@ services: - "3301:3301" volumes: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf - otel-collector-migrator: image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.16} container_name: otel-migrator @@ -228,22 +194,14 @@ services: depends_on: clickhouse: condition: service_healthy - # clickhouse-2: - # condition: service_healthy - # clickhouse-3: - # condition: service_healthy - - + # clickhouse-2: + # condition: service_healthy + # clickhouse-3: + # condition: service_healthy otel-collector: image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.16} container_name: signoz-otel-collector - command: - [ - "--config=/etc/otel-collector-config.yaml", - "--manager-config=/etc/manager-config.yaml", - "--copy-path=/var/tmp/collector-config.yaml", - "--feature-gates=-pkg.translator.prometheus.NormalizeName" - ] + command: ["--config=/etc/otel-collector-config.yaml", "--manager-config=/etc/manager-config.yaml", "--copy-path=/var/tmp/collector-config.yaml", "--feature-gates=-pkg.translator.prometheus.NormalizeName"] user: root # required for reading docker container logs volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -273,7 +231,6 @@ services: condition: service_completed_successfully query-service: condition: service_healthy - logspout: image: "gliderlabs/logspout:v3.2.14" container_name: signoz-logspout