IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Azure: Insights metrics - do not sort if no data (#26486)

Browse Source 
fixes #26473
This commit is contained in:
Kyle Brandt 2020-07-21 10:24:55 -04:00 committed by GitHub
parent f427f90a45
commit fb5ff6a70f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/azuremonitor/applicationinsights-metrics.go
View File

@ -107,6 +107,10 @@ func InsightsMetricsResultToFrame(mr MetricsResult, metric, agg string, dimensio
rowCounter++ rowCounter++
} }
if len(frame.Fields) == 1 { // No data, only a time column, no sort
return frame, nil
}
if err := data.SortWideFrameFields(frame, dimensions...); err != nil { if err := data.SortWideFrameFields(frame, dimensions...); err != nil {
return nil, err return nil, err
} }

10
pkg/tsdb/azuremonitor/applicationinsights-metrics_test.go
View File

@ -42,6 +42,16 @@ func TestInsightsMetricsResultToFrame(t *testing.T) {
return frame return frame
}, },
}, },
{
name: "empty response",
testFile: "applicationinsights/5-application-insights-empty-response.json",
metric: "value",
agg: "avg",
expectedFrame: func() *data.Frame {
frame := data.NewFrame("", data.NewField("StartTime", nil, []time.Time{}))
return frame
},
},
{ {
name: "segmented series", name: "segmented series",
testFile: "applicationinsights/4-application-insights-response-metrics-segmented.json", testFile: "applicationinsights/4-application-insights-response-metrics-segmented.json",

1
pkg/tsdb/azuremonitor/testdata/applicationinsights/5-application-insights-empty-response.json vendored Normal file
View File

@ -0,0 +1 @@
{"value":{"start":"2020-07-21T11:55:15.000Z","end":"2020-07-21T11:56:15.000Z","interval":"PT1M","segments":[]}}