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

stackdriver: merge commit"

Browse Source
This commit is contained in:
Erik Sundell 2018-09-28 16:21:54 +02:00
commit 9748a9487b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/pluginproxy/access_token_provider.go
View File

@ -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
}
}

2
pkg/tsdb/stackdriver/annotation_query.go
View File

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

2
pkg/tsdb/stackdriver/annotation_query_test.go
View File

@ -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() {