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

feat(test metrics): fixed issue with built in Grafana test data source, fixes #5299

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-06-08 05:45:13 +02:00
parent 36b0802789
commit 67ad903556
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/metrics.go
View File

@ -12,7 +12,7 @@ import (
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
) )
func GetTestMetrics(c *middleware.Context) { func GetTestMetrics(c *middleware.Context) Response {
from := c.QueryInt64("from") from := c.QueryInt64("from")
to := c.QueryInt64("to") to := c.QueryInt64("to")
maxDataPoints := c.QueryInt64("maxDataPoints") maxDataPoints := c.QueryInt64("maxDataPoints")
@ -37,7 +37,7 @@ func GetTestMetrics(c *middleware.Context) {
result.Data[seriesIndex].DataPoints = points result.Data[seriesIndex].DataPoints = points
} }
c.JSON(200, &result) return Json(200, &result)
} }
func GetInternalMetrics(c *middleware.Context) Response { func GetInternalMetrics(c *middleware.Context) Response {

5
public/app/features/panel/metrics_panel_ctrl.ts
View File

@ -200,6 +200,11 @@ class MetricsPanelCtrl extends PanelCtrl {
this.panel.snapshotData = result.data; this.panel.snapshotData = result.data;
} }
if (!result || !result.data) {
console.log('Data source query result invalid, missing data field:', result);
result = {data: []};
}
return this.events.emit('data-received', result.data); return this.events.emit('data-received', result.data);
} }