From 62d84c1e14386f74e8ce8035913fec6cb497c28b Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Sun, 10 Sep 2017 01:36:40 +0900
Subject: [PATCH] (cloudwatch) move query parameter to 'parameters'

---
 pkg/tsdb/cloudwatch/cloudwatch.go                      | 10 +++++++---
 public/app/plugins/datasource/cloudwatch/datasource.js |  6 ++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index d86acfa6ee4..a388bb0d9ee 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -62,9 +62,13 @@ func (e *CloudWatchExecutor) Execute(ctx context.Context, queries tsdb.QuerySlic
 
 	currentlyExecuting := 0
 	for _, model := range queries {
+		queryType := model.Model.Get("type").MustString()
+		if queryType != "timeSeriesQuery" {
+			continue
+		}
 		currentlyExecuting++
 		go func(refId string) {
-			queryRes, err := e.executeQuery(ctx, model, queryContext)
+			queryRes, err := e.executeQuery(ctx, model.Model.Get("parameters"), queryContext)
 			currentlyExecuting--
 			if err != nil {
 				errCh <- err
@@ -130,8 +134,8 @@ func (e *CloudWatchExecutor) getClient(region string) (*cloudwatch.CloudWatch, e
 	return client, nil
 }
 
-func (e *CloudWatchExecutor) executeQuery(ctx context.Context, model *tsdb.Query, queryContext *tsdb.QueryContext) (*tsdb.QueryResult, error) {
-	query, err := parseQuery(model.Model)
+func (e *CloudWatchExecutor) executeQuery(ctx context.Context, parameters *simplejson.Json, queryContext *tsdb.QueryContext) (*tsdb.QueryResult, error) {
+	query, err := parseQuery(parameters)
 	if err != nil {
 		return nil, err
 	}
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index 0a8791f489c..40094003456 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -48,12 +48,14 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
         item.dimensions = dimensions;
         item.period = self.getPeriod(item, options);
 
-        return _.extend({
+        return {
           refId: item.refId,
           intervalMs: options.intervalMs,
           maxDataPoints: options.maxDataPoints,
           datasourceId: self.instanceSettings.id,
-        }, item);
+          type: 'timeSeriesQuery',
+          parameters: item
+        };
       });
 
       // No valid targets, return the empty result to save a round trip.