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

Merge pull request #134 from rashidkpc/master

Browse Source 
Fixed old time pattern issue, throw error on no matched indices
This commit is contained in:
Rashid Khan 2013-05-29 13:18:40 -07:00
commit a531c79235
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panels/timepicker/module.js
View File

@ -200,7 +200,8 @@ angular.module('kibana.timepicker', [])
};
}
$scope.time_apply = function() {
$scope.time_apply = function() {
$scope.panel.error = "";
// Update internal time object
$scope.time = $scope.time_calc();
$scope.time.field = $scope.panel.timefield
@ -213,8 +214,12 @@ angular.module('kibana.timepicker', [])
$scope.panel.index,
$scope.panel.index_interval
).then(function (p) {
$scope.time.index = p;
eventBus.broadcast($scope.$id,$scope.panel.group,'time',compile_time($scope.time))
if(p.length > 0) {
$scope.time.index = p;
eventBus.broadcast($scope.$id,$scope.panel.group,'time',compile_time($scope.time))
} else {
$scope.panel.error = "Could not match index pattern to any ElasticSearch indices"
}
});
} else {
$scope.time.index = [$scope.panel.index];