From 303bbb9900f18740bc3ade23f3402d014eae51bf Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Fri, 17 Jan 2020 15:27:03 +0100
Subject: [PATCH] CloudWatch: Fix ordering of map to resolve flaky test
 (#21572)

---
 pkg/tsdb/cloudwatch/response_parser.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/tsdb/cloudwatch/response_parser.go b/pkg/tsdb/cloudwatch/response_parser.go
index b254c7ed500..38ef6906c46 100644
--- a/pkg/tsdb/cloudwatch/response_parser.go
+++ b/pkg/tsdb/cloudwatch/response_parser.go
@@ -2,6 +2,7 @@ package cloudwatch
 
 import (
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -80,7 +81,14 @@ func parseGetMetricDataTimeSeries(metricDataResults map[string]*cloudwatch.Metri
 			Points: make([]tsdb.TimePoint, 0),
 		}
 
-		for key, values := range query.Dimensions {
+		keys := make([]string, 0)
+		for k := range query.Dimensions {
+			keys = append(keys, k)
+		}
+		sort.Strings(keys)
+
+		for _, key := range keys {
+			values := query.Dimensions[key]
 			if len(values) == 1 && values[0] != "*" {
 				series.Tags[key] = values[0]
 			} else {