stackdriver: merge commit"

pkg/api/pluginproxy/access_token_provider.go

@@ -111,7 +111,7 @@ func (provider *accessTokenProvider) getJwtAccessToken(ctx context.Context, data
 	defer oauthJwtTokenCache.Unlock()
 	if cachedToken, found := oauthJwtTokenCache.cache[provider.getAccessTokenCacheKey()]; found {
 		if cachedToken.Expiry.After(time.Now().Add(time.Second * 10)) {
-			logger.Info("Using token from cache")
+			logger.Debug("Using token from cache")
 			return cachedToken.AccessToken, nil
 		}
 	}

pkg/tsdb/stackdriver/annotation_query.go

@@ -97,7 +97,7 @@ func formatAnnotationText(annotationText string, pointValue string, metricType s
 			return metricPart
 		}
 
-		if metaPartName == "value" {
+		if metaPartName == "metric.value" {
 			return []byte(pointValue)
 		}
 

pkg/tsdb/stackdriver/annotation_query_test.go

@@ -19,7 +19,7 @@ func TestStackdriverAnnotationQuery(t *testing.T) {
 
 			res := &tsdb.QueryResult{Meta: simplejson.New(), RefId: "annotationQuery"}
 			query := &StackdriverQuery{}
-			err = executor.parseToAnnotations(res, data, query, "atitle {{metric.label.instance_name}} {{value}}", "atext {{resource.label.zone}}", "atag")
+			err = executor.parseToAnnotations(res, data, query, "atitle {{metric.label.instance_name}} {{metric.value}}", "atext {{resource.label.zone}}", "atag")
 			So(err, ShouldBeNil)
 
 			Convey("Should return annotations table", func() {