Commit e2fc334b by Rashid Khan

moved default dashboard, turned spy on by default, added file loader

parent 2cf20f8c
...@@ -23,7 +23,6 @@ angular.module('kibana.dashcontrol', []) ...@@ -23,7 +23,6 @@ angular.module('kibana.dashcontrol', [])
} }
_.defaults($scope.panel,_d); _.defaults($scope.panel,_d);
$scope.init = function() {
// A hash of defaults for the dashboard object // A hash of defaults for the dashboard object
var _dash = { var _dash = {
title: "", title: "",
...@@ -31,6 +30,7 @@ angular.module('kibana.dashcontrol', []) ...@@ -31,6 +30,7 @@ angular.module('kibana.dashcontrol', [])
rows: [], rows: [],
} }
$scope.init = function() {
// Long ugly if statement for figuring out which dashboard to load on init // Long ugly if statement for figuring out which dashboard to load on init
// If there is no dashboard defined, find one // If there is no dashboard defined, find one
if(_.isUndefined($scope.dashboards)) { if(_.isUndefined($scope.dashboards)) {
...@@ -43,6 +43,8 @@ angular.module('kibana.dashcontrol', []) ...@@ -43,6 +43,8 @@ angular.module('kibana.dashcontrol', [])
$scope.elasticsearch_load('dashboard',_id) $scope.elasticsearch_load('dashboard',_id)
if(_type === 'temp') if(_type === 'temp')
$scope.elasticsearch_load('temp',_id) $scope.elasticsearch_load('temp',_id)
if(_type === 'file')
$scope.file_load(_id)
// No dashboard in the URL // No dashboard in the URL
} else { } else {
...@@ -56,16 +58,7 @@ angular.module('kibana.dashcontrol', []) ...@@ -56,16 +58,7 @@ angular.module('kibana.dashcontrol', [])
$scope.dash_load(JSON.stringify(dashboard)) $scope.dash_load(JSON.stringify(dashboard))
// No? Ok, grab default.json, its all we have now // No? Ok, grab default.json, its all we have now
} else { } else {
$http({ $scope.file_load('default')
url: "default.json",
method: "GET",
}).success(function(data, status, headers, config) {
var dashboard = data
_.defaults(dashboard,_dash);
$scope.dash_load(JSON.stringify(dashboard))
}).error(function(data, status, headers, config) {
$scope.alert('Default dashboard missing!','Could not locate default.json','error')
});
} }
} }
...@@ -117,6 +110,19 @@ angular.module('kibana.dashcontrol', []) ...@@ -117,6 +110,19 @@ angular.module('kibana.dashcontrol', [])
} }
} }
$scope.file_load = function(file) {
$http({
url: "dashboards/default",
method: "GET",
}).success(function(data, status, headers, config) {
var dashboard = data
_.defaults(dashboard,_dash);
$scope.dash_load(JSON.stringify(dashboard))
}).error(function(data, status, headers, config) {
$scope.alert('Default dashboard missing!','Could not locate dashboards/'+file,'error')
});
}
$scope.elasticsearch_save = function(type) { $scope.elasticsearch_save = function(type) {
// Clone object so we can modify it without influencing the existing obejct // Clone object so we can modify it without influencing the existing obejct
if($scope.panel.hide_control) { if($scope.panel.hide_control) {
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<form> <form>
<ul class="nav nav-list"> <ul class="nav nav-list">
<li><a ng-show="panel.save.local" ng-click="export()"><i class="icon-download"></i> Export to File</a></li> <li><a ng-show="panel.save.local" ng-click="export()"><i class="icon-download"></i> Export to File</a></li>
<li><a ng-show="panel.save.default" ng-click="default()"><i class="icon-bookmark"></i> Set as Default</a></li> <li><a ng-show="panel.save.default" ng-click="default()"><i class="icon-bookmark"></i> Set as My Default</a></li>
<li><a ng-show="panel.save.default" ng-click="purge()"><i class="icon-ban-circle"></i> Clear Default</a></li> <li><a ng-show="panel.save.default" ng-click="purge()"><i class="icon-ban-circle"></i> Clear My Default</a></li>
</ul> </ul>
</form> </form>
</div> </div>
......
...@@ -8,6 +8,7 @@ angular.module('kibana.histogram', []) ...@@ -8,6 +8,7 @@ angular.module('kibana.histogram', [])
show : ['bars','y-axis','x-axis','legend'], show : ['bars','y-axis','x-axis','legend'],
fill : 3, fill : 3,
timezone: 'browser', // browser, utc or a standard timezone timezone: 'browser', // browser, utc or a standard timezone
spyable : true,
group : "default", group : "default",
} }
_.defaults($scope.panel,_d) _.defaults($scope.panel,_d)
......
...@@ -8,6 +8,7 @@ angular.module('kibana.map', []) ...@@ -8,6 +8,7 @@ angular.module('kibana.map', [])
colors : ['#C8EEFF', '#0071A4'], colors : ['#C8EEFF', '#0071A4'],
size : 100, size : 100,
exclude : [], exclude : [],
spyable : true,
group : "default", group : "default",
} }
_.defaults($scope.panel,_d) _.defaults($scope.panel,_d)
......
...@@ -10,6 +10,7 @@ angular.module('kibana.table', []) ...@@ -10,6 +10,7 @@ angular.module('kibana.table', [])
group : "default", group : "default",
style : {}, style : {},
fields : [], fields : [],
spyable: true,
} }
_.defaults($scope.panel,_d) _.defaults($scope.panel,_d)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment