From 4b3829fd5bd0623c31045fda974a0902f664d10a Mon Sep 17 00:00:00 2001 From: Amol Umbark Date: Thu, 24 Nov 2022 18:19:07 +0530 Subject: [PATCH] fix: fixed date condition (start and end) while preparing ch query (#1751) Co-authored-by: Ankit Nayan --- pkg/query-service/rules/thresholdRule.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/query-service/rules/thresholdRule.go b/pkg/query-service/rules/thresholdRule.go index 3d08f70d35..b468528335 100644 --- a/pkg/query-service/rules/thresholdRule.go +++ b/pkg/query-service/rules/thresholdRule.go @@ -343,8 +343,8 @@ func (r *ThresholdRule) prepareQueryRange(ts time.Time) *qsmodel.QueryRangeParam if r.ruleCondition.QueryType() == qsmodel.CLICKHOUSE { return &qsmodel.QueryRangeParamsV2{ - Start: ts.UnixMilli(), - End: ts.Add(-time.Duration(r.evalWindow)).UnixMilli(), + Start: ts.Add(-time.Duration(r.evalWindow)).UnixMilli(), + End: ts.UnixMilli(), Step: 30, CompositeMetricQuery: r.ruleCondition.CompositeMetricQuery, Variables: make(map[string]interface{}, 0), @@ -353,8 +353,8 @@ func (r *ThresholdRule) prepareQueryRange(ts time.Time) *qsmodel.QueryRangeParam // default mode return &qsmodel.QueryRangeParamsV2{ - Start: ts.UnixMilli(), - End: ts.Add(-time.Duration(r.evalWindow)).UnixMilli(), + Start: ts.Add(-time.Duration(r.evalWindow)).UnixMilli(), + End: ts.UnixMilli(), Step: 30, CompositeMetricQuery: r.ruleCondition.CompositeMetricQuery, }