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: distinct grafana auto from stackdriver auto in alignment period

Browse Source
This commit is contained in:
Erik Sundell
2018-09-26 15:44:09 +02:00
parent 13c68e6ed8
commit af9033f3e0
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,7 @@ func setAggParams(params *url.Values, query *tsdb.Query) {
perSeriesAligner = "ALIGN_MEAN"
}
if alignmentPeriod == "auto" || alignmentPeriod == "" {
if alignmentPeriod == "grafana-auto" || alignmentPeriod == "" {
alignmentPeriodValue := int(math.Max(float64(query.IntervalMs), 60.0))
alignmentPeriod = "+" + strconv.Itoa(alignmentPeriodValue) + "s"
}

6
pkg/tsdb/stackdriver/stackdriver_test.go
View File

@@ -67,12 +67,12 @@ func TestStackdriver(t *testing.T) {
So(queries[0].Params["filter"][0], ShouldEqual, `metric.type="a/metric/type" key="value" key2="value2"`)
})
Convey("and alignmentPeriod is set to auto", func() {
Convey("and alignmentPeriod is set to grafana-auto", func() {
Convey("and IntervalMs is larger than 60", func() {
tsdbQuery.Queries[0].IntervalMs = 1000
tsdbQuery.Queries[0].Model = simplejson.NewFromAny(map[string]interface{}{
"target": "target",
"alignmentPeriod": "auto",
"alignmentPeriod": "grafana-auto",
"filters": []interface{}{"key", "=", "value", "AND", "key2", "=", "value2"},
})
@@ -84,7 +84,7 @@ func TestStackdriver(t *testing.T) {
tsdbQuery.Queries[0].IntervalMs = 30
tsdbQuery.Queries[0].Model = simplejson.NewFromAny(map[string]interface{}{
"target": "target",
"alignmentPeriod": "auto",
"alignmentPeriod": "grafana-auto",
"filters": []interface{}{"key", "=", "value", "AND", "key2", "=", "value2"},
})