Commit ffbddb4f by Rashid Khan

removed unused default settings, fixed bug where pie would query twice

parent e61c63b4
...@@ -2,22 +2,9 @@ ...@@ -2,22 +2,9 @@
// To add a setting, you MUST define a default. // To add a setting, you MUST define a default.
var Settings = function (s) { var Settings = function (s) {
var _d = { var _d = {
timespan : '1h',
refresh : 10000,
elasticsearch : 'localhost:9200', elasticsearch : 'localhost:9200',
perpage : 50,
timezone : 'user',
timeformat : 'mm/dd HH:MM:ss', timeformat : 'mm/dd HH:MM:ss',
timefield : '@timestamp', modules : [],
defaultfields : ['@message'],
operator : 'OR',
exportdelim : ',',
smartindex : true,
indexpattern : 'logstash-%Y.%m.%d',
indexlimit : 150,
indexdefault : 'logstash-*',
primaryfield : '_all',
modules : []
} }
// This initializes a new hash on purpose, to avoid adding parameters to // This initializes a new hash on purpose, to avoid adding parameters to
......
...@@ -13,7 +13,7 @@ If you need to configure the default dashboard, please see dashboard.js ...@@ -13,7 +13,7 @@ If you need to configure the default dashboard, please see dashboard.js
*/ */
var config = new Settings( var config = new Settings(
{ {
elasticsearch: 'http://localhost:9201', elasticsearch: 'http://localhost:9200',
timeformat: 'mm/dd HH:MM:ss', timeformat: 'mm/dd HH:MM:ss',
modules: ['histogram','map','pie','table','stringquery','sort', modules: ['histogram','map','pie','table','stringquery','sort',
'timepicker','text','fields','hits','dashcontrol'], 'timepicker','text','fields','hits','dashcontrol'],
......
...@@ -22,7 +22,6 @@ angular.module('kibana.pie', []) ...@@ -22,7 +22,6 @@ angular.module('kibana.pie', [])
if($scope.panel.mode !== 'query') { if($scope.panel.mode !== 'query') {
$scope.panel.query.query = query; $scope.panel.query.query = query;
$scope.panel.query.query = _.isArray(query) ? query[0] : query; $scope.panel.query.query = _.isArray(query) ? query[0] : query;
$scope.get_data();
} else { } else {
if(_.isArray(query)) if(_.isArray(query))
$scope.panel.query = _.map(query,function(q) { $scope.panel.query = _.map(query,function(q) {
......
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