chore(release): bump to v0.70.0 (#6970)

#### Summary - Release SigNoz v0.70.0 - Bump SigNoz OTel Collector to v0.111.25 Created by [Primus-Bot](https://github.com/apps/primus-bot)
SigNoz · Jan 29, 2025 · 7016998 · 7016998
1 parent fb3b70b
commit 7016998
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 81 deletions.
diff --git 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,15 +54,15 @@ x-zookeeper-defaults: &zookeeper-defaults
     timeout: 5s
     retries: 3
 x-db-depend: &db-depend
-  <<: *common
+  !!merge <<: *common
   depends_on:
     - clickhouse
     - clickhouse-2
     - clickhouse-3
     - 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
@@ -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