diff --git a/deploy/docker-swarm/docker-compose.ha.yaml b/deploy/docker-swarm/docker-compose.ha.yaml index c4aea2f0e2..9827828e02 100644 --- a/deploy/docker-swarm/docker-compose.ha.yaml +++ b/deploy/docker-swarm/docker-compose.ha.yaml @@ -10,7 +10,7 @@ x-common: &common max-size: 50m max-file: "3" x-clickhouse-defaults: &clickhouse-defaults - <<: *common + !!merge <<: *common image: clickhouse/clickhouse-server:24.1.2-alpine tty: true deploy: @@ -38,7 +38,7 @@ x-clickhouse-defaults: &clickhouse-defaults soft: 262144 hard: 262144 x-zookeeper-defaults: &zookeeper-defaults - <<: *common + !!merge <<: *common image: bitnami/zookeeper:3.7.1 user: root deploy: @@ -54,7 +54,7 @@ x-zookeeper-defaults: &zookeeper-defaults timeout: 5s retries: 3 x-db-depend: &db-depend - <<: *common + !!merge <<: *common depends_on: - clickhouse - clickhouse-2 @@ -62,7 +62,7 @@ x-db-depend: &db-depend - schema-migrator services: init-clickhouse: - <<: *common + !!merge <<: *common image: clickhouse/clickhouse-server:24.1.2-alpine command: - bash @@ -79,7 +79,7 @@ services: volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: - <<: *zookeeper-defaults + !!merge <<: *zookeeper-defaults # ports: # - "2181:2181" # - "2888:2888" @@ -94,7 +94,7 @@ services: - ZOO_ENABLE_PROMETHEUS_METRICS=yes - ZOO_PROMETHEUS_METRICS_PORT_NUMBER=9141 zookeeper-2: - <<: *zookeeper-defaults + !!merge <<: *zookeeper-defaults # ports: # - "2182:2181" # - "2889:2888" @@ -109,7 +109,7 @@ services: - ZOO_ENABLE_PROMETHEUS_METRICS=yes - ZOO_PROMETHEUS_METRICS_PORT_NUMBER=9141 zookeeper-3: - <<: *zookeeper-defaults + !!merge <<: *zookeeper-defaults # ports: # - "2183:2181" # - "2890:2888" @@ -124,7 +124,7 @@ services: - ZOO_ENABLE_PROMETHEUS_METRICS=yes - ZOO_PROMETHEUS_METRICS_PORT_NUMBER=9141 clickhouse: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults # TODO: needed for schema-migrator to work, remove this redundancy once we have a better solution hostname: clickhouse # ports: @@ -140,7 +140,7 @@ services: - ./clickhouse-setup/data/clickhouse/:/var/lib/clickhouse/ # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml clickhouse-2: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults hostname: clickhouse-2 # ports: # - "9001:9000" @@ -155,7 +155,7 @@ services: - ./clickhouse-setup/data/clickhouse-2/:/var/lib/clickhouse/ # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml clickhouse-3: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults hostname: clickhouse-3 # ports: # - "9002:9000" @@ -170,7 +170,7 @@ services: - ./clickhouse-setup/data/clickhouse-3/:/var/lib/clickhouse/ # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml alertmanager: - <<: *common + !!merge <<: *common image: signoz/alertmanager:0.23.7 command: - --queryService.url=http://query-service:8085 @@ -180,8 +180,8 @@ services: depends_on: - query-service query-service: - <<: *db-depend - image: signoz/query-service:0.69.0 + !!merge <<: *db-depend + image: signoz/query-service:0.70.0 command: - --config=/root/config/prometheus.yml - --use-logs-new-schema=true @@ -213,8 +213,8 @@ services: timeout: 5s retries: 3 frontend: - <<: *common - image: signoz/frontend:0.69.0 + !!merge <<: *common + image: signoz/frontend:0.70.0 depends_on: - alertmanager - query-service @@ -223,7 +223,7 @@ services: volumes: - ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - <<: *db-depend + !!merge <<: *db-depend image: signoz/signoz-otel-collector:0.111.24 command: - --config=/etc/otel-collector-config.yaml @@ -247,7 +247,7 @@ services: - schema-migrator - query-service schema-migrator: - <<: *common + !!merge <<: *common image: signoz/signoz-schema-migrator:0.111.24 deploy: restart_policy: @@ -259,7 +259,6 @@ services: - "/signoz-schema-migrator sync --dsn=tcp://clickhouse:9000 --up= && /signoz-schema-migrator async --dsn=tcp://clickhouse:9000 --up=" depends_on: - clickhouse - networks: signoz-net: name: signoz-net diff --git a/deploy/docker-swarm/docker-compose.yaml b/deploy/docker-swarm/docker-compose.yaml index c91eab93ce..d234a68fd8 100644 --- a/deploy/docker-swarm/docker-compose.yaml +++ b/deploy/docker-swarm/docker-compose.yaml @@ -10,7 +10,7 @@ x-common: &common max-size: 50m max-file: "3" x-clickhouse-defaults: &clickhouse-defaults - <<: *common + !!merge <<: *common image: clickhouse/clickhouse-server:24.1.2-alpine tty: true deploy: @@ -37,7 +37,7 @@ x-clickhouse-defaults: &clickhouse-defaults soft: 262144 hard: 262144 x-zookeeper-defaults: &zookeeper-defaults - <<: *common + !!merge <<: *common image: bitnami/zookeeper:3.7.1 user: root deploy: @@ -53,13 +53,13 @@ x-zookeeper-defaults: &zookeeper-defaults timeout: 5s retries: 3 x-db-depend: &db-depend - <<: *common + !!merge <<: *common depends_on: - clickhouse - schema-migrator services: init-clickhouse: - <<: *common + !!merge <<: *common image: clickhouse/clickhouse-server:24.1.2-alpine command: - bash @@ -76,7 +76,7 @@ services: volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: - <<: *zookeeper-defaults + !!merge <<: *zookeeper-defaults # ports: # - "2181:2181" # - "2888:2888" @@ -90,7 +90,7 @@ services: - ZOO_ENABLE_PROMETHEUS_METRICS=yes - ZOO_PROMETHEUS_METRICS_PORT_NUMBER=9141 clickhouse: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults # TODO: needed for clickhouse TCP connectio hostname: clickhouse # ports: @@ -106,7 +106,7 @@ services: - clickhouse:/var/lib/clickhouse/ # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml alertmanager: - <<: *common + !!merge <<: *common image: signoz/alertmanager:0.23.7 command: - --queryService.url=http://query-service:8085 @@ -116,8 +116,8 @@ services: depends_on: - query-service query-service: - <<: *db-depend - image: signoz/query-service:0.69.0 + !!merge <<: *db-depend + image: signoz/query-service:0.70.0 command: - --config=/root/config/prometheus.yml - --use-logs-new-schema=true @@ -149,8 +149,8 @@ services: timeout: 5s retries: 3 frontend: - <<: *common - image: signoz/frontend:0.69.0 + !!merge <<: *common + image: signoz/frontend:0.70.0 depends_on: - alertmanager - query-service @@ -159,7 +159,7 @@ services: volumes: - ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - <<: *db-depend + !!merge <<: *db-depend image: signoz/signoz-otel-collector:0.111.24 command: - --config=/etc/otel-collector-config.yaml @@ -183,7 +183,7 @@ services: - schema-migrator - query-service schema-migrator: - <<: *common + !!merge <<: *common image: signoz/signoz-schema-migrator:0.111.24 deploy: restart_policy: @@ -195,7 +195,6 @@ services: - "/signoz-schema-migrator sync --dsn=tcp://clickhouse:9000 --up= && /signoz-schema-migrator async --dsn=tcp://clickhouse:9000 --up=" depends_on: - clickhouse - networks: signoz-net: name: signoz-net diff --git a/deploy/docker/docker-compose.ha.yaml b/deploy/docker/docker-compose.ha.yaml index 4caadec83d..d13282edb6 100644 --- a/deploy/docker/docker-compose.ha.yaml +++ b/deploy/docker/docker-compose.ha.yaml @@ -8,7 +8,7 @@ x-common: &common max-size: 50m max-file: "3" x-clickhouse-defaults: &clickhouse-defaults - <<: *common + !!merge <<: *common # addding non LTS version due to this fix https://github.com/ClickHouse/ClickHouse/commit/32caf8716352f45c1b617274c7508c86b7d1afab image: clickhouse/clickhouse-server:24.1.2-alpine tty: true @@ -41,7 +41,7 @@ x-clickhouse-defaults: &clickhouse-defaults soft: 262144 hard: 262144 x-zookeeper-defaults: &zookeeper-defaults - <<: *common + !!merge <<: *common image: bitnami/zookeeper:3.7.1 user: root labels: @@ -56,7 +56,7 @@ x-zookeeper-defaults: &zookeeper-defaults timeout: 5s retries: 3 x-db-depend: &db-depend - <<: *common + !!merge <<: *common depends_on: clickhouse: condition: service_healthy @@ -64,7 +64,7 @@ x-db-depend: &db-depend condition: service_completed_successfully services: init-clickhouse: - <<: *common + !!merge <<: *common image: clickhouse/clickhouse-server:24.1.2-alpine container_name: signoz-init-clickhouse command: @@ -82,7 +82,7 @@ services: volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: - <<: *zookeeper-defaults + !!merge <<: *zookeeper-defaults container_name: signoz-zookeeper-1 # ports: # - "2181:2181" @@ -98,7 +98,7 @@ services: - ZOO_ENABLE_PROMETHEUS_METRICS=yes - ZOO_PROMETHEUS_METRICS_PORT_NUMBER=9141 zookeeper-2: - <<: *zookeeper-defaults + !!merge <<: *zookeeper-defaults container_name: signoz-zookeeper-2 # ports: # - "2182:2181" @@ -114,7 +114,7 @@ services: - ZOO_ENABLE_PROMETHEUS_METRICS=yes - ZOO_PROMETHEUS_METRICS_PORT_NUMBER=9141 zookeeper-3: - <<: *zookeeper-defaults + !!merge <<: *zookeeper-defaults container_name: signoz-zookeeper-3 # ports: # - "2183:2181" @@ -130,7 +130,7 @@ services: - ZOO_ENABLE_PROMETHEUS_METRICS=yes - ZOO_PROMETHEUS_METRICS_PORT_NUMBER=9141 clickhouse: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults container_name: signoz-clickhouse # ports: # - "9000:9000" @@ -145,7 +145,7 @@ services: - clickhouse:/var/lib/clickhouse/ # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml clickhouse-2: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults container_name: signoz-clickhouse-2 # ports: # - "9001:9000" @@ -160,7 +160,7 @@ services: - clickhouse-2:/var/lib/clickhouse/ # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml clickhouse-3: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults container_name: signoz-clickhouse-3 # ports: # - "9002:9000" @@ -175,7 +175,7 @@ services: - clickhouse-3:/var/lib/clickhouse/ # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml alertmanager: - <<: *common + !!merge <<: *common image: signoz/alertmanager:${ALERTMANAGER_TAG:-0.23.7} container_name: signoz-alertmanager command: @@ -187,8 +187,8 @@ services: query-service: condition: service_healthy query-service: - <<: *db-depend - image: signoz/query-service:${DOCKER_TAG:-0.69.0} + !!merge <<: *db-depend + image: signoz/query-service:${DOCKER_TAG:-0.70.0} container_name: signoz-query-service command: - --config=/root/config/prometheus.yml @@ -221,8 +221,8 @@ services: timeout: 5s retries: 3 frontend: - <<: *common - image: signoz/frontend:${DOCKER_TAG:-0.69.0} + !!merge <<: *common + image: signoz/frontend:${DOCKER_TAG:-0.70.0} container_name: signoz-frontend depends_on: - alertmanager @@ -233,7 +233,7 @@ services: - ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf # TODO: support otel-collector multiple replicas. Nginx/Traefik for loadbalancing? otel-collector: - <<: *db-depend + !!merge <<: *db-depend image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.24} container_name: signoz-otel-collector command: @@ -259,7 +259,7 @@ services: query-service: condition: service_healthy schema-migrator-sync: - <<: *common + !!merge <<: *common image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} container_name: schema-migrator-sync command: @@ -270,14 +270,13 @@ services: clickhouse: condition: service_healthy schema-migrator-async: - <<: *db-depend + !!merge <<: *db-depend image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} container_name: schema-migrator-async command: - async - --dsn=tcp://clickhouse:9000 - --up= - networks: signoz-net: name: signoz-net diff --git a/deploy/docker/docker-compose.testing.yaml b/deploy/docker/docker-compose.testing.yaml index f9743ff9f4..c5ce264264 100644 --- a/deploy/docker/docker-compose.testing.yaml +++ b/deploy/docker/docker-compose.testing.yaml @@ -8,7 +8,7 @@ x-common: &common max-size: 50m max-file: "3" x-clickhouse-defaults: &clickhouse-defaults - <<: *common + !!merge <<: *common # addding non LTS version due to this fix https://github.com/ClickHouse/ClickHouse/commit/32caf8716352f45c1b617274c7508c86b7d1afab image: clickhouse/clickhouse-server:24.1.2-alpine tty: true @@ -37,7 +37,7 @@ x-clickhouse-defaults: &clickhouse-defaults soft: 262144 hard: 262144 x-zookeeper-defaults: &zookeeper-defaults - <<: *common + !!merge <<: *common image: bitnami/zookeeper:3.7.1 user: root labels: @@ -52,7 +52,7 @@ x-zookeeper-defaults: &zookeeper-defaults timeout: 5s retries: 3 x-db-depend: &db-depend - <<: *common + !!merge <<: *common depends_on: clickhouse: condition: service_healthy @@ -60,7 +60,7 @@ x-db-depend: &db-depend condition: service_completed_successfully services: init-clickhouse: - <<: *common + !!merge <<: *common image: clickhouse/clickhouse-server:24.1.2-alpine container_name: signoz-init-clickhouse command: @@ -78,7 +78,7 @@ services: volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: - <<: *zookeeper-defaults + !!merge <<: *zookeeper-defaults container_name: signoz-zookeeper-1 ports: - "2181:2181" @@ -93,7 +93,7 @@ services: - ZOO_ENABLE_PROMETHEUS_METRICS=yes - ZOO_PROMETHEUS_METRICS_PORT_NUMBER=9141 clickhouse: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults container_name: signoz-clickhouse ports: - "9000:9000" @@ -108,7 +108,7 @@ services: - clickhouse:/var/lib/clickhouse/ # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml alertmanager: - <<: *common + !!merge <<: *common image: signoz/alertmanager:${ALERTMANAGER_TAG:-0.23.7} container_name: signoz-alertmanager command: @@ -120,8 +120,8 @@ services: query-service: condition: service_healthy query-service: - <<: *db-depend - image: signoz/query-service:${DOCKER_TAG:-0.69.0} + !!merge <<: *db-depend + image: signoz/query-service:${DOCKER_TAG:-0.70.0} container_name: signoz-query-service command: - --config=/root/config/prometheus.yml @@ -156,8 +156,8 @@ services: timeout: 5s retries: 3 frontend: - <<: *common - image: signoz/frontend:${DOCKER_TAG:-0.69.0} + !!merge <<: *common + image: signoz/frontend:${DOCKER_TAG:-0.70.0} container_name: signoz-frontend depends_on: - alertmanager @@ -167,7 +167,7 @@ services: volumes: - ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - <<: *db-depend + !!merge <<: *db-depend image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.24} container_name: signoz-otel-collector command: @@ -189,7 +189,7 @@ services: query-service: condition: service_healthy schema-migrator-sync: - <<: *common + !!merge <<: *common image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} container_name: schema-migrator-sync command: @@ -200,14 +200,13 @@ services: clickhouse: condition: service_healthy schema-migrator-async: - <<: *db-depend + !!merge <<: *db-depend image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} container_name: schema-migrator-async command: - async - --dsn=tcp://clickhouse:9000 - --up= - networks: signoz-net: name: signoz-net diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml index 6a5d110237..d62f53a131 100644 --- a/deploy/docker/docker-compose.yaml +++ b/deploy/docker/docker-compose.yaml @@ -8,7 +8,7 @@ x-common: &common max-size: 50m max-file: "3" x-clickhouse-defaults: &clickhouse-defaults - <<: *common + !!merge <<: *common # addding non LTS version due to this fix https://github.com/ClickHouse/ClickHouse/commit/32caf8716352f45c1b617274c7508c86b7d1afab image: clickhouse/clickhouse-server:24.1.2-alpine tty: true @@ -37,7 +37,7 @@ x-clickhouse-defaults: &clickhouse-defaults soft: 262144 hard: 262144 x-zookeeper-defaults: &zookeeper-defaults - <<: *common + !!merge <<: *common image: bitnami/zookeeper:3.7.1 user: root labels: @@ -52,7 +52,7 @@ x-zookeeper-defaults: &zookeeper-defaults timeout: 5s retries: 3 x-db-depend: &db-depend - <<: *common + !!merge <<: *common depends_on: clickhouse: condition: service_healthy @@ -60,7 +60,7 @@ x-db-depend: &db-depend condition: service_completed_successfully services: init-clickhouse: - <<: *common + !!merge <<: *common image: clickhouse/clickhouse-server:24.1.2-alpine container_name: signoz-init-clickhouse command: @@ -78,7 +78,7 @@ services: volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: - <<: *zookeeper-defaults + !!merge <<: *zookeeper-defaults container_name: signoz-zookeeper-1 # ports: # - "2181:2181" @@ -93,7 +93,7 @@ services: - ZOO_ENABLE_PROMETHEUS_METRICS=yes - ZOO_PROMETHEUS_METRICS_PORT_NUMBER=9141 clickhouse: - <<: *clickhouse-defaults + !!merge <<: *clickhouse-defaults container_name: signoz-clickhouse # ports: # - "9000:9000" @@ -108,7 +108,7 @@ services: - clickhouse:/var/lib/clickhouse/ # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml alertmanager: - <<: *common + !!merge <<: *common image: signoz/alertmanager:${ALERTMANAGER_TAG:-0.23.7} container_name: signoz-alertmanager command: @@ -120,8 +120,8 @@ services: query-service: condition: service_healthy query-service: - <<: *db-depend - image: signoz/query-service:${DOCKER_TAG:-0.69.0} + !!merge <<: *db-depend + image: signoz/query-service:${DOCKER_TAG:-0.70.0} container_name: signoz-query-service command: - --config=/root/config/prometheus.yml @@ -154,8 +154,8 @@ services: timeout: 5s retries: 3 frontend: - <<: *common - image: signoz/frontend:${DOCKER_TAG:-0.69.0} + !!merge <<: *common + image: signoz/frontend:${DOCKER_TAG:-0.70.0} container_name: signoz-frontend depends_on: - alertmanager @@ -165,7 +165,7 @@ services: volumes: - ../common/signoz/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - <<: *db-depend + !!merge <<: *db-depend image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.24} container_name: signoz-otel-collector command: @@ -187,7 +187,7 @@ services: query-service: condition: service_healthy schema-migrator-sync: - <<: *common + !!merge <<: *common image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} container_name: schema-migrator-sync command: @@ -198,14 +198,13 @@ services: clickhouse: condition: service_healthy schema-migrator-async: - <<: *db-depend + !!merge <<: *db-depend image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.24} container_name: schema-migrator-async command: - async - --dsn=tcp://clickhouse:9000 - --up= - networks: signoz-net: name: signoz-net