kibana-sinatra 3.0.0.0 → 3.0.1.0

data/lib/kibana/assets/app/services/dashboard.js

@@ -66,6 +66,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
 
     // An elasticJS client to use
     var ejs = ejsResource(config.elasticsearch);
+
     var gist_pattern = /(^\d{5,}$)|(^[a-z0-9]{10,}$)|(gist.github.com(\/*.*)\/[a-z0-9]{5,}\/*$)/;
 
     // Store a reference to this
@@ -186,7 +187,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
       _.defaults(dashboard,_dash);
       _.defaults(dashboard.index,_dash.index);
       _.defaults(dashboard.loader,_dash.loader);
-      return dashboard;
+      return _.cloneDeep(dashboard);
     };
 
     this.dash_load = function(dashboard) {
@@ -351,24 +352,25 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
     };
 
     this.elasticsearch_load = function(type,id) {
-      return $http({
-        url: config.elasticsearch + "/" + config.kibana_index + "/"+type+"/"+id+'?' + new Date().getTime(),
-        method: "GET",
-        transformResponse: function(response) {
-          return renderTemplate(angular.fromJson(response)._source.dashboard, $routeParams);
-        }
-      }).error(function(data, status) {
+      var successcb = function(data) {
+        var response = renderTemplate(angular.fromJson(data)._source.dashboard, $routeParams);
+        self.dash_load(response);
+      };
+      var errorcb = function(data, status) {
         if(status === 0) {
-          alertSrv.set('Error',"Could not contact Elasticsearch at "+config.elasticsearch+
+          alertSrv.set('Error',"Could not contact Elasticsearch at "+ejs.config.server+
             ". Please ensure that Elasticsearch is reachable from your system." ,'error');
         } else {
           alertSrv.set('Error',"Could not find "+id+". If you"+
             " are using a proxy, ensure it is configured correctly",'error');
         }
         return false;
-      }).success(function(data) {
-        self.dash_load(data);
-      });
+      };
+
+      ejs.client.get(
+        "/" + config.kibana_index + "/"+type+"/"+id+'?' + new Date().getTime(),
+        null, successcb, errorcb);
+
     };
 
     this.script_load = function(file) {

data/lib/kibana/assets/app/services/esVersion.js

@@ -8,10 +8,13 @@ function (angular, _, config) {
 
   var module = angular.module('kibana.services');
 
-  module.service('esVersion', function($http, alertSrv, esMinVersion, $q) {
+  module.service('esVersion', function($http, alertSrv, esMinVersion, $q, ejsResource) {
 
     this.versions = [];
 
+    var ejs = ejsResource(config.elasticsearch);
+
+
     // save a reference to this
     var self = this,
       defer = $q.defer();
@@ -25,21 +28,20 @@ function (angular, _, config) {
         defer.resolve(self.versions);
         return defer.promise;
       } else {
-        var nodeInfo = $http({
-          url: config.elasticsearch + '/_nodes',
-          method: "GET",
-        }).error(function(data, status) {
+        var nodeInfo = ejs.client.get('/_nodes',
+          undefined, undefined, function(data, status) {
           if(status === 0) {
-            alertSrv.set('Error',"Could not contact Elasticsearch at "+config.elasticsearch+
+            alertSrv.set('Error',"Could not contact Elasticsearch at "+ejs.client.server()+
               ". Please ensure that Elasticsearch is reachable from your system." ,'error');
           } else {
-            alertSrv.set('Error',"Could not reach "+config.elasticsearch+"/_nodes. If you"+
+            alertSrv.set('Error',"Could not reach "+ejs.client.server()+"/_nodes. If you"+
             " are using a proxy, ensure it is configured correctly",'error');
           }
+          return;
         });
 
         return nodeInfo.then(function(p) {
-          _.each(p.data.nodes, function(v) {
+          _.each(p.nodes, function(v) {
             self.versions.push(v.version.split('-')[0]);
           });
           self.versions = sortVersions(_.uniq(self.versions));
@@ -143,6 +145,10 @@ function (angular, _, config) {
 
     // Determine if a specific version is greater than or equal to another
     this.compare = function (required,installed) {
+      if(!required || !installed) {
+        return undefined;
+      }
+
       var a = installed.split('.');
       var b = required.split('.');
       var i;

data/lib/kibana/assets/app/services/fields.js

@@ -8,11 +8,14 @@ function (angular, _, config) {
 
   var module = angular.module('kibana.services');
 
-  module.service('fields', function(dashboard, $rootScope, $http, esVersion, alertSrv) {
+  module.service('fields', function(dashboard, $rootScope, $http, esVersion, alertSrv, ejsResource) {
 
     // Save a reference to this
     var self = this;
 
+    var ejs = ejsResource(config.elasticsearch);
+
+
     this.list = ['_type'];
     this.indices = [];
 
@@ -45,25 +48,23 @@ function (angular, _, config) {
     };
 
     this.map = function(indices) {
-      var request = $http({
-        url: config.elasticsearch + "/" + indices.join(',') + "/_mapping",
-        method: "GET"
-      }).error(function(data, status) {
-        if(status === 0) {
-          alertSrv.set('Error',"Could not contact Elasticsearch at "+config.elasticsearch+
-            ". Please ensure that Elasticsearch is reachable from your system." ,'error');
-        } else {
-          alertSrv.set('Error',"No index found at "+config.elasticsearch+"/" +
-            indices.join(',')+"/_mapping. Please create at least one index."  +
-            "If you're using a proxy ensure it is configured correctly.",'error');
-        }
-      });
+      var request = ejs.client.get('/' + indices.join(',') + "/_mapping",
+        undefined, undefined, function(data, status) {
+          if(status === 0) {
+            alertSrv.set('Error',"Could not contact Elasticsearch at "+ejs.config.server+
+              ". Please ensure that Elasticsearch is reachable from your system." ,'error');
+          } else {
+            alertSrv.set('Error',"No index found at "+ejs.config.server+"/" +
+              indices.join(',')+"/_mapping. Please create at least one index."  +
+              "If you're using a proxy ensure it is configured correctly.",'error');
+          }
+        });
 
       // Flatten the mapping of each index into dot notated keys.
       return request.then(function(p) {
         var mapping = {};
         return esVersion.gte('1.0.0.RC1').then(function(version) {
-          _.each(p.data, function(indexMap,index) {
+          _.each(p, function(indexMap,index) {
             mapping[index] = {};
             _.each((version ? indexMap.mappings : indexMap), function (typeMap,type) {
               mapping[index][type] = flatten(typeMap);

data/lib/kibana/assets/app/services/filterSrv.js

@@ -29,16 +29,20 @@ define([
       // Populate defaults
       _.defaults(dashboard.current.services.filter,_d);
 
-      // Accessors
-      self.list = dashboard.current.services.filter.list;
-      self.ids = dashboard.current.services.filter.ids;
-
-      _.each(self.list,function(f) {
+      _.each(dashboard.current.services.filter.list,function(f) {
         self.set(f,f.id,true);
       });
 
     };
 
+    this.ids = function() {
+      return dashboard.current.services.filter.ids;
+    };
+
+    this.list = function() {
+      return dashboard.current.services.filter.list;
+    };
+
     // This is used both for adding filters and modifying them.
     // If an id is passed, the filter at that id is updated
     this.set = function(filter,id,noRefresh) {
@@ -50,8 +54,8 @@ define([
       });
 
       if(!_.isUndefined(id)) {
-        if(!_.isUndefined(self.list[id])) {
-          _.extend(self.list[id],filter);
+        if(!_.isUndefined(dashboard.current.services.filter.list[id])) {
+          _.extend(dashboard.current.services.filter.list[id],filter);
           _r = id;
         } else {
           _r = false;
@@ -67,8 +71,8 @@ define([
             mandate: 'must'
           };
           _.defaults(filter,_filter);
-          self.list[_id] = filter;
-          self.ids.push(_id);
+          dashboard.current.services.filter.list[_id] = filter;
+          dashboard.current.services.filter.ids.push(_id);
           _r = _id;
         }
       }
@@ -80,18 +84,20 @@ define([
           dashboard.refresh();
         },0);
       }
-      self.ids = dashboard.current.services.filter.ids =
-        _.intersection(_.map(self.list,function(v,k){return parseInt(k,10);}),self.ids);
+      dashboard.current.services.filter.ids = dashboard.current.services.filter.ids =
+        _.intersection(_.map(dashboard.current.services.filter.list,
+          function(v,k){return parseInt(k,10);}),dashboard.current.services.filter.ids);
       $rootScope.$broadcast('filter');
+
       return _r;
     };
 
     this.remove = function(id,noRefresh) {
       var _r;
-      if(!_.isUndefined(self.list[id])) {
-        delete self.list[id];
+      if(!_.isUndefined(dashboard.current.services.filter.list[id])) {
+        delete dashboard.current.services.filter.list[id];
         // This must happen on the full path also since _.without returns a copy
-        self.ids = dashboard.current.services.filter.ids = _.without(self.ids,id);
+        dashboard.current.services.filter.ids = dashboard.current.services.filter.ids = _.without(dashboard.current.services.filter.ids,id);
         _r = true;
       } else {
         _r = false;
@@ -127,10 +133,10 @@ define([
       var added_a_filter = false;
 
       _.each(ids,function(id) {
-        if(self.list[id].active) {
+        if(dashboard.current.services.filter.list[id].active) {
           added_a_filter = true;
 
-          switch(self.list[id].mandate)
+          switch(dashboard.current.services.filter.list[id].mandate)
           {
           case 'mustNot':
             bool.mustNot(self.getEjsObj(id));
@@ -151,7 +157,7 @@ define([
     };
 
     this.getEjsObj = function(id) {
-      return self.toEjsObj(self.list[id]);
+      return self.toEjsObj(dashboard.current.services.filter.list[id]);
     };
 
     this.toEjsObj = function (filter) {
@@ -163,7 +169,7 @@ define([
       case 'time':
         var _f = ejs.RangeFilter(filter.field).from(kbn.parseDate(filter.from).valueOf());
         if(!_.isUndefined(filter.to)) {
-          _f = _f.to(filter.to.valueOf());
+          _f = _f.to(kbn.parseDate(filter.to).valueOf());
         }
         return _f;
       case 'range':
@@ -186,12 +192,12 @@ define([
     };
 
     this.getByType = function(type,inactive) {
-      return _.pick(self.list,self.idsByType(type,inactive));
+      return _.pick(dashboard.current.services.filter.list,self.idsByType(type,inactive));
     };
 
     this.idsByType = function(type,inactive) {
       var _require = inactive ? {type:type} : {type:type,active:true};
-      return _.pluck(_.where(self.list,_require),'id');
+      return _.pluck(_.where(dashboard.current.services.filter.list,_require),'id');
     };
 
     // TOFIX: Error handling when there is more than one field
@@ -201,7 +207,7 @@ define([
 
     // Parse is used when you need to know about the raw filter
     this.timeRange = function(parse) {
-      var _t = _.last(_.where(self.list,{type:'time',active:true}));
+      var _t = _.last(_.where(dashboard.current.services.filter.list,{type:'time',active:true}));
       if(_.isUndefined(_t)) {
         return false;
       }
@@ -240,4 +246,4 @@ define([
     self.init();
   });
 
-});
+});

data/lib/kibana/assets/app/services/kbnIndex.js

@@ -9,7 +9,7 @@ function (angular, _, config, moment) {
 
   var module = angular.module('kibana.services');
 
-  module.service('kbnIndex', function($http, alertSrv) {
+  module.service('kbnIndex', function($http, alertSrv, ejsResource) {
     // returns a promise containing an array of all indices matching the index
     // pattern that exist in a given range
     this.indices = function(from,to,pattern,interval) {
@@ -28,19 +28,34 @@ function (angular, _, config, moment) {
       });
     };
 
+    var ejs = ejsResource(config.elasticsearch);
+
+
     // returns a promise containing an array of all indices in an elasticsearch
     // cluster
     function resolve_indices(indices) {
       var something;
       indices = _.uniq(_.map(indices,  encodeURIComponent));
-      something = $http({
-        url: config.elasticsearch + "/" + indices.join(",") + "/_aliases?ignore_missing=true",
-        method: "GET"
-      });
+
+      something = ejs.client.get("/" + indices.join(",") + "/_aliases?ignore_missing=true",
+        undefined, undefined, function (data, p) {
+          if (p === 404) {
+            return [];
+          }
+          else if(p === 0) {
+            alertSrv.set('Error',"Could not contact Elasticsearch at "+ejs.config.server+
+              ". Please ensure that Elasticsearch is reachable from your system." ,'error');
+          } else {
+            alertSrv.set('Error',"Could not reach "+ejs.config.server+"/_aliases. If you"+
+              " are using a proxy, ensure it is configured correctly",'error');
+          }
+          return [];
+        });
 
       return something.then(function(p) {
+
         var indices = [];
-        _.each(p.data, function(v,k) {
+        _.each(p, function(v,k) {
           indices.push(k);
           // Also add the aliases. Could be expensive on systems with a lot of them
           _.each(v.aliases, function(v, k) {
@@ -48,19 +63,7 @@ function (angular, _, config, moment) {
           });
         });
         return indices;
-      }, function (p) {
-          if (p.status === 404) {
-            return [];
-          }
-          else if(p.status === 0) {
-            alertSrv.set('Error',"Could not contact Elasticsearch at "+config.elasticsearch+
-              ". Please ensure that Elasticsearch is reachable from your system." ,'error');
-          } else {
-            alertSrv.set('Error',"Could not reach "+config.elasticsearch+"/_aliases. If you"+
-              " are using a proxy, ensure it is configured correctly",'error');
-          }
-          return [];
-        });
+      });
     }
 
     /*
@@ -109,4 +112,4 @@ function (angular, _, config, moment) {
     }
   });
 
-});
+});

data/lib/kibana/assets/app/services/querySrv.js

@@ -135,19 +135,27 @@ function (angular, _, config, kbn) {
       });
     });
 
+
+    this.list = function () {
+      return dashboard.current.services.query.list;
+    };
+
+    this.ids = function () {
+      return dashboard.current.services.query.ids;
+    };
+
     this.init = function() {
-      self.list = dashboard.current.services.query.list;
-      self.ids = dashboard.current.services.query.ids;
 
-      self.ids = dashboard.current.services.query.ids =
-        _.intersection(_.map(self.list,function(v,k){return parseInt(k,10);}),self.ids);
+      dashboard.current.services.query.ids =
+        _.intersection(_.map(dashboard.current.services.query.list,
+          function(v,k){return parseInt(k,10);}),self.ids());
 
       // Check each query object, populate its defaults
-      _.each(self.list,function(query) {
+      _.each(dashboard.current.services.query.list,function(query) {
         query = self.defaults(query);
       });
 
-      if (self.ids.length === 0) {
+      if (dashboard.current.services.query.ids.length === 0) {
         self.set({});
       }
     };
@@ -156,8 +164,8 @@ function (angular, _, config, kbn) {
     // the query at that id is updated
     this.set = function(query,id) {
       if(!_.isUndefined(id)) {
-        if(!_.isUndefined(self.list[id])) {
-          _.extend(self.list[id],query);
+        if(!_.isUndefined(dashboard.current.services.query.list[id])) {
+          _.extend(dashboard.current.services.query.list[id],query);
           return id;
         } else {
           return false;
@@ -168,8 +176,8 @@ function (angular, _, config, kbn) {
         query.color = query.color || colorAt(query.id);
         // Then it can get defaults
         query = self.defaults(query);
-        self.list[query.id] = query;
-        self.ids.push(query.id);
+        dashboard.current.services.query.list[query.id] = query;
+        dashboard.current.services.query.ids.push(query.id);
         return query.id;
       }
     };
@@ -182,10 +190,10 @@ function (angular, _, config, kbn) {
     };
 
     this.remove = function(id) {
-      if(!_.isUndefined(self.list[id])) {
-        delete self.list[id];
+      if(!_.isUndefined(dashboard.current.services.query.list[id])) {
+        delete dashboard.current.services.query.list[id];
         // This must happen on the full path also since _.without returns a copy
-        self.ids = dashboard.current.services.query.ids = _.without(self.ids,id);
+        dashboard.current.services.query.ids = _.without(dashboard.current.services.query.ids,id);
         return true;
       } else {
         return false;
@@ -222,15 +230,15 @@ function (angular, _, config, kbn) {
       switch(config.mode)
       {
       case 'all':
-        return _.pluck(_.where(self.list,{enable:true}),'id');
+        return _.pluck(_.where(dashboard.current.services.query.list,{enable:true}),'id');
       case 'pinned':
-        return _.pluck(_.where(self.list,{pin:true,enable:true}),'id');
+        return _.pluck(_.where(dashboard.current.services.query.list,{pin:true,enable:true}),'id');
       case 'unpinned':
-        return _.pluck(_.where(self.list,{pin:false,enable:true}),'id');
+        return _.pluck(_.where(dashboard.current.services.query.list,{pin:false,enable:true}),'id');
       case 'selected':
-        return _.intersection(_.pluck(_.where(self.list,{enable:true}),'id'),config.ids);
+        return _.intersection(_.pluck(_.where(dashboard.current.services.query.list,{enable:true}),'id'),config.ids);
       default:
-        return _.pluck(_.where(self.list,{enable:true}),'id');
+        return _.pluck(_.where(dashboard.current.services.query.list,{enable:true}),'id');
       }
     };
 
@@ -238,8 +246,9 @@ function (angular, _, config, kbn) {
     this.resolve = function() {
       // Find ids of all abstract queries
       // Get a list of resolvable ids, constrast with total list to get abstract ones
-      return $q.all(_.map(self.ids,function(q) {
-        return self.queryTypes[self.list[q].type].resolve(_.clone(self.list[q])).then(function(data){
+      return $q.all(_.map(dashboard.current.services.query.ids,function(q) {
+        return self.queryTypes[dashboard.current.services.query.list[q].type].resolve(
+          _.clone(dashboard.current.services.query.list[q])).then(function(data){
           return data;
         });
       })).then(function(data) {