mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
removed unused default settings, fixed bug where pie would query twice
This commit is contained in:
parent
e61c63b4f1
commit
ffbddb4fae
@ -2,22 +2,9 @@
|
||||
// To add a setting, you MUST define a default.
|
||||
var Settings = function (s) {
|
||||
var _d = {
|
||||
timespan : '1h',
|
||||
refresh : 10000,
|
||||
elasticsearch : 'localhost:9200',
|
||||
perpage : 50,
|
||||
timezone : 'user',
|
||||
timeformat : 'mm/dd HH:MM:ss',
|
||||
timefield : '@timestamp',
|
||||
defaultfields : ['@message'],
|
||||
operator : 'OR',
|
||||
exportdelim : ',',
|
||||
smartindex : true,
|
||||
indexpattern : 'logstash-%Y.%m.%d',
|
||||
indexlimit : 150,
|
||||
indexdefault : 'logstash-*',
|
||||
primaryfield : '_all',
|
||||
modules : []
|
||||
modules : [],
|
||||
}
|
||||
|
||||
// This initializes a new hash on purpose, to avoid adding parameters to
|
||||
@ -29,4 +16,4 @@ var Settings = function (s) {
|
||||
|
||||
return _s;
|
||||
|
||||
};
|
||||
};
|
||||
|
@ -13,7 +13,7 @@ If you need to configure the default dashboard, please see dashboard.js
|
||||
*/
|
||||
var config = new Settings(
|
||||
{
|
||||
elasticsearch: 'http://localhost:9201',
|
||||
elasticsearch: 'http://localhost:9200',
|
||||
timeformat: 'mm/dd HH:MM:ss',
|
||||
modules: ['histogram','map','pie','table','stringquery','sort',
|
||||
'timepicker','text','fields','hits','dashcontrol'],
|
||||
|
@ -22,7 +22,6 @@ angular.module('kibana.pie', [])
|
||||
if($scope.panel.mode !== 'query') {
|
||||
$scope.panel.query.query = query;
|
||||
$scope.panel.query.query = _.isArray(query) ? query[0] : query;
|
||||
$scope.get_data();
|
||||
} else {
|
||||
if(_.isArray(query))
|
||||
$scope.panel.query = _.map(query,function(q) {
|
||||
|
Loading…
Reference in New Issue
Block a user