fix: fixed date condition (start and end) while preparing ch query (#1751)

Co-authored-by: Ankit Nayan <ankit@signoz.io>
This commit is contained in:
Amol Umbark 2022-11-24 18:19:07 +05:30 committed by GitHub
parent 983ca1ec6a
commit 4b3829fd5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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,
}