Merge branch 'develop' into feat/logs

bmike78 · Aug 9, 2022 · fda6e44 · fda6e44
2 parents 143a5b6 + 9de99d1
commit fda6e44
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git 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
@@ -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/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,
 								},
 							});

diff --git 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);

diff --git 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