CloudWatch: Change aggregateResponse to return slice instead of map (#48805)
* Rename tests * Change test names * Change metrics from map to slice * Add test for one output, multiple MetricDataResults * Rename test input file * Use map instead of iterating over the response metrics * Rename variable * move partial data set to query row response * remove not used label field * remove incorrect placeholder Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
This commit is contained in:
@@ -62,7 +62,6 @@ func aggregateResponse(getMetricDataOutputs []*cloudwatch.GetMetricDataOutput) m
|
||||
}
|
||||
for _, r := range gmdo.MetricDataResults {
|
||||
id := *r.Id
|
||||
label := *r.Label
|
||||
|
||||
response := newQueryRowResponse()
|
||||
if _, exists := responseByID[id]; exists {
|
||||
@@ -75,11 +74,7 @@ func aggregateResponse(getMetricDataOutputs []*cloudwatch.GetMetricDataOutput) m
|
||||
}
|
||||
}
|
||||
|
||||
if _, exists := response.Metrics[label]; !exists {
|
||||
response.addMetricDataResult(r)
|
||||
} else {
|
||||
response.appendTimeSeries(r)
|
||||
}
|
||||
response.addMetricDataResult(r)
|
||||
|
||||
for code := range errorCodes {
|
||||
if _, exists := response.ErrorCodes[code]; exists {
|
||||
@@ -120,8 +115,8 @@ func getLabels(cloudwatchLabel string, query *cloudWatchQuery) data.Labels {
|
||||
func buildDataFrames(startTime time.Time, endTime time.Time, aggregatedResponse queryRowResponse,
|
||||
query *cloudWatchQuery, dynamicLabelEnabled bool) (data.Frames, error) {
|
||||
frames := data.Frames{}
|
||||
for _, label := range aggregatedResponse.Labels {
|
||||
metric := aggregatedResponse.Metrics[label]
|
||||
for _, metric := range aggregatedResponse.Metrics {
|
||||
label := *metric.Label
|
||||
|
||||
deepLink, err := query.buildDeepLink(startTime, endTime)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user