From ffbddb4fae72f413676368830088750635a46b07 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Tue, 26 Feb 2013 15:46:31 -0700 Subject: [PATCH] removed unused default settings, fixed bug where pie would query twice --- common/lib/settings.js | 17 ++--------------- config.js | 2 +- panels/pie/module.js | 1 - 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/common/lib/settings.js b/common/lib/settings.js index 7446b6ea3bc..c0ff175c880 100644 --- a/common/lib/settings.js +++ b/common/lib/settings.js @@ -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; -}; \ No newline at end of file +}; diff --git a/config.js b/config.js index b3a361b37e0..6f2508fcd85 100644 --- a/config.js +++ b/config.js @@ -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'], diff --git a/panels/pie/module.js b/panels/pie/module.js index 7d634eee439..df27196cad7 100644 --- a/panels/pie/module.js +++ b/panels/pie/module.js @@ -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) {