From 99732704ddef957fb5f423220fdc30059e3adc84 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 23:54:47 +0300 Subject: [PATCH] [v10.0.x] CloudMonitoring: Correctly set title and text fields for annotations (#72153) CloudMonitoring: Correctly set title and text fields for annotations (#71888) Correctly set title and text fields (cherry picked from commit c4d6509145a3c913b15a13d0231850e0b84a157f) Co-authored-by: Andreas Christou --- pkg/tsdb/cloudmonitoring/annotation_query.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/tsdb/cloudmonitoring/annotation_query.go b/pkg/tsdb/cloudmonitoring/annotation_query.go index 6bfcec1f675..e4d3fac8e4b 100644 --- a/pkg/tsdb/cloudmonitoring/annotation_query.go +++ b/pkg/tsdb/cloudmonitoring/annotation_query.go @@ -26,19 +26,19 @@ func (s *Service) executeAnnotationQuery(ctx context.Context, req *backend.Query return resp, err } - mq := struct { - MetricQuery struct { + tslq := struct { + TimeSeriesList struct { Title string `json:"title"` Text string `json:"text"` - } `json:"metricQuery"` + } `json:"timeSeriesList"` }{} firstQuery := req.Queries[0] - err = json.Unmarshal(firstQuery.JSON, &mq) + err = json.Unmarshal(firstQuery.JSON, &tslq) if err != nil { return resp, nil } - err = parseToAnnotations(req.Queries[0].RefID, queryRes, dr, mq.MetricQuery.Title, mq.MetricQuery.Text) + err = parseToAnnotations(req.Queries[0].RefID, queryRes, dr, tslq.TimeSeriesList.Title, tslq.TimeSeriesList.Text) resp.Responses[firstQuery.RefID] = *queryRes return resp, err