chore(release): 📌 pin versions: SigNoz 0.8.0, Alertmanager 0.23.0-0.1…

…, OtelCollector 0.43.0-0.1 Signed-off-by: Prashant Shahi <[email protected]>
SigNoz · May 6, 2022 · 3995de1 · 3995de1
1 parent da386b0
commit 3995de1
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 37 deletions.
diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
@@ -24,7 +24,7 @@ services:
       retries: 3
 
   alertmanager:
-    image: signoz/alertmanager:0.6.1
+    image: signoz/alertmanager:0.23.0-0.1
     volumes:
       - ./data/alertmanager:/data
     command:
@@ -37,7 +37,7 @@ services:
         condition: on-failure
 
   query-service:
-    image: signoz/query-service:0.7.5
+    image: signoz/query-service:0.8.0
     command: ["-config=/root/config/prometheus.yml"]
     ports:
       - "8080:8080"
@@ -46,7 +46,7 @@ services:
       - ../dashboards:/root/config/dashboards
       - ./data/signoz/:/var/lib/signoz/
     environment:
-      - ClickHouseUrl=tcp://clickhouse:9000
+      - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
       - STORAGE=clickhouse
       - GODEBUG=netdns=go
       - TELEMETRY_ENABLED=true
@@ -64,7 +64,7 @@ services:
       - clickhouse
 
   frontend:
-    image: signoz/frontend:0.7.5
+    image: signoz/frontend:0.8.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -77,7 +77,7 @@ services:
       - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
 
   otel-collector:
-    image: signoz/otelcontribcol:0.43.0
+    image: signoz/otelcontribcol:0.43.0-0.1
     command: ["--config=/etc/otel-collector-config.yaml"]
     volumes:
       - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
@@ -103,7 +103,7 @@ services:
       - clickhouse
 
   otel-collector-metrics:
-    image: signoz/otelcontribcol:0.43.0
+    image: signoz/otelcontribcol:0.43.0-0.1
     command: ["--config=/etc/otel-collector-metrics-config.yaml"]
     volumes:
       - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml

diff --git a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml
@@ -28,6 +28,11 @@ processors:
     metrics_exporter: prometheus
     latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
     dimensions_cache_size: 10000
+    dimensions:
+      - name: service.namespace
+        default: default
+      - name: deployment.environment
+        default: default
   # memory_limiter:
   #   # 80% of maximum memory up to 2G
   #   limit_mib: 1500
@@ -48,7 +53,7 @@ extensions:
   zpages: {}
 exporters:
   clickhouse:
-    datasource: tcp://clickhouse:9000
+    datasource: tcp://clickhouse:9000/?database=signoz_traces
   clickhousemetricswrite:
     endpoint: tcp://clickhouse:9000/?database=signoz_metrics
     resource_to_telemetry_conversion:

diff --git a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml
@@ -22,7 +22,7 @@ services:
       retries: 3
 
   alertmanager:
-    image: signoz/alertmanager:0.6.1
+    image: signoz/alertmanager:0.23.0-0.1
     volumes:
       - ./data/alertmanager:/data
     depends_on:
@@ -37,7 +37,7 @@ services:
 
 
   query-service:
-    image: signoz/query-service:0.7.5
+    image: signoz/query-service:0.8.0
     container_name: query-service
     command: ["-config=/root/config/prometheus.yml"]
     volumes:
@@ -62,7 +62,7 @@ services:
         condition: service_healthy
 
   frontend:
-    image: signoz/frontend:0.7.5
+    image: signoz/frontend:0.8.0
     container_name: frontend
     restart: on-failure
     depends_on:
@@ -74,7 +74,7 @@ services:
       - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
 
   otel-collector:
-    image: signoz/otelcontribcol:trace-optimized-v1
+    image: signoz/otelcontribcol:0.43.0-0.1
     command: ["--config=/etc/otel-collector-config.yaml"]
     volumes:
       - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
@@ -95,7 +95,7 @@ services:
         condition: service_healthy
 
   otel-collector-metrics:
-    image: signoz/otelcontribcol:trace-optimized-v1
+    image: signoz/otelcontribcol:0.43.0-0.1
     command: ["--config=/etc/otel-collector-metrics-config.yaml"]
     volumes:
       - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml
@@ -115,17 +115,17 @@ services:
     environment:
       - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
 
-  # load-hotrod:
-  #   image: "grubykarol/locust:1.2.3-python3.9-alpine3.12"
-  #   container_name: load-hotrod
-  #   hostname: load-hotrod
-  #   environment:
-  #     ATTACKED_HOST: http://hotrod:8080
-  #     LOCUST_MODE: standalone
-  #     NO_PROXY: standalone
-  #     TASK_DELAY_FROM: 5
-  #     TASK_DELAY_TO: 30
-  #     QUIET_MODE: "${QUIET_MODE:-false}"
-  #     LOCUST_OPTS: "--headless -u 10 -r 1"
-  #   volumes:
-  #     - ../common/locust-scripts:/locust
+  load-hotrod:
+    image: "grubykarol/locust:1.2.3-python3.9-alpine3.12"
+    container_name: load-hotrod
+    hostname: load-hotrod
+    environment:
+      ATTACKED_HOST: http://hotrod:8080
+      LOCUST_MODE: standalone
+      NO_PROXY: standalone
+      TASK_DELAY_FROM: 5
+      TASK_DELAY_TO: 30
+      QUIET_MODE: "${QUIET_MODE:-false}"
+      LOCUST_OPTS: "--headless -u 10 -r 1"
+    volumes:
+      - ../common/locust-scripts:/locust
diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml
@@ -36,7 +36,7 @@ services:
 # 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:develop
+    image: signoz/query-service:0.8.0
     container_name: query-service
     command: ["-config=/root/config/prometheus.yml"]
     volumes:
@@ -60,7 +60,7 @@ services:
         condition: service_healthy
 
   frontend:
-    image: signoz/frontend:develop
+    image: signoz/frontend:0.8.0
     container_name: frontend
     restart: on-failure
     depends_on:

diff --git a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
@@ -18,7 +18,7 @@ services:
       retries: 3
 
   alertmanager:
-    image: signoz/alertmanager:0.6.0
+    image: signoz/alertmanager:0.23.0-0.1
     depends_on:
       - query-service
     restart: on-failure
@@ -37,7 +37,7 @@ services:
     ports:
       - "8180:8080"
     environment:
-      - ClickHouseUrl=tcp://clickhouse:9000
+      - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
       - STORAGE=clickhouse
       - GODEBUG=netdns=go
       - TELEMETRY_ENABLED=true
@@ -51,7 +51,7 @@ services:
         condition: service_healthy
 
   otel-collector:
-    image: signoz/otelcontribcol:0.43.0
+    image: signoz/otelcontribcol:0.43.0-0.1
     command: ["--config=/etc/otel-collector-config.yaml"]
     volumes:
       - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
@@ -64,7 +64,7 @@ services:
         condition: service_healthy
 
   otel-collector-metrics:
-    image: signoz/otelcontribcol:0.43.0
+    image: signoz/otelcontribcol:0.43.0-0.1
     command: ["--config=/etc/otel-collector-metrics-config.yaml"]
     volumes:
       - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml

diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml
@@ -21,7 +21,7 @@ services:
         - "8123:8123"
 
   alertmanager:
-    image: signoz/alertmanager:0.6.0
+    image: signoz/alertmanager:0.23.0-0.1
     depends_on:
       - query-service
     restart: on-failure
@@ -42,7 +42,7 @@ services:
     ports:
       - "8180:8080"
     environment:
-      - ClickHouseUrl=tcp://clickhouse:9000
+      - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
       - STORAGE=clickhouse
       - GODEBUG=netdns=go
       - TELEMETRY_ENABLED=true
@@ -56,7 +56,7 @@ services:
         condition: service_healthy
 
   otel-collector:
-    image: signoz/otelcontribcol:0.43.0
+    image: signoz/otelcontribcol:0.43.0-0.1
     command: ["--config=/etc/otel-collector-config.yaml"]
     volumes:
       - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
@@ -69,7 +69,7 @@ services:
         condition: service_healthy
 
   otel-collector-metrics:
-    image: signoz/otelcontribcol:0.43.0
+    image: signoz/otelcontribcol:0.43.0-0.1
     command: ["--config=/etc/otel-collector-metrics-config.yaml"]
     volumes:
       - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml

diff --git a/pkg/query-service/tests/test-deploy/otel-collector-config.yaml b/pkg/query-service/tests/test-deploy/otel-collector-config.yaml
@@ -27,6 +27,12 @@ processors:
   signozspanmetrics/prometheus:
     metrics_exporter: prometheus
     latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
+    dimensions_cache_size: 10000
+    dimensions:
+      - name: service.namespace
+        default: default
+      - name: deployment.environment
+        default: default
   # memory_limiter:
   #   # Same as --mem-ballast-size-mib CLI argument
   #   ballast_size_mib: 683
@@ -44,7 +50,7 @@ extensions:
   zpages: {}
 exporters:
   clickhouse:
-    datasource: tcp://clickhouse:9000
+    datasource: tcp://clickhouse:9000/?database=signoz_traces
   clickhousemetricswrite:
     endpoint: tcp://clickhouse:9000/?database=signoz_metrics
     resource_to_telemetry_conversion: