kibana-sinatra 0.0.7 → 0.0.8

data/lib/kibana/assets/app/partials/dasheditor.html

@@ -39,7 +39,8 @@
               default logstash index pattern you might use
               <code>[logstash-]YYYY.MM.DD</code>. The [] in "[logstash-]" are
               important as they instruct Kibana not to treat those letters as a
-              pattern.
+              pattern. You may also specify multiple indices by seperating them with a comma(,).
+              For example <code>[web-]YYYY.MM.DD,[mail-]YYYY.MM.DD</code>
               Please also note that indices should rollover at midnight <strong>UTC</strong>.
             </p>
             <p class="small">
@@ -79,7 +80,7 @@
     <div class="row-fluid">
       <div class="span8">
         <h4>Rows</h4>
-        <table class="table table-condensed table-bordered">
+        <table class="table table-striped">
           <thead>
             <th width="1%"></th>
             <th width="1%"></th>
@@ -90,7 +91,7 @@
             <td><i ng-click="_.move(dashboard.current.rows,$index,$index-1)" ng-hide="$first" class="pointer icon-arrow-up"></i></td>
             <td><i ng-click="_.move(dashboard.current.rows,$index,$index+1)" ng-hide="$last" class="pointer icon-arrow-down"></i></td>
             <td><i ng-click="dashboard.current.rows = _.without(dashboard.current.rows,row)" class="pointer icon-remove"></i></td>
-            <td>{{row.title}}</td>
+            <td>{{row.title||'Untitled'}}</td>
           </tr>
         </table>
       </div>
@@ -177,6 +178,7 @@
 </div>
 
 <div class="modal-footer">
-  <button ng-click="add_row(dashboard.current,row); reset_row();" class="btn btn-success" ng-show="editor.index == 2">Create Row</button>
-  <button type="button" class="btn btn-danger" ng-click="editor.index=0;dismiss();reset_panel();dashboard.refresh()">Close</button>
+  <button type="button" ng-click="add_row(dashboard.current,row); reset_row();" class="btn btn-info" ng-show="editor.index == 2">Create Row</button>
+  <button type="button" class="btn btn-success" ng-click="editor.index=0;editSave(dashboard);dismiss();reset_panel();dashboard.refresh()">Save</button>
+  <button type="button" class="btn btn-danger" ng-click="editor.index=0;dismiss();reset_panel();dashboard.refresh()">Cancel</button>
 </div>

data/lib/kibana/assets/app/partials/paneleditor.html

@@ -19,5 +19,6 @@
 
 <div class="modal-footer">
   <!-- close_edit() is provided here to allow for a scope to perform action on dismiss -->
-  <button type="button" class="btn btn-danger" ng-click="editor.index=0;close_edit();dismiss()">Close</button>
+  <button type="button" class="btn btn-success" ng-click="editor.index=0;editSave(panel);close_edit();dismiss()">Save</button>
+  <button type="button" class="btn btn-danger" ng-click="editor.index=0;dismiss()">Cancel</button>
 </div>

data/lib/kibana/assets/app/partials/panelgeneral.html

@@ -9,7 +9,7 @@
         <label class="small">Title</label><input type="text" class="input-medium" ng-model='panel.title'></input>
       </div>
       <div class="editor-option" ng-hide="panel.sizeable == false">
-        <label class="small">Span</label> <select class="input-mini" ng-model="panel.span" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10,11,12]"></select>
+        <label class="small">Span</label> <select class="input-mini" ng-model="panel.span" ng-options="f for f in [1,2,3,4,5,6,7,8,9,10,11,12]"></select>
       </div>
       <div class="editor-option">
         <label class="small">Editable</label><input type="checkbox" ng-model="panel.editable" ng-checked="panel.editable">

data/lib/kibana/assets/app/partials/roweditor.html

@@ -6,23 +6,23 @@
     </div>
   </div>
 
-  <div class="row-fluid" ng-if="editor.index == 0">
-    <div class="span4">
+  <div class="editor-row" ng-if="editor.index == 0">
+    <div class="editor-option">
       <label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'></input>
     </div>
-    <div class="span2">
+    <div class="editor-option">
       <label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'></input>
     </div>
-    <div class="span1">
+    <div class="editor-option">
       <label class="small"> Editable </label><input type="checkbox" ng-model="row.editable" ng-checked="row.editable" />
     </div>
-    <div class="span1">
+    <div class="editor-option">
       <label class="small"> Collapsable </label><input type="checkbox" ng-model="row.collapsable" ng-checked="row.collapsable" />
     </div>
   </div>
   <div class="row-fluid" ng-if="editor.index == 1">
     <div class="span12">
-      <h4>Panels <i class="icon-plus-sign link" bs-tooltip="'Add panel'" ng-click="editor.index = 2"></i></h4>
+      <h4>Panels</h4>
       <table class="table table-condensed table-striped">
         <thead>
           <th>Title</th>
@@ -36,7 +36,7 @@
         <tr ng-repeat="panel in row.panels">
           <td>{{panel.title}}</td>
           <td>{{panel.type}}</td>
-          <td><select ng-hide="panel.sizeable == false" class="input-mini" ng-model="panel.span" ng-options="size for size in [0,1,2,3,4,5,6,7,8,9,10,11,12]"></select></td>
+          <td><select ng-hide="panel.sizeable == false" class="input-mini" ng-model="panel.span" ng-options="size for size in [1,2,3,4,5,6,7,8,9,10,11,12]"></select></td>
           <td><i ng-click="row.panels = _.without(row.panels,panel)" class="pointer icon-remove"></i></td>
           <td><i ng-click="_.move(row.panels,$index,$index-1)" ng-hide="$first" class="pointer icon-arrow-up"></i></td>
           <td><i ng-click="_.move(row.panels,$index,$index+1)" ng-hide="$last" class="pointer icon-arrow-down"></i></td>
@@ -60,6 +60,8 @@
   </div>
 </div>
 <div class="modal-footer">
-  <button ng-show="panel.type &amp;&amp; editor.index == 2" ng-click="add_panel(row,panel); reset_panel(); editor.index == 1;" class="btn btn-success" ng-disabled="panel.loadingEditor">Add Panel</button>
-  <button type="button" class="btn btn-danger" ng-click="editor.index=0;dismiss();reset_panel();close_edit()">Close</button>
+  <button ng-show="editor.index == 1" ng-click="editor.index = 2;" class="btn btn-info" ng-disabled="panel.loadingEditor">Add Panel</button>
+  <button ng-show="panel.type && editor.index == 2" ng-click="editSave(row);add_panel(row,panel);reset_panel();editor.index = 0;dismiss();" class="btn btn-success" ng-disabled="panel.loadingEditor">Save</button>
+  <button ng-hide="panel.type && editor.index == 2" ng-click="editor.index=0;editSave(row);dismiss();reset_panel();close_edit()" class="btn btn-success">Save</button>
+  <button type="button" class="btn btn-danger" ng-click="editor.index=0;dismiss();reset_panel();close_edit()">Cancel</button>
 </div>

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

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
   'use strict';

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

@@ -2,11 +2,12 @@ define([
   'angular',
   'jquery',
   'kbn',
-  'underscore',
+  'lodash',
   'config',
   'moment',
   'modernizr',
-  'filesaver'
+  'filesaver',
+  'blob'
 ],
 function (angular, $, kbn, _, config, moment, Modernizr) {
   'use strict';
@@ -15,7 +16,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
 
   module.service('dashboard', function(
     $routeParams, $http, $rootScope, $injector, $location, $timeout,
-    ejsResource, timer, kbnIndex, alertSrv
+    ejsResource, timer, kbnIndex, alertSrv, esVersion, esMinVersion
   ) {
     // A hash of defaults to use when loading a dashboard
 
@@ -79,7 +80,14 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
       // Clear the current dashboard to prevent reloading
       self.current = {};
       self.indices = [];
-      route();
+      esVersion.isMinimum().then(function(isMinimum) {
+        if(isMinimum) {
+          route();
+        } else {
+          alertSrv.set('Upgrade Required',"Your version of Elasticsearch is too old. Kibana requires" +
+            " Elasticsearch " + esMinVersion + " or above.", "error");
+        }
+      });
     });
 
     var route = function() {
@@ -114,7 +122,6 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
         // as their default
         if (Modernizr.localstorage) {
           if(!(_.isUndefined(window.localStorage['dashboard'])) && window.localStorage['dashboard'] !== '') {
-            console.log(window.localStorage['dashboard']);
             $location.path(config.default_route);
             alertSrv.set('Saving to browser storage has been replaced',' with saving to Elasticsearch.'+
               ' Click <a href="#/dashboard/local/deprecated">here</a> to load your old dashboard anyway.');
@@ -247,7 +254,6 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
     };
 
     this.set_default = function(route) {
-      console.log(route);
       if (Modernizr.localstorage) {
         // Purge any old dashboards
         if(!_.isUndefined(window.localStorage['dashboard'])) {
@@ -490,18 +496,25 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
       });
     };
 
+    this.start_scheduled_refresh = function (after_ms) {
+      timer.cancel(self.refresh_timer);
+      self.refresh_timer = timer.register($timeout(function () {
+        self.start_scheduled_refresh(after_ms);
+        self.refresh();
+      }, after_ms));
+    };
+
+    this.cancel_scheduled_refresh = function () {
+      timer.cancel(self.refresh_timer);
+    };
+
     this.set_interval = function (interval) {
       self.current.refresh = interval;
-      if(interval) {
+      if (interval) {
         var _i = kbn.interval_to_ms(interval);
-        timer.cancel(self.refresh_timer);
-        self.refresh_timer = timer.register($timeout(function() {
-          self.set_interval(interval);
-          self.refresh();
-        },_i));
-        self.refresh();
+        this.start_scheduled_refresh(_i);
       } else {
-        timer.cancel(self.refresh_timer);
+        this.cancel_scheduled_refresh();
       }
     };
 

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

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config'
 ],
 function (angular, _, config) {
@@ -8,47 +8,55 @@ function (angular, _, config) {
 
   var module = angular.module('kibana.services');
 
-  module.service('esVersion', function($http, alertSrv) {
+  module.service('esVersion', function($http, alertSrv, esMinVersion, $q) {
 
     this.versions = [];
 
     // save a reference to this
-    var self = this;
+    var self = this,
+      defer = $q.defer();
 
     this.init = function() {
       getVersions();
     };
 
     var getVersions = function() {
-      var nodeInfo = $http({
-        url: config.elasticsearch + '/_nodes',
-        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',"Could not reach "+config.elasticsearch+"/_nodes. If you"+
-          " are using a proxy, ensure it is configured correctly",'error');
-        }
-      });
+      if(self.versions.length !== 0) {
+        defer.resolve(self.versions);
+        return defer.promise;
+      } else {
+        var nodeInfo = $http({
+          url: config.elasticsearch + '/_nodes',
+          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',"Could not reach "+config.elasticsearch+"/_nodes. If you"+
+            " are using a proxy, ensure it is configured correctly",'error');
+          }
+        });
 
-      return nodeInfo.then(function(p) {
-        _.each(p.data.nodes, function(v) {
-          self.versions.push(v.version.split('-')[0]);
+        return nodeInfo.then(function(p) {
+          _.each(p.data.nodes, function(v) {
+            self.versions.push(v.version.split('-')[0]);
+          });
+          self.versions = sortVersions(_.uniq(self.versions));
+          return self.versions;
         });
-        self.versions = sortVersions(_.uniq(self.versions));
-      });
+      }
+
     };
 
     // Get the max version in this cluster
-    this.max = function() {
-      return _.last(self.versions);
+    this.max = function(versions) {
+      return _.last(versions);
     };
 
     // Return the lowest version in the cluster
-    this.min = function() {
-      return _.first(self.versions);
+    this.min = function(versions) {
+      return _.first(versions);
     };
 
     // Sort versions from lowest to highest
@@ -90,29 +98,47 @@ function (angular, _, config) {
       return _cf;
     };
 
+    this.isMinimum = function() {
+      return self.gte(esMinVersion);
+    };
+
     // check if lowest version in cluster = `version`
     this.eq = function(version) {
-      return version === self.min() ? true : false;
+      return getVersions().then(function(v) {
+        return version === self.min(v) ? true : false;
+      });
+
     };
 
     // version > lowest version in cluster?
     this.gt = function(version) {
-      return version === self.min() ? false : self.gte(version);
+      return getVersions().then(function(v) {
+        return version === self.min(v) ? false : self.gte(version);
+      });
+
     };
 
     // version < highest version in cluster?
     this.lt = function(version) {
-      return version === self.max() ? false : self.lte(version);
+      return getVersions().then(function(v) {
+        return version === self.max(v) ? false : self.lte(version);
+      });
+
     };
 
     // Check if the lowest version in the cluster is >= to `version`
     this.gte = function(version) {
-      return self.compare(version,self.min());
+      return getVersions().then(function(v) {
+        return self.compare(version,self.min(v));
+      });
+
     };
 
     // Check if the highest version in the cluster is <= to `version`
     this.lte = function(version) {
-      return self.compare(self.max(),version);
+      return getVersions().then(function(v) {
+        return self.compare(self.max(v),version);
+      });
     };
 
     // Determine if a specific version is greater than or equal to another
@@ -121,10 +147,11 @@ function (angular, _, config) {
       var b = required.split('.');
       var i;
 
-      for (i = 0; i < a.length; ++i) {
+      // leave suffixes as is ("RC1 or -SNAPSHOT")
+      for (i = 0; i < Math.min(a.length, 3); ++i) {
         a[i] = Number(a[i]);
       }
-      for (i = 0; i < b.length; ++i) {
+      for (i = 0; i < Math.min(b.length, 3); ++i) {
         b[i] = Number(b[i]);
       }
       if (a.length === 2) {
@@ -140,6 +167,18 @@ function (angular, _, config) {
       if (a[2] > b[2]){return true;}
       if (a[2] < b[2]){return false;}
 
+      if (a.length > 3) {
+        // rc/beta suffix
+        if (b.length <= 3) {
+          return false;
+        } // no suffix on b -> a<b
+        return a[3] >= b[3];
+      }
+      if (b.length > 3) {
+        // b has a suffix but a not -> a>b
+        return true;
+      }
+
       return true;
     };
 

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

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config'
 ],
 function (angular, _, config) {
@@ -8,7 +8,8 @@ function (angular, _, config) {
 
   var module = angular.module('kibana.services');
 
-  module.service('fields', function(dashboard, $rootScope, $http, alertSrv) {
+  module.service('fields', function(dashboard, $rootScope, $http, esVersion, alertSrv) {
+
     // Save a reference to this
     var self = this;
 
@@ -36,7 +37,8 @@ function (angular, _, config) {
       var fields = [];
       _.each(m, function(types) {
         _.each(types, function(type) {
-          fields = _.without(_.union(fields,_.keys(type)),'_all','_source');
+          fields = _.difference(_.union(fields,_.keys(type)),
+            ['_parent','_routing','_size','_ttl','_all','_uid','_version','_boost','_source']);
         });
       });
       return fields;
@@ -44,7 +46,7 @@ function (angular, _, config) {
 
     this.map = function(indices) {
       var request = $http({
-        url: config.elasticsearch + "/" + indices.join(',') + "/_mapping",
+        url: config.elasticsearch + "/" + indices.join(',') + "/_mapping/field/*",
         method: "GET"
       }).error(function(data, status) {
         if(status === 0) {
@@ -52,7 +54,7 @@ function (angular, _, config) {
             ". 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."  +
+            indices.join(',')+"/_mapping/field/*. Please create at least one index."  +
             "If you're using a proxy ensure it is configured correctly.",'error');
         }
       });
@@ -60,43 +62,18 @@ function (angular, _, config) {
       // Flatten the mapping of each index into dot notated keys.
       return request.then(function(p) {
         var mapping = {};
-        _.each(p.data, function(type,index) {
-          mapping[index] = {};
-          _.each(type, function (fields,typename) {
-            mapping[index][typename] = flatten(fields);
+        return esVersion.gte('1.0.0.RC1').then(function(version) {
+          _.each(p.data, function(indexMap,index) {
+            mapping[index] = {};
+            _.each((version ? indexMap.mappings : indexMap), function (typeMap,type) {
+              mapping[index][type] = typeMap;
+            });
           });
+          return mapping;
         });
-        return mapping;
       });
     };
 
-    var flatten = function(obj,prefix) {
-      var propName = (prefix) ? prefix :  '',
-        dot = (prefix) ? '.':'',
-        ret = {};
-      for(var attr in obj){
-        if(attr === 'dynamic_templates' || attr === '_default_') {
-          continue;
-        }
-        // For now only support multi field on the top level
-        // and if there is a default field set.
-        if(obj[attr]['type'] === 'multi_field') {
-          ret[attr] = obj[attr]['fields'][attr] || obj[attr];
-          var keys = _.without(_.keys(obj[attr]['fields']),attr);
-          for(var key in keys) {
-            ret[attr+'.'+keys[key]] = obj[attr]['fields'][keys[key]];
-          }
-        } else if (attr === 'properties') {
-          _.extend(ret,flatten(obj[attr], propName));
-        } else if(typeof obj[attr] === 'object'){
-          _.extend(ret,flatten(obj[attr], propName + dot + attr));
-        } else {
-          ret[propName] = obj;
-        }
-      }
-      return ret;
-    };
-
   });
 
 });