Merge pull request #12709 from mtanda/cw_404_err_fix

fix invalid reference

Merge pull request #12709 from mtanda/cw_404_err_fix
fix invalid reference
35920838 · Marcus Efraimsson · GitHub · 01ba973c · 055d208a · 35920838
Commit 35920838 authored Jul 25, 2018 by Marcus Efraimsson Committed by GitHub Jul 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

pkg/tsdb/cloudwatch/cloudwatch.go
+3 -2

No files found.
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -99,14 +99,15 @@ func (e *CloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, queryCo
 			continue
 		}

+		RefId := queryContext.Queries[i].RefId
 		query, err := parseQuery(queryContext.Queries[i].Model)
 		if err != nil {
-			result.Results[query.RefId] = &tsdb.QueryResult{
+			result.Results[RefId] = &tsdb.QueryResult{
 				Error: err,
 			}
 			return result, nil
 		}
-		query.RefId = queryContext.Queries[i].RefId
+		query.RefId = RefId

 		if query.Id != "" {
 			if _, ok := getMetricDataQueries[query.Region]; !ok {