stackdriver: distinct grafana auto from stackdriver auto in alignment period

pkg/tsdb/stackdriver/stackdriver.go

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

pkg/tsdb/stackdriver/stackdriver_test.go

@@ -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"`)
 				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() {
 				Convey("and IntervalMs is larger than 60", func() {
 					tsdbQuery.Queries[0].IntervalMs = 1000
 					tsdbQuery.Queries[0].IntervalMs = 1000
 					tsdbQuery.Queries[0].Model = simplejson.NewFromAny(map[string]interface{}{
 					tsdbQuery.Queries[0].Model = simplejson.NewFromAny(map[string]interface{}{
 						"target":          "target",
 						"target":          "target",
-						"alignmentPeriod": "auto",
+						"alignmentPeriod": "grafana-auto",
 						"filters":         []interface{}{"key", "=", "value", "AND", "key2", "=", "value2"},
 						"filters":         []interface{}{"key", "=", "value", "AND", "key2", "=", "value2"},
 					})
 					})
 
 
@@ -84,7 +84,7 @@ func TestStackdriver(t *testing.T) {
 					tsdbQuery.Queries[0].IntervalMs = 30
 					tsdbQuery.Queries[0].IntervalMs = 30
 					tsdbQuery.Queries[0].Model = simplejson.NewFromAny(map[string]interface{}{
 					tsdbQuery.Queries[0].Model = simplejson.NewFromAny(map[string]interface{}{
 						"target":          "target",
 						"target":          "target",
-						"alignmentPeriod": "auto",
+						"alignmentPeriod": "grafana-auto",
 						"filters":         []interface{}{"key", "=", "value", "AND", "key2", "=", "value2"},
 						"filters":         []interface{}{"key", "=", "value", "AND", "key2", "=", "value2"},
 					})
 					})
 
 

public/app/plugins/datasource/stackdriver/constants.ts

@@ -243,7 +243,8 @@ export const aggOptions = [
 ];
 ];
 
 
 export const alignmentPeriods = [
 export const alignmentPeriods = [
-  { text: 'auto', value: 'auto' },
+  { text: 'grafana auto', value: 'grafana-auto' },
+  { text: 'stackdriver auto', value: 'stackdriver-auto' },
   { text: '1m', value: '+60s' },
   { text: '1m', value: '+60s' },
   { text: '5m', value: '+300s' },
   { text: '5m', value: '+300s' },
   { text: '30m', value: '+1800s' },
   { text: '30m', value: '+1800s' },