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: change pattern for annotation to metric.value

Browse Source
This commit is contained in:
Daniel Lee 2018-09-28 14:55:39 +02:00
parent 189f89a9e4
commit 41060d24d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ func formatAnnotationText(annotationText string, pointValue string, metricType s
return metricPart return metricPart
} }
if metaPartName == "value" { if metaPartName == "metric.value" {
return []byte(pointValue) 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"} res := &tsdb.QueryResult{Meta: simplejson.New(), RefId: "annotationQuery"}
query := &StackdriverQuery{} 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) So(err, ShouldBeNil)
Convey("Should return annotations table", func() { Convey("Should return annotations table", func() {