From 561920f18bc9ae0237a45f9ecf6a6d52013b1462 Mon Sep 17 00:00:00 2001
From: Ato Araki <ato.araki@gmail.com>
Date: Tue, 8 Sep 2020 19:18:41 +0900
Subject: [PATCH] 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 | 8 +++++---
 pkg/tsdb/cloudmonitoring/cloudmonitoring.go  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/tsdb/cloudmonitoring/annotation_query.go b/pkg/tsdb/cloudmonitoring/annotation_query.go
index 20a0a22e2ae..3ad31965c0f 100644
--- a/pkg/tsdb/cloudmonitoring/annotation_query.go
+++ b/pkg/tsdb/cloudmonitoring/annotation_query.go
@@ -25,9 +25,11 @@ func (e *CloudMonitoringExecutor) executeAnnotationQuery(ctx context.Context, ts
 	if err != nil {
 		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)
 	result.Results[firstQuery.RefId] = queryRes
 
diff --git a/pkg/tsdb/cloudmonitoring/cloudmonitoring.go b/pkg/tsdb/cloudmonitoring/cloudmonitoring.go
index f94d7725f70..cb19dca475e 100644
--- a/pkg/tsdb/cloudmonitoring/cloudmonitoring.go
+++ b/pkg/tsdb/cloudmonitoring/cloudmonitoring.go
@@ -302,7 +302,7 @@ func migrateLegacyQueryModel(query *tsdb.Query) {
 	if mq == nil {
 		migratedModel := simplejson.NewFromAny(map[string]interface{}{
 			"queryType":   metricQueryType,
-			"metricQuery": query.Model,
+			"metricQuery": query.Model.MustMap(),
 		})
 		query.Model = migratedModel
 	}