Alerting: copy queryType prop to tsdb.Query (#27053)

fixes #27048

Alerting: copy queryType prop to tsdb.Query (#27053)
fixes #27048
96babf12 · Kyle Brandt · GitHub · 17174769 · 96babf12
Commit 96babf12 authored Aug 19, 2020 by Kyle Brandt Committed by GitHub Aug 19, 2020
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

pkg/services/alerting/conditions/query.go
+3 -1

No files found.
--- a/pkg/services/alerting/conditions/query.go
+++ b/pkg/services/alerting/conditions/query.go
@@ -214,13 +214,15 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *
 }

 func (c *QueryCondition) getRequestForAlertRule(datasource *models.DataSource, timeRange *tsdb.TimeRange, debug bool) *tsdb.TsdbQuery {
+	queryModel := c.Query.Model
 	req := &tsdb.TsdbQuery{
 		TimeRange: timeRange,
 		Queries: []*tsdb.Query{
 			{
 				RefId:      "A",
-				Model:      c.Query.Model,
+				Model:      queryModel,
 				DataSource: datasource,
+				QueryType:  queryModel.Get("queryType").MustString(""),
 			},
 		},
 		Headers: map[string]string{