Commit af9033f3 by Erik Sundell

stackdriver: distinct grafana auto from stackdriver auto in alignment period

parent 13c68e6e
......@@ -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"
}
......
......@@ -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"},
})
......
......@@ -243,7 +243,8 @@ export const aggOptions = [
];
export const alignmentPeriods = [
{ text: 'auto', value: 'auto' },
{ text: 'grafana auto', value: 'grafana-auto' },
{ text: 'stackdriver auto', value: 'stackdriver-auto' },
{ text: '1m', value: '+60s' },
{ text: '5m', value: '+300s' },
{ text: '30m', value: '+1800s' },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment