Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard 2015-09-27 12:09:45 +02:00
commit b80dc92ca5

View File

@ -186,6 +186,14 @@ function (angular, app, _, kbn, TimeSeries, PanelMeta) {
$scope.setValues = function(data) { $scope.setValues = function(data) {
data.flotpairs = []; data.flotpairs = [];
if($scope.series.length > 1) {
$scope.inspector.error = new Error();
$scope.inspector.error.message = 'Multiple Series Error';
$scope.inspector.error.data = 'Metric query returns ' + $scope.series.length +
' series. Single Stat Panel expects a single series.\n\nResponse:\n'+JSON.stringify($scope.series);
throw $scope.inspector.error;
}
if ($scope.series && $scope.series.length > 0) { if ($scope.series && $scope.series.length > 0) {
var lastPoint = _.last($scope.series[0].datapoints); var lastPoint = _.last($scope.series[0].datapoints);
var lastValue = _.isArray(lastPoint) ? lastPoint[0] : null; var lastValue = _.isArray(lastPoint) ? lastPoint[0] : null;