kibana-sinatra 0.0.7 → 0.0.8

data/lib/kibana/assets/app/directives/kibanaSimplePanel.js

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

data/lib/kibana/assets/app/factories/store.js

@@ -0,0 +1,59 @@
+define([
+  'angular',
+  'lodash'
+],
+function (angular, _) {
+  'use strict';
+
+  var module = angular.module('kibana.factories');
+  module.factory('storeFactory', function() {
+
+    return function storeFactory($scope, name, defaults) {
+      if (!_.isFunction($scope.$watch)) {
+        throw new TypeError('Invalid scope.');
+      }
+      if (!_.isString(name)) {
+        throw new TypeError('Invalid name, expected a string that the is unique to this store.');
+      }
+      if (defaults && !_.isPlainObject(defaults)) {
+        throw new TypeError('Invalid defaults, expected a simple object or nothing');
+      }
+
+      defaults = defaults || {};
+
+      // get the current value, parse if it exists
+      var current = localStorage.getItem(name);
+      if (current != null) {
+        try {
+          current = JSON.parse(current);
+        } catch (e) {
+          current = null;
+        }
+      }
+
+      if (current == null) {
+        current = _.clone(defaults);
+      } else if (_.isPlainObject(current)) {
+        _.defaults(current, defaults);
+      } else {
+        throw new TypeError('Invalid store value' + current);
+      }
+
+      $scope[name] = current;
+
+      // listen for changes and store them in localStorage.
+      // delete the value to reset to the defaults, ie. `delete $scope[name]` -> digest cycle -> `$scope[name] == defaults`
+      $scope.$watch(name, function (val) {
+        if (val === void 0) {
+          localStorage.removeItem(name);
+          $scope[name] = _.clone(defaults);
+        } else {
+          localStorage.setItem(name, JSON.stringify(val));
+        }
+      }, true);
+
+      return current;
+    };
+  });
+
+});

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

@@ -1,4 +1,9 @@
-define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, moment) {
+define([
+  'angular',
+  'jquery',
+  'lodash',
+  'moment'
+], function (angular, $, _, moment) {
   'use strict';
 
   var module = angular.module('kibana.filters');
@@ -24,18 +29,6 @@ define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, m
     };
   });
 
-  /*
-    Filter an array of objects by elasticsearch version requirements
-  */
-  module.filter('esVersion', function(esVersion) {
-    return function(items, require) {
-      var ret = _.filter(items,function(qt) {
-        return esVersion.is(qt[require]) ? true : false;
-      });
-      return ret;
-    };
-  });
-
   module.filter('slice', function() {
     return function(arr, start, end) {
       if(!_.isUndefined(arr)) {

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

@@ -1,4 +1,9 @@
 <div ng-controller='bettermap' ng-init="init()">
+  <style>
+    .leaflet-label {
+      color: #fff;
+    }
+  </style>
   <!-- This solution might work well for other panels that have trouble with heights -->
   <div  style="padding-right:10px;padding-top:10px;height:{{panel.height|| row.height}};overflow:hidden">
     <div bettermap id='bettermap' params="{{panel}}" style="height:100%"></div>

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

@@ -19,7 +19,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   './leaflet/leaflet-src',
   'require',
 

data/lib/kibana/assets/app/panels/column/editor.html

@@ -5,7 +5,7 @@
     <small>Select Type</small>
     <div ng-show="!(_.isUndefined(new_panel.type))">
       <div column-edit panel="new_panel" config="config" row="row" dashboards="dashboards" type="new_panel.type"></div>
-      <button ng-click="add_panel(new_panel); reset_panel();" class="btn btn-primary">Create Panel</button><br>
+      <button ng-click="add_panel(panel,new_panel); reset_panel();" class="btn btn-primary">Create Panel</button><br>
     </div>
   </div>
   <div class="row-fluid">

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

@@ -14,7 +14,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'config'
 ],
 function (angular, app, _, config) {
@@ -59,8 +59,8 @@ function (angular, app, _, config) {
       $scope.$broadcast('render');
     };
 
-    $scope.add_panel = function(panel) {
-      $scope.panel.panels.push(panel);
+    $scope.add_panel = function(panel,newPanel) {
+      panel.panels.push(newPanel);
     };
 
     $scope.reset_panel = function(type) {
@@ -68,11 +68,12 @@ function (angular, app, _, config) {
         loading: false,
         error: false,
         sizeable: false,
-        span: 12,
+        draggable: false,
+        removable: false,
+        span: 10,
         height: "150px",
         editable: true,
-        type: type,
-        draggable: false
+        type: type
       };
     };
 

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

@@ -19,7 +19,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function(angular, app, _) {
   'use strict';

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

@@ -14,7 +14,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

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

@@ -4,7 +4,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

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

@@ -8,23 +8,13 @@
       vertical-align: top;
       width: 220px;
       padding: 5px 5px 0px 5px;
-      border: #555 1px solid;
       margin: 5px 5px 5px 0px;
+      color: #fff;
+      background-color: #444;
     }
     .filter-panel-filter ul {
       margin-bottom: 3px;
     }
-
-
-    .filter-must {
-      border-top: #7EB26D 3px solid;
-    }
-    .filter-mustNot {
-      border-top: #E24D42 3px solid;
-    }
-    .filter-either {
-      border-top: #EF843C 3px solid;
-    }
     .filter-deselected {
       opacity: 0.5;
     }
@@ -39,7 +29,6 @@
     }
     .filter-apply {
       float:right;
-      margin-bottom: 5px;
     }
   </style>
 
@@ -47,7 +36,7 @@
     <span ng-show="filterSrv.ids.length == 0">
       <h5>No filters available</h5>
     </span>
-    <div ng-repeat="id in filterSrv.ids" class="small filter-panel-filter filter-{{filterSrv.list[id].mandate}}" ng-class="{'filter-deselected': !filterSrv.list[id].active}">
+    <div ng-repeat="id in filterSrv.ids" class="small filter-panel-filter">
       <div>
         <strong>{{filterSrv.list[id].type}}</strong>
         <span ng-show="!filterSrv.list[id].editing && isEditable(filterSrv.list[id])" class="filter-mandate" ng-click="filterSrv.list[id].editing = true">
@@ -57,6 +46,8 @@
           {{filterSrv.list[id].mandate}}
         </span>
 
+        <i ng-class="getFilterClass(filterSrv.list[id])" class="icon-circle"></i>
+
         <span ng-show="filterSrv.list[id].editing">
           <select class="input-small" ng-model="filterSrv.list[id].mandate" ng-options="f for f in ['must','mustNot','either']"></select>
         </span>
@@ -80,11 +71,13 @@
           </li>
         </ul>
         <div>
-          <input type="submit" value="Apply" ng-click="filterSrv.list[id].editing=undefined;refresh()" class="filter-apply btn btn-success btn-mini" bs-tooltip="'Save and refresh'"/>
-          <button ng-click="filterSrv.list[id].editing=undefined" class="filter-apply btn btn-mini" bs-tooltip="'Save without refresh'">Save</button>
+
+          <button type="submit" ng-click="filterSrv.list[id].editing=undefined;refresh()" class="filter-apply btn btn-mini btn-success" bs-tooltip="'Save and refresh'">Apply</button>
+
+          <button ng-click="filterSrv.list[id].editing=undefined" class="filter-apply btn-mini btn" bs-tooltip="'Save without refresh'">Save</button>
         </div>
       </form>
     </div>
-    <i class="link icon-plus-sign" ng-click="add()" bs-tooltip="'Add a query filter'" data-placement="right"></i>
+    <i class="pointer icon-plus-sign" ng-click="add()" bs-tooltip="'Add a query filter'" data-placement="right"></i>
   </div>
 </div>

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

@@ -6,7 +6,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';
@@ -67,6 +67,24 @@ function (angular, app, _) {
       return !_.contains(['type','id','alias','mandate','active','editing'],key);
     };
 
+    $scope.getFilterClass = function(filter) {
+      if(filter.active !== true) {
+        return 'muted';
+      } else {
+        switch (filter.mandate)
+        {
+        case 'must':
+          return 'text-success';
+        case 'mustNot':
+          return 'text-error';
+        case 'either':
+          return 'text-warning';
+        default:
+          return 'text-info';
+        }
+      }
+    };
+
     $scope.isEditable = function(filter) {
       var uneditable = ['time'];
       if(_.contains(uneditable,filter.type)) {

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

@@ -35,11 +35,11 @@
   </style>
   <div>
     <span ng-show='panel.options'>
-      <a class="link underline small" ng-show='panel.options' ng-click="options=!options">
-        <i ng-show="!options" class="icon-caret-right"></i><i ng-show="options" class="icon-caret-down"></i> View
+      <a class="link small" ng-show='panel.options' ng-click="options=!options">
+        View <i ng-show="!options" class="icon-caret-right"></i><i ng-show="options" class="icon-caret-down"></i>
       </a> |&nbsp
     </span>
-    <span ng-show='panel.zoomlinks && data'>
+    <span ng-show='panel.zoomlinks && !_.isUndefined(data)'>
       <!--<a class='small' ng-click='zoom(0.5)'><i class='icon-zoom-in'></i> Zoom In</a>-->
       <a class='small' ng-click='zoom(2)'><i class='icon-zoom-out'></i> Zoom Out</a> |&nbsp
     </span>
@@ -51,7 +51,7 @@
         <span ng-show="panel.legend_counts"> ({{series.hits}})</span>
       </span>
     </span>
-    <span ng-show="panel.legend" class="small"><span ng-show="panel.derivative">change in </span><span class="strong" ng-show="panel.value_field && panel.mode != 'count'">{{panel.value_field}}</span> {{panel.mode}} per <strong ng-hide="panel.scaleSeconds">{{panel.interval}}</strong><strong ng-show="panel.scaleSeconds">1s</strong> | (<strong>{{hits}}</strong> hits)</span>
+    <span ng-show="panel.legend" class="small"><span ng-show="panel.derivative"> change in </span><span class="strong" ng-show="panel.value_field && panel.mode != 'count'">{{panel.value_field}}</span> {{panel.mode}} per <strong ng-hide="panel.scaleSeconds">{{panel.interval}}</strong><strong ng-show="panel.scaleSeconds">1s</strong> | (<strong>{{hits}}</strong> hits)</span>
   </div>
   <form class="form-inline bordered histogram-options" ng-show="options">
     <span>

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

@@ -15,10 +15,11 @@ define([
   'angular',
   'app',
   'jquery',
-  'underscore',
+  'lodash',
   'kbn',
   'moment',
   './timeSeries',
+  'numeral',
   'jquery.flot',
   'jquery.flot.events',
   'jquery.flot.selection',
@@ -27,7 +28,7 @@ define([
   'jquery.flot.stack',
   'jquery.flot.stackpercent'
 ],
-function (angular, app, $, _, kbn, moment, timeSeries) {
+function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
 
   'use strict';
 
@@ -327,6 +328,9 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
 
       $scope.panelMeta.loading = true;
       request = $scope.ejs.Request().indices(dashboard.indices[segment]);
+      if (!$scope.panel.annotate.enable) {
+        request.searchType("count");
+      }
 
       $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
 
@@ -398,7 +402,8 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
 
           var i = 0,
             time_series,
-            hits;
+            hits,
+            counters; // Stores the bucketed hit counts.
 
           _.each(queries, function(q) {
             var query_results = results.facets[q.id];
@@ -413,16 +418,46 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
               };
               time_series = new timeSeries.ZeroFilled(tsOpts);
               hits = 0;
+              counters = {};
             } else {
               time_series = data[i].time_series;
               hits = data[i].hits;
+              counters = data[i].counters;
             }
 
             // push each entry into the time series, while incrementing counters
             _.each(query_results.entries, function(entry) {
-              time_series.addValue(entry.time, entry[$scope.panel.mode]);
+              var value;
+
               hits += entry.count; // The series level hits counter
               $scope.hits += entry.count; // Entire dataset level hits counter
+              counters[entry.time] = (counters[entry.time] || 0) + entry.count;
+
+              if($scope.panel.mode === 'count') {
+                value = (time_series._data[entry.time] || 0) + entry.count;
+              } else if ($scope.panel.mode === 'mean') {
+                // Compute the ongoing mean by
+                // multiplying the existing mean by the existing hits
+                // plus the new mean multiplied by the new hits
+                // divided by the total hits
+                value = (((time_series._data[entry.time] || 0)*(counters[entry.time]-entry.count)) +
+                  entry.mean*entry.count)/(counters[entry.time]);
+              } else if ($scope.panel.mode === 'min'){
+                if(_.isUndefined(time_series._data[entry.time])) {
+                  value = entry.min;
+                } else {
+                  value = time_series._data[entry.time] < entry.min ? time_series._data[entry.time] : entry.min;
+                }
+              } else if ($scope.panel.mode === 'max'){
+                if(_.isUndefined(time_series._data[entry.time])) {
+                  value = entry.max;
+                } else {
+                  value = time_series._data[entry.time] > entry.max ? time_series._data[entry.time] : entry.max;
+                }
+              } else if ($scope.panel.mode === 'total'){
+                value = (time_series._data[entry.time] || 0) + entry.total;
+              }
+              time_series.addValue(entry.time, value);
             });
 
             $scope.legend[i] = {query:q,hits:hits};
@@ -430,7 +465,8 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
             data[i] = {
               info: q,
               time_series: time_series,
-              hits: hits
+              hits: hits,
+              counters: counters
             };
 
             i++;
@@ -539,6 +575,10 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
           render_panel(data);
         });
 
+        scope.$watch('panel.span', function(){
+          render_panel(data);
+        });
+
         // Re-render if the window is resized
         angular.element(window).bind('resize', function(){
           render_panel(data);
@@ -571,7 +611,9 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
         // Function for rendering panel
         function render_panel(data) {
           // IE doesn't work without this
-          elem.css({height:scope.panel.height || scope.row.height});
+          try {
+            elem.css({height:scope.panel.height || scope.row.height});
+          } catch(e) {return;}
 
           // Populate from the query service
           try {
@@ -638,18 +680,22 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
               }
             };
 
-            if(scope.panel.y_format === 'bytes') {
+            if (scope.panel.y_format === 'bytes') {
               options.yaxis.mode = "byte";
+              options.yaxis.tickFormatter = function (val, axis) {
+                return kbn.byteFormat(val, 0, axis.tickSize);
+              };
             }
 
-            if(scope.panel.y_format === 'short') {
-              options.yaxis.tickFormatter = function(val) {
-                return kbn.shortFormat(val,0);
+            if (scope.panel.y_format === 'short') {
+              options.yaxis.tickFormatter = function (val, axis) {
+                return kbn.shortFormat(val, 0, axis.tickSize);
               };
             }
 
             if(scope.panel.annotate.enable) {
               options.events = {
+                clustering: true,
                 levels: 1,
                 data: scope.annotations,
                 types: {
@@ -723,7 +769,9 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
 
         var $tooltip = $('<div>');
         elem.bind("plothover", function (event, pos, item) {
-          var group, value, timestamp;
+          var group, value, timestamp, interval;
+          interval = scope.panel.legend ?
+            "" : " per " + (scope.panel.scaleSeconds ? '1s' : scope.panel.interval);
           if (item) {
             if (item.series.info.alias || scope.panel.tooltip.query_as_alias) {
               group = '<small style="font-size:0.9em;">' +
@@ -741,13 +789,15 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
             }
             if(scope.panel.y_format === 'short') {
               value = kbn.shortFormat(value,2);
+            } else {
+              value = numeral(value).format('0,0[.]000');
             }
             timestamp = scope.panel.timezone === 'browser' ?
               moment(item.datapoint[0]).format('YYYY-MM-DD HH:mm:ss') :
               moment.utc(item.datapoint[0]).format('YYYY-MM-DD HH:mm:ss');
             $tooltip
               .html(
-                group + value + " @ " + timestamp
+                group + value + interval + " @ " + timestamp
               )
               .place_tt(pos.pageX, pos.pageY);
           } else {