Merge branch 'main' into fix/6484

SigNoz · Dec 28, 2024 · a4730cd · a4730cd
2 parents 9e94aa2 + f11161d
commit a4730cd
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 59 deletions.
diff --git a/.github/workflows/releaser-signoz.yaml b/.github/workflows/releaser-signoz.yaml
@@ -0,0 +1,27 @@
+name: releaser-signoz
+
+on:
+  # schedule every wednesday 9:30 AM UTC (3pm IST)
+  schedule:
+    - cron: '30 9 * * 3'
+
+  # allow manual triggering of the workflow by a maintainer with no inputs
+  workflow_dispatch:
+    inputs:
+      release_type:
+        description: "Type of the release"
+        type: choice
+        required: true
+        options:
+          - 'patch'
+          - 'minor'
+          - 'major'
+
+jobs:
+  signoz:
+    uses: signoz/primus.workflows/.github/workflows/releaser.yaml@main
+    secrets: inherit
+    with:
+      PRIMUS_REF: main
+      PROJECT_NAME: signoz
+      RELEASE_TYPE: ${{ inputs.release_type || 'minor' }}
diff --git a/.github/workflows/releaser.yaml b/.github/workflows/releaser.yaml
diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
@@ -130,7 +130,7 @@ services:
       restart_policy:
         condition: on-failure
   query-service:
-    image: signoz/query-service:0.65.0
+    image: signoz/query-service:0.65.1
     command: ["-config=/root/config/prometheus.yml", "--use-logs-new-schema=true", "--use-trace-new-schema=true"]
     # ports:
     #   - "6060:6060"     # pprof port
@@ -158,7 +158,7 @@ services:
         condition: on-failure
     !!merge <<: *db-depend
   frontend:
-    image: signoz/frontend:0.65.0
+    image: signoz/frontend:0.65.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -170,7 +170,7 @@ services:
     volumes:
       - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
   otel-collector:
-    image: signoz/signoz-otel-collector:0.111.16
+    image: signoz/signoz-otel-collector:0.111.18
     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:
@@ -202,7 +202,7 @@ services:
       - otel-collector-migrator
       - query-service
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:0.111.16
+    image: signoz/signoz-schema-migrator:0.111.18
     deploy:
       restart_policy:
         condition: on-failure

diff --git a/deploy/docker/clickhouse-setup/docker-compose-core.yaml b/deploy/docker/clickhouse-setup/docker-compose-core.yaml
@@ -1,8 +1,6 @@
 version: "2.4"
-
 include:
   - test-app-docker-compose.yaml
-
 services:
   zookeeper-1:
     image: bitnami/zookeeper:3.7.1
@@ -20,7 +18,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
-
   clickhouse:
     image: clickhouse/clickhouse-server:24.1.2-alpine
     container_name: signoz-clickhouse
@@ -43,18 +40,10 @@ services:
         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
-
   alertmanager:
     container_name: signoz-alertmanager
     image: signoz/alertmanager:0.23.7
@@ -67,33 +56,25 @@ services:
     command:
       - --queryService.url=http://query-service:8085
       - --storage.path=/data
-
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.16}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.18}
     container_name: otel-migrator
     command:
-      - "sync" 
+      - "sync"
       - "--dsn=tcp://clickhouse:9000"
-      - "--up=" 
+      - "--up="
     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
   # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
   otel-collector:
     container_name: signoz-otel-collector
-    image: signoz/signoz-otel-collector:0.111.16
-    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"
-      ]
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.18}
+    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
@@ -122,7 +103,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-minimal.yaml b/deploy/docker/clickhouse-setup/docker-compose-minimal.yaml
@@ -145,7 +145,7 @@ services:
       - --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.65.0}
+    image: signoz/query-service:${DOCKER_TAG:-0.65.1}
     container_name: signoz-query-service
     command: ["-config=/root/config/prometheus.yml", "--use-logs-new-schema=true", "--use-trace-new-schema=true"]
     # ports:
@@ -172,7 +172,7 @@ services:
       retries: 3
     !!merge <<: *db-depend
   frontend:
-    image: signoz/frontend:${DOCKER_TAG:-0.65.0}
+    image: signoz/frontend:${DOCKER_TAG:-0.65.1}
     container_name: signoz-frontend
     restart: on-failure
     depends_on:
@@ -183,7 +183,7 @@ services:
     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}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.18}
     container_name: otel-migrator-sync
     command:
       - "sync"
@@ -197,7 +197,7 @@ services:
         # clickhouse-3:
         #   condition: service_healthy
   otel-collector-migrator-async:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.16}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.18}
     container_name: otel-migrator-async
     command:
       - "async"
@@ -213,7 +213,7 @@ services:
         # clickhouse-3:
         #   condition: service_healthy
   otel-collector:
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.16}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.18}
     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"]
     user: root # required for reading docker container logs

diff --git a/deploy/docker/clickhouse-setup/docker-compose.testing.yaml b/deploy/docker/clickhouse-setup/docker-compose.testing.yaml
@@ -148,7 +148,7 @@ services:
       - --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.65.0}
+    image: signoz/query-service:${DOCKER_TAG:-0.65.1}
     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"]
     # ports:
@@ -176,7 +176,7 @@ services:
       retries: 3
     !!merge <<: *db-depend
   frontend:
-    image: signoz/frontend:${DOCKER_TAG:-0.65.0}
+    image: signoz/frontend:${DOCKER_TAG:-0.65.1}
     container_name: signoz-frontend
     restart: on-failure
     depends_on:
@@ -187,7 +187,7 @@ services:
     volumes:
       - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.16}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.18}
     container_name: otel-migrator
     command:
       - "--dsn=tcp://clickhouse:9000"
@@ -199,7 +199,7 @@ services:
         # clickhouse-3:
         #   condition: service_healthy
   otel-collector:
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.16}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.111.18}
     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"]
     user: root # required for reading docker container logs