IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 00:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Correctly set title and text fields
This commit is contained in:
Andreas Christou 2023-07-21 21:42:42 +01:00 committed by GitHub
parent 8c86a46440
commit c4d6509145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/tsdb/cloud-monitoring/annotation_query.go
View File

@ -26,19 +26,19 @@ func (s *Service) executeAnnotationQuery(ctx context.Context, req *backend.Query
return resp, err return resp, err
} }
mq := struct { tslq := struct {
MetricQuery struct { TimeSeriesList struct {
Title string `json:"title"` Title string `json:"title"`
Text string `json:"text"` Text string `json:"text"`
} `json:"metricQuery"` } `json:"timeSeriesList"`
}{} }{}
firstQuery := req.Queries[0] firstQuery := req.Queries[0]
err = json.Unmarshal(firstQuery.JSON, &mq) err = json.Unmarshal(firstQuery.JSON, &tslq)
if err != nil { if err != nil {
return resp, 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 resp.Responses[firstQuery.RefID] = *queryRes
return resp, err return resp, err