Cloud monitoring: fix missing title and text from cloud monitoring annotations (#27187)

* cloudmonitoring: fix empty title and text annotation

* cloudmonitoring: use metricQuery value

pkg/tsdb/cloudmonitoring/annotation_query.go

@@ -25,9 +25,11 @@ func (e *CloudMonitoringExecutor) executeAnnotationQuery(ctx context.Context, ts
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
-	title := firstQuery.Model.Get("title").MustString()
-	text := firstQuery.Model.Get("text").MustString()
-	tags := firstQuery.Model.Get("tags").MustString()
+
+	metricQuery := firstQuery.Model.Get("metricQuery")
+	title := metricQuery.Get("title").MustString()
+	text := metricQuery.Get("text").MustString()
+	tags := metricQuery.Get("tags").MustString()
 	err = e.parseToAnnotations(queryRes, resp, queries[0], title, text, tags)
 	err = e.parseToAnnotations(queryRes, resp, queries[0], title, text, tags)
 	result.Results[firstQuery.RefId] = queryRes
 	result.Results[firstQuery.RefId] = queryRes
 
 

pkg/tsdb/cloudmonitoring/cloudmonitoring.go

@@ -302,7 +302,7 @@ func migrateLegacyQueryModel(query *tsdb.Query) {
 	if mq == nil {
 	if mq == nil {
 		migratedModel := simplejson.NewFromAny(map[string]interface{}{
 		migratedModel := simplejson.NewFromAny(map[string]interface{}{
 			"queryType":   metricQueryType,
 			"queryType":   metricQueryType,
-			"metricQuery": query.Model,
+			"metricQuery": query.Model.MustMap(),
 		})
 		})
 		query.Model = migratedModel
 		query.Model = migratedModel
 	}
 	}