public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.0.x] CloudMonitoring: Correctly set title and text fields for annotations (#72153)

Browse Source 
CloudMonitoring: Correctly set title and text fields for annotations (#71888)

Correctly set title and text fields

(cherry picked from commit c4d6509145)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2023-07-21 23:54:47 +03:00
committed by GitHub
co-authored by Andreas Christou
parent c08159c007
commit 99732704dd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudmonitoring/annotation_query.go
+5 -5
View File
@@ -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