From 59469e14cfeba57e31019b81a5dc15151ce1bd0c Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Fri, 17 Jan 2020 16:30:42 +0100
Subject: [PATCH] CloudWatch: Fix ordering of map to resolve flaky test take 2
 (#21577)

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

diff --git a/pkg/tsdb/cloudwatch/response_parser.go b/pkg/tsdb/cloudwatch/response_parser.go
index 38ef6906c46..2730de5e8f0 100644
--- a/pkg/tsdb/cloudwatch/response_parser.go
+++ b/pkg/tsdb/cloudwatch/response_parser.go
@@ -65,7 +65,14 @@ func (e *CloudWatchExecutor) parseResponse(metricDataOutputs []*cloudwatch.GetMe
 func parseGetMetricDataTimeSeries(metricDataResults map[string]*cloudwatch.MetricDataResult, query *cloudWatchQuery) (*tsdb.TimeSeriesSlice, bool, error) {
 	result := tsdb.TimeSeriesSlice{}
 	partialData := false
-	for label, metricDataResult := range metricDataResults {
+	metricDataResultLabels := make([]string, 0)
+	for k := range metricDataResults {
+		metricDataResultLabels = append(metricDataResultLabels, k)
+	}
+	sort.Strings(metricDataResultLabels)
+
+	for _, label := range metricDataResultLabels {
+		metricDataResult := metricDataResults[label]
 		if *metricDataResult.StatusCode != "Complete" {
 			partialData = true
 		}