From 5d1253d2b6213f3742dfdaf41dbf2dae32625c04 Mon Sep 17 00:00:00 2001 From: aniket Date: Tue, 26 Aug 2025 14:19:18 +0530 Subject: [PATCH] fix(alert-query-v5): added fillgaps format options in alerts qbv5 --- pkg/query-service/model/v3/v3.go | 3 ++- pkg/query-service/rules/threshold_rule.go | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/query-service/model/v3/v3.go b/pkg/query-service/model/v3/v3.go index 519ea56c5325..7c8d5facc19a 100644 --- a/pkg/query-service/model/v3/v3.go +++ b/pkg/query-service/model/v3/v3.go @@ -514,7 +514,8 @@ type CompositeQuery struct { ClickHouseQueries map[string]*ClickHouseQuery `json:"chQueries,omitempty"` PromQueries map[string]*PromQuery `json:"promQueries,omitempty"` - Queries []qbtypes.QueryEnvelope `json:"queries,omitempty"` + Queries []qbtypes.QueryEnvelope `json:"queries,omitempty"` + FormatOptions *qbtypes.FormatOptions `json:"formatOptions,omitempty"` PanelType PanelType `json:"panelType"` QueryType QueryType `json:"queryType"` diff --git a/pkg/query-service/rules/threshold_rule.go b/pkg/query-service/rules/threshold_rule.go index 4287da15f913..3bb4ff9f0670 100644 --- a/pkg/query-service/rules/threshold_rule.go +++ b/pkg/query-service/rules/threshold_rule.go @@ -293,6 +293,9 @@ func (r *ThresholdRule) prepareQueryRangeV5(ctx context.Context, ts time.Time) ( } req.CompositeQuery.Queries = make([]qbtypes.QueryEnvelope, len(r.Condition().CompositeQuery.Queries)) copy(req.CompositeQuery.Queries, r.Condition().CompositeQuery.Queries) + if r.Condition().CompositeQuery.FormatOptions != nil { + req.FormatOptions = r.Condition().CompositeQuery.FormatOptions + } return req, nil }