From 616da8879003b0eaddd667e23dc73e1e83e3710c Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Fri, 5 Aug 2022 22:30:55 +0530 Subject: [PATCH 1/3] =?UTF-8?q?chore(release):=20=F0=9F=93=8C=20pin=20vers?= =?UTF-8?q?ions:=20SigNoz=200.10.1,=20OtelCollector=200.45.1-1.3,=20Alertm?= =?UTF-8?q?anager=200.23.0-0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- .../docker-swarm/clickhouse-setup/docker-compose.yaml | 10 +++++----- deploy/docker/clickhouse-setup/docker-compose.yaml | 10 +++++----- .../tests/test-deploy/docker-compose.yaml | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 1003dda437..9fbf9e0632 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -27,7 +27,7 @@ services: retries: 3 alertmanager: - image: signoz/alertmanager:0.23.0-0.1 + image: signoz/alertmanager:0.23.0-0.2 volumes: - ./data/alertmanager:/data command: @@ -40,7 +40,7 @@ services: condition: on-failure query-service: - image: signoz/query-service:0.10.0 + image: signoz/query-service:0.10.1 command: ["-config=/root/config/prometheus.yml"] # ports: # - "6060:6060" # pprof port @@ -68,7 +68,7 @@ services: - clickhouse frontend: - image: signoz/frontend:0.10.0 + image: signoz/frontend:0.10.1 deploy: restart_policy: condition: on-failure @@ -81,7 +81,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - image: signoz/otelcontribcol:0.45.1-1.1 + image: signoz/otelcontribcol:0.45.1-1.3 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -111,7 +111,7 @@ services: - clickhouse otel-collector-metrics: - image: signoz/otelcontribcol:0.45.1-1.1 + image: signoz/otelcontribcol:0.45.1-1.3 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/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 3b3403a480..2892cb89a2 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -25,7 +25,7 @@ services: retries: 3 alertmanager: - image: signoz/alertmanager:0.23.0-0.1 + image: signoz/alertmanager:0.23.0-0.2 volumes: - ./data/alertmanager:/data depends_on: @@ -39,7 +39,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:0.10.0 + image: signoz/query-service:0.10.1 container_name: query-service command: ["-config=/root/config/prometheus.yml"] # ports: @@ -66,7 +66,7 @@ services: condition: service_healthy frontend: - image: signoz/frontend:0.10.0 + image: signoz/frontend:0.10.1 container_name: frontend restart: on-failure depends_on: @@ -78,7 +78,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - image: signoz/otelcontribcol:0.45.1-1.1 + image: signoz/otelcontribcol:0.45.1-1.3 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -103,7 +103,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.45.1-1.1 + image: signoz/otelcontribcol:0.45.1-1.3 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 index 794d398826..d6d9b9c1eb 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml @@ -24,7 +24,7 @@ services: - "8123:8123" alertmanager: - image: signoz/alertmanager:0.23.0-0.1 + image: signoz/alertmanager:0.23.0-0.2 depends_on: - query-service restart: on-failure @@ -59,7 +59,7 @@ services: condition: service_healthy otel-collector: - image: signoz/otelcontribcol:0.45.1-1.1 + image: signoz/otelcontribcol:0.45.1-1.3 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -74,7 +74,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.45.1-1.1 + image: signoz/otelcontribcol:0.45.1-1.3 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml From 8bdc41bef08d4a7c4b740769aadb0fc447e356e1 Mon Sep 17 00:00:00 2001 From: Amol Umbark Date: Sat, 6 Aug 2022 13:40:41 +0530 Subject: [PATCH 2/3] fix: resolves issue for migrated promql (#1481) --- frontend/src/container/FormAlertRules/RuleOptions.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/container/FormAlertRules/RuleOptions.tsx b/frontend/src/container/FormAlertRules/RuleOptions.tsx index 8794f87b2c..968ce695e3 100644 --- a/frontend/src/container/FormAlertRules/RuleOptions.tsx +++ b/frontend/src/container/FormAlertRules/RuleOptions.tsx @@ -156,6 +156,8 @@ function RuleOptions({ ...alertDef, condition: { ...alertDef.condition, + op: alertDef.condition?.op || defaultCompareOp, + matchType: alertDef.condition?.matchType || defaultMatchType, target: value as number, }, }); From 9de99d18726db1c25df1aea94704bb6ee5356dc6 Mon Sep 17 00:00:00 2001 From: zedongh <248348907@qq.com> Date: Tue, 9 Aug 2022 12:22:55 +0800 Subject: [PATCH 3/3] fix: interval should be 1d=24h (#1482) (#1483) --- frontend/src/lib/getMinMax.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/lib/getMinMax.ts b/frontend/src/lib/getMinMax.ts index ae830cc06a..a597314799 100644 --- a/frontend/src/lib/getMinMax.ts +++ b/frontend/src/lib/getMinMax.ts @@ -30,11 +30,11 @@ const GetMinMax = ( minTime = minTimeAgo; } else if (interval === '1day') { // one day = 24*60(min) - const minTimeAgo = getMinAgo({ minutes: 26 * 60 }).getTime(); + const minTimeAgo = getMinAgo({ minutes: 24 * 60 }).getTime(); minTime = minTimeAgo; } else if (interval === '1week') { // one week = one day * 7 - const minTimeAgo = getMinAgo({ minutes: 26 * 60 * 7 }).getTime(); + const minTimeAgo = getMinAgo({ minutes: 24 * 60 * 7 }).getTime(); minTime = minTimeAgo; } else if (['4hr', '6hr'].includes(interval)) { const h = parseInt(interval.replace('hr', ''), 10);