mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
moved default dashboard, turned spy on by default, added file loader
This commit is contained in:
parent
2cf20f8c30
commit
e2fc334b78
@ -23,14 +23,14 @@ angular.module('kibana.dashcontrol', [])
|
||||
}
|
||||
_.defaults($scope.panel,_d);
|
||||
|
||||
$scope.init = function() {
|
||||
// A hash of defaults for the dashboard object
|
||||
var _dash = {
|
||||
title: "",
|
||||
editable: true,
|
||||
rows: [],
|
||||
}
|
||||
// A hash of defaults for the dashboard object
|
||||
var _dash = {
|
||||
title: "",
|
||||
editable: true,
|
||||
rows: [],
|
||||
}
|
||||
|
||||
$scope.init = function() {
|
||||
// Long ugly if statement for figuring out which dashboard to load on init
|
||||
// If there is no dashboard defined, find one
|
||||
if(_.isUndefined($scope.dashboards)) {
|
||||
@ -43,7 +43,9 @@ angular.module('kibana.dashcontrol', [])
|
||||
$scope.elasticsearch_load('dashboard',_id)
|
||||
if(_type === 'temp')
|
||||
$scope.elasticsearch_load('temp',_id)
|
||||
|
||||
if(_type === 'file')
|
||||
$scope.file_load(_id)
|
||||
|
||||
// No dashboard in the URL
|
||||
} else {
|
||||
// Check if browser supports localstorage, and if there's a dashboard
|
||||
@ -56,16 +58,7 @@ angular.module('kibana.dashcontrol', [])
|
||||
$scope.dash_load(JSON.stringify(dashboard))
|
||||
// No? Ok, grab default.json, its all we have now
|
||||
} else {
|
||||
$http({
|
||||
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')
|
||||
});
|
||||
$scope.file_load('default')
|
||||
}
|
||||
|
||||
}
|
||||
@ -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) {
|
||||
// Clone object so we can modify it without influencing the existing obejct
|
||||
if($scope.panel.hide_control) {
|
||||
|
@ -7,8 +7,8 @@
|
||||
<form>
|
||||
<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.default" ng-click="default()"><i class="icon-bookmark"></i> Set as 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="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 My Default</a></li>
|
||||
</ul>
|
||||
</form>
|
||||
</div>
|
||||
|
@ -8,6 +8,7 @@ angular.module('kibana.histogram', [])
|
||||
show : ['bars','y-axis','x-axis','legend'],
|
||||
fill : 3,
|
||||
timezone: 'browser', // browser, utc or a standard timezone
|
||||
spyable : true,
|
||||
group : "default",
|
||||
}
|
||||
_.defaults($scope.panel,_d)
|
||||
|
@ -8,6 +8,7 @@ angular.module('kibana.map', [])
|
||||
colors : ['#C8EEFF', '#0071A4'],
|
||||
size : 100,
|
||||
exclude : [],
|
||||
spyable : true,
|
||||
group : "default",
|
||||
}
|
||||
_.defaults($scope.panel,_d)
|
||||
|
@ -10,6 +10,7 @@ angular.module('kibana.table', [])
|
||||
group : "default",
|
||||
style : {},
|
||||
fields : [],
|
||||
spyable: true,
|
||||
}
|
||||
_.defaults($scope.panel,_d)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user