kibana-sinatra 0.0.3 → 0.0.4

data/lib/kibana/assets/app/panels/terms/module.js

@@ -36,7 +36,7 @@ function (angular, app, _, $, kbn) {
       editorTabs : [
         {title:'Queries', src:'app/partials/querySelect.html'}
       ],
-      status  : "Beta",
+      status  : "Stable",
       description : "Displays the results of an elasticsearch facet as a pie chart, bar chart, or a "+
         "table"
     };
@@ -83,17 +83,21 @@ function (angular, app, _, $, kbn) {
       $scope.panelMeta.loading = true;
       var request,
         results,
-        boolQuery;
+        boolQuery,
+        queries;
 
       request = $scope.ejs.Request().indices(dashboard.indices);
 
       $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
+      queries = querySrv.getQueryObjs($scope.panel.queries.ids);
+
       // This could probably be changed to a BoolFilter
       boolQuery = $scope.ejs.BoolQuery();
-      _.each($scope.panel.queries.ids,function(id) {
-        boolQuery = boolQuery.should(querySrv.getEjsObj(id));
+      _.each(queries,function(q) {
+        boolQuery = boolQuery.should(querySrv.toEjsObj(q));
       });
 
+
       // Terms mode
       request = request
         .facet($scope.ejs.TermsFacet('terms')

data/lib/kibana/assets/app/panels/timepicker/module.html

@@ -13,9 +13,9 @@
         $scope.input isn't available on the controller unless the form element is in this file -->
   <form name="input" style="margin:3px 0 0 0">
     <ul class="nav nav-pills timepicker-dropdown">
-      <li class="dropdown" bs-tooltip="(time.from.date | date:'yyyy-MM-dd HH:mm:ss.sss') + ' to ' +(time.to.date | date:'yyyy-MM-dd HH:mm:ss.sss')" data-placement="bottom" ng-click="dismiss();">
+      <li class="dropdown">
 
-        <a class="dropdown-toggle timepicker-dropdown" data-toggle="dropdown" href="#">
+        <a class="dropdown-toggle timepicker-dropdown" data-toggle="dropdown" href="" bs-tooltip="(time.from.date | date:'yyyy-MM-dd HH:mm:ss.sss') + ' <br>to<br>' +(time.to.date | date:'yyyy-MM-dd HH:mm:ss.sss')" data-placement="bottom" ng-click="dismiss();">
 
           <span ng-show="filterSrv.idsByType('time').length">
             <span class="pointer" ng-hide="panel.now">{{time.from.date | date:'MMM d, y HH:mm:ss'}}</span>
@@ -47,6 +47,9 @@
         </ul>
 
       </li>
+      <li ng-show="!dashboard.current.refresh">
+        <a class="icon-refresh" ng-click="dashboard.refresh()"></a>
+      </li>
     </ul>
 
   </form>

data/lib/kibana/assets/app/panels/trends/module.html

@@ -1,11 +1,17 @@
 <div ng-controller='trends' ng-init="init()">
 
-  <div ng-style="panel.style" style="line-height:{{panel.style['font-size']}};display:inline-block;padding-right: 5px;" ng-repeat="query in trends">
+  <style>
+    div.trends-horizontal {
+      display:inline-block;
+      padding-right: 5px;
+    }
+  </style>
+
+  <div ng-class="{'trends-horizontal':panel.arrangement == 'horizontal'}" ng-style="panel.style" style="line-height:{{panel.style['font-size']}};" ng-repeat="query in trends">
     <i class="icon-circle" style="color:{{query.info.color}}"></i>
     <span bs-tooltip="'Then: '+query.hits.old+', Now: '+query.hits.new"  ng-class="{'text-success': query.hits.new >= query.hits.old, 'text-error': query.hits.old > query.hits.new}" class='pointer strong'>
       <i class='large' ng-class="{'icon-caret-up': query.hits.new >= query.hits.old, 'icon-caret-down': query.hits.old > query.hits.new}"></i> {{query.percent}}%
     </span>
     <span class="tiny light" ng-show="query.info.alias != ''">({{query.info.alias}})</span>
-    <br ng-show="panel.arrangement == 'vertical'">
   </div>
 </div>

data/lib/kibana/assets/app/panels/trends/module.js

@@ -73,8 +73,6 @@ function (angular, app, _, kbn) {
         $scope.index = segment > 0 ? $scope.index : dashboard.indices;
       }
 
-      $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
-
       // Determine a time field
       var timeField = _.uniq(_.pluck(filterSrv.getByType('time'),'field'));
       if(timeField.length > 1) {
@@ -98,11 +96,13 @@ function (angular, app, _, kbn) {
       var request = $scope.ejs.Request();
       var _ids_without_time = _.difference(filterSrv.ids,filterSrv.idsByType('time'));
 
+      $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
+      var queries = querySrv.getQueryObjs($scope.panel.queries.ids);
 
       // Build the question part of the query
-      _.each($scope.panel.queries.ids, function(id) {
+      _.each(queries, function(query) {
         var q = $scope.ejs.FilteredQuery(
-          querySrv.getEjsObj(id),
+          querySrv.toEjsObj(query),
           filterSrv.getBoolFilter(_ids_without_time).must(
             $scope.ejs.RangeFilter(timeField)
             .from($scope.time.from)
@@ -110,23 +110,23 @@ function (angular, app, _, kbn) {
           ));
 
         request = request
-          .facet($scope.ejs.QueryFacet(id)
+          .facet($scope.ejs.QueryFacet(query.id)
             .query(q)
           ).size(0);
       });
 
 
       // And again for the old time period
-      _.each($scope.panel.queries.ids, function(id) {
+      _.each(queries, function(query) {
         var q = $scope.ejs.FilteredQuery(
-          querySrv.getEjsObj(id),
+          querySrv.toEjsObj(query),
           filterSrv.getBoolFilter(_ids_without_time).must(
             $scope.ejs.RangeFilter(timeField)
             .from($scope.old_time.from)
             .to($scope.old_time.to)
           ));
         request = request
-          .facet($scope.ejs.QueryFacet("old_"+id)
+          .facet($scope.ejs.QueryFacet("old_"+query.id)
             .query(q)
           ).size(0);
       });
@@ -169,17 +169,14 @@ function (angular, app, _, kbn) {
           return;
         }
 
-        // Convert facet ids to numbers
-        var facetIds = _.map(_.keys(results.facets),function(k){if(!isNaN(k)){return parseInt(k, 10);}});
-
         // Make sure we're still on the same query/queries
-        if($scope.query_id === query_id &&
-          _.intersection(facetIds,$scope.panel.queries.ids).length === $scope.panel.queries.ids.length
-          ) {
+        if($scope.query_id === query_id) {
           var i = 0;
-          _.each($scope.panel.queries.ids, function(id) {
-            var n = results.facets[id].count;
-            var o = results.facets['old_'+id].count;
+          var queries = querySrv.getQueryObjs($scope.panel.queries.ids);
+
+          _.each(queries, function(query) {
+            var n = results.facets[query.id].count;
+            var o = results.facets['old_'+query.id].count;
 
             var hits = {
               new : _.isUndefined($scope.data[i]) || _segment === 0 ? n : $scope.data[i].hits.new+n,
@@ -193,7 +190,7 @@ function (angular, app, _, kbn) {
               '?' : Math.round(percentage(hits.old,hits.new)*100)/100;
             // Create series
             $scope.data[i] = {
-              info: querySrv.list[id],
+              info: query,
               hits: {
                 new : hits.new,
                 old : hits.old

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

@@ -4,11 +4,11 @@
   }
 </style>
 
-<li ng-repeat="pulldown in dashboard.current.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable"><kibana-simple-panel type="pulldown.type" panel="pulldown" ng-cloak></kibana-simple-panel></li>
+<li ng-repeat="pulldown in dashboard.current.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable"><kibana-simple-panel type="pulldown.type" ng-cloak></kibana-simple-panel></li>
 
 <li><a bs-tooltip="'Goto saved default'" data-placement="bottom" href='#/dashboard'><i class='icon-home'></i></a></li>
-<li class="dropdown" bs-tooltip="'Load'" data-placement="bottom" ng-show="showDropdown('load')" >
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown" ng-click="elasticsearch_dblist('title:'+elasticsearch.query+'*')">
+<li class="dropdown" ng-show="showDropdown('load')" >
+  <a href="#" bs-tooltip="'Load'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="elasticsearch_dblist('title:'+elasticsearch.query+'*')">
     <i class='icon-folder-open'></i>
   </a>
 
@@ -28,8 +28,8 @@
       </table>
     </li>
 
-    <li class="dropdown-submenu noarrow">
-      <a tabindex="-1" href="#" class="small" style="padding:0"><i class="icon-caret-left"></i> Advanced</a>
+    <li class="dropdown-submenu noarrow" ng-show="dashboard.current.loader.load_gist || dashboard.current.loader.load_local">
+      <a tabindex="-1" class="small" style="padding:0"><i class="icon-caret-left"></i> Advanced</a>
       <ul class="dropdown-menu" style="padding:10px">
         <li ng-show='dashboard.current.loader.load_local'>
           <h5>Local File <tip>Load dashboard JSON layout from file</tip></h5>
@@ -58,8 +58,8 @@
 
 
 </li>
-<li class="dropdown" bs-tooltip="'Save'" data-placement="bottom" ng-show="showDropdown('save')">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+<li class="dropdown"ng-show="showDropdown('save')">
+  <a href="#"  bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown">
     <i class='icon-save'></i>
   </a>
 
@@ -67,14 +67,14 @@
   <ul class="dropdown-menu" style="padding:10px">
 
     <li ng-show="dashboard.current.loader.save_elasticsearch">
-      <form class="input-append nomargin">
+      <form class="input-prepend nomargin">
+        <button style="margin-top:-1px" class="btn" ng-click="elasticsearch_save('dashboard')"><i class="icon-save"></i></button>
         <input class='input-medium' ng-model="dashboard.current.title" type="text" ng-model="elasticsearch.title"/>
-        <button class="btn" ng-click="elasticsearch_save('dashboard')"><i class="icon-save"></i></button>
       </form>
     </li>
 
-    <li class="dropdown-submenu noarrow">
-      <a tabindex="-1" href="#" class="small" style="padding:0"><i class="icon-caret-left"></i> Advanced</a>
+    <li class="dropdown-submenu noarrow" ng-show="dashboard.current.loader.save_local || dashboard.current.loader.save_gist || dashboard.current.loader.save_default">
+      <a tabindex="-1" class="small" style="padding:0"><i class="icon-caret-left"></i> Advanced</a>
       <ul class="dropdown-menu">
 
         <li ng-show="dashboard.current.loader.save_default">

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

@@ -54,7 +54,7 @@
             <div ng-repeat="(name, panel) in row.panels|filter:isPanel" ng-hide="panel.span == 0 || panel.hide" class="span{{panel.span}} panel nospace" style="min-height:{{row.height}}; position:relative" data-drop="true" ng-model="row.panels" data-jqyoui-options jqyoui-droppable="{index:$index,mutate:false,onDrop:'panelMoveDrop',onOver:'panelMoveOver(true)',onOut:'panelMoveOut'}">
               <!-- Error Panel -->
               <div class="row-fluid">
-                <div class="span12 alert alert-error panel-error" ng-hide="!panel.error">
+                <div class="span12 alert-error panel-error" ng-hide="!panel.error">
                   <a class="close" ng-click="panel.error=false">&times;</a>
                   <i class="icon-exclamation-sign"></i> <strong>Oops!</strong> {{panel.error}}
                 </div>

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

@@ -117,7 +117,7 @@
     <h5>Save to</h5>
     <div class="row-fluid">
       <div class="span2">
-        <label class="small">File</label><input type="checkbox" ng-model="dashboard.current.loader.save_local" ng-checked="dashboard.current.loader.save_local">
+        <label class="small">Export</label><input type="checkbox" ng-model="dashboard.current.loader.save_local" ng-checked="dashboard.current.loader.save_local">
       </div>
       <div class="span2">
         <label class="small">Browser</label><input type="checkbox" ng-model="dashboard.current.loader.save_default" ng-checked="dashboard.current.loader.save_default">

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

@@ -6,6 +6,7 @@ define([
   './kbnIndex',
   './querySrv',
   './timer',
-  './panelMove'
+  './panelMove',
+  './esVersion'
 ],
 function () {});

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

@@ -143,12 +143,13 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
                 return false;
               }
             }
-            $rootScope.$broadcast('refresh');
+            // Don't resolve queries until indices are updated
+            querySrv.resolve().then(function(){$rootScope.$broadcast('refresh');});
           });
         } else {
           if(self.current.failover) {
             self.indices = [self.current.index.default];
-            $rootScope.$broadcast('refresh');
+            querySrv.resolve().then(function(){$rootScope.$broadcast('refresh');});
           } else {
             alertSrv.set("No time filter",
               'Timestamped indices are configured without a failover. Waiting for time filter.',
@@ -157,7 +158,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
         }
       } else {
         self.indices = [self.current.index.default];
-        $rootScope.$broadcast('refresh');
+        querySrv.resolve().then(function(){$rootScope.$broadcast('refresh');});
       }
     };
 
@@ -292,7 +293,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
 
     this.elasticsearch_load = function(type,id) {
       return $http({
-        url: config.elasticsearch + "/" + config.kibana_index + "/"+type+"/"+id,
+        url: config.elasticsearch + "/" + config.kibana_index + "/"+type+"/"+id+'?' + new Date().getTime(),
         method: "GET",
         transformResponse: function(response) {
           return renderTemplate(angular.fromJson(response)._source.dashboard, $routeParams);

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

@@ -0,0 +1,150 @@
+define([
+  'angular',
+  'underscore',
+  'config'
+],
+function (angular, _, config) {
+  'use strict';
+
+  var module = angular.module('kibana.services');
+
+  module.service('esVersion', function($http, alertSrv) {
+
+    this.versions = [];
+
+    // save a reference to this
+    var self = this;
+
+    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');
+        }
+      });
+
+      return nodeInfo.then(function(p) {
+        _.each(p.data.nodes, function(v) {
+          self.versions.push(v.version.split('-')[0]);
+        });
+        self.versions = sortVersions(_.uniq(self.versions));
+      });
+    };
+
+    // Get the max version in this cluster
+    this.max = function() {
+      return _.last(self.versions);
+    };
+
+    // Return the lowest version in the cluster
+    this.min = function() {
+      return _.first(self.versions);
+    };
+
+    // Sort versions from lowest to highest
+    var sortVersions = function(versions) {
+      var _versions = _.clone(versions),
+        _r = [];
+
+      while(_r.length < versions.length) {
+        var _h = "0";
+        /*jshint -W083 */
+        _.each(_versions,function(v){
+          if(self.compare(_h,v)) {
+            _h = v;
+          }
+        });
+        _versions = _.without(_versions,_h);
+        _r.push(_h);
+      }
+      return _r.reverse();
+    };
+
+    /*
+      Takes a version string with one of the following optional comparison prefixes: >,>=,<.<=
+      and evaluates if the cluster meets the requirement. If the prefix is omitted exact match
+      is assumed
+    */
+    this.is = function(equation) {
+      var _v = equation,
+        _cf;
+
+      if(_v.charAt(0) === '>') {
+        _cf = _v.charAt(1) === '=' ? self.gte(_v.slice(2)) : self.gt(_v.slice(1));
+      } else if (_v.charAt(0) === '<') {
+        _cf = _v.charAt(1) === '=' ? self.lte(_v.slice(2)) : self.lt(_v.slice(1));
+      } else {
+        _cf = self.eq(_v);
+      }
+
+      return _cf;
+    };
+
+    // check if lowest version in cluster = `version`
+    this.eq = function(version) {
+      return version === self.min() ? true : false;
+    };
+
+    // version > lowest version in cluster?
+    this.gt = function(version) {
+      return version === self.min() ? false : self.gte(version);
+    };
+
+    // version < highest version in cluster?
+    this.lt = function(version) {
+      return version === self.max() ? 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());
+    };
+
+    // Check if the highest version in the cluster is <= to `version`
+    this.lte = function(version) {
+      return self.compare(self.max(),version);
+    };
+
+    // Determine if a specific version is greater than or equal to another
+    this.compare = function (required,installed) {
+      var a = installed.split('.');
+      var b = required.split('.');
+      var i;
+
+      for (i = 0; i < a.length; ++i) {
+        a[i] = Number(a[i]);
+      }
+      for (i = 0; i < b.length; ++i) {
+        b[i] = Number(b[i]);
+      }
+      if (a.length === 2) {
+        a[2] = 0;
+      }
+
+      if (a[0] > b[0]){return true;}
+      if (a[0] < b[0]){return false;}
+
+      if (a[1] > b[1]){return true;}
+      if (a[1] < b[1]){return false;}
+
+      if (a[2] > b[2]){return true;}
+      if (a[2] < b[2]){return false;}
+
+      return true;
+    };
+
+    this.init();
+
+  });
+
+});

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

@@ -19,7 +19,7 @@ function (angular, _, config) {
       if(!_.isUndefined(n) && n.length) {
         // Only get the mapping for indices we don't know it for
         var indices = _.difference(n,_.keys(self.mapping));
-        // Only get the mapping if there are indices
+        // Only get the mapping if there are new indices
         if(indices.length > 0) {
           self.map(indices).then(function(result) {
             self.mapping = _.extend(self.mapping,result);
@@ -36,7 +36,7 @@ function (angular, _, config) {
       var fields = [];
       _.each(m, function(types) {
         _.each(types, function(v) {
-          fields = _.union(fields,_.keys(v));
+          fields = _.without(_.union(fields,_.keys(v)),'_all','_source');
         });
       });
       return fields;
@@ -75,7 +75,7 @@ function (angular, _, config) {
         ret = {};
       for(var attr in obj){
         // For now only support multi field on the top level
-        // and if if there is a default field set.
+        // and if there is a default field set.
         if(obj[attr]['type'] === 'multi_field') {
           ret[attr] = obj[attr]['fields'][attr] || obj[attr];
           continue;