kibana-sinatra 0.0.7 → 0.0.8

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

@@ -1,8 +1,8 @@
 define([
-  'underscore',
-  './interval'
+  './interval',
+  'lodash'
 ],
-function (_, Interval) {
+function (Interval, _) {
   'use strict';
 
   var ts = {};
@@ -46,6 +46,8 @@ function (_, Interval) {
 
     // will keep all values here, keyed by their time
     this._data = {};
+    // For each bucket in _data, store a corresponding counter of how many times it was written to.
+    this._counters = {};
     this.start_time = opts.start_date && getDatesTime(opts.start_date);
     this.end_time = opts.end_date && getDatesTime(opts.end_date);
     this.opts = opts;
@@ -57,6 +59,7 @@ function (_, Interval) {
    * @param {any}  value The value at this time
    */
   ts.ZeroFilled.prototype.addValue = function (time, value) {
+    this._counters[time] = (this._counters[time] || 0) + 1;
     if (time instanceof Date) {
       time = getDatesTime(time);
     } else {

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

@@ -13,7 +13,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'jquery',
   'kbn',
 

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

@@ -13,7 +13,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'jquery',
   'config',
   './lib/jquery.jvectormap.min'

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

@@ -19,7 +19,7 @@
         <input class="input-mini" type="number" ng-model="panel.size" ng-change="set_refresh(true)">
       </div>
       <div class="editor-option">
-        <label class="small">Exclude Terms(s) (comma seperated)</label>
+        <label class="small">Exclude Terms(s) (comma separated)</label>
         <input array-join type="text" ng-model='panel.exclude'></input>
       </div>
     </div>

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

@@ -13,7 +13,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'jquery',
   'kbn',
   'config'

data/lib/kibana/assets/app/panels/query/meta.html

@@ -8,7 +8,7 @@
 
   <fieldset>
     <select class="input-small" ng-model="querySrv.list[id].type" ng-change="typeChange(querySrv.list[id])">
-      <option ng-repeat="type in queryTypes|esVersion:'require'">{{type.name}}</option>
+      <option ng-repeat="type in queryTypes">{{type}}</option>
     </select> &nbsp<a href="" class="small" ng-click="queryHelp(querySrv.list[id].type)"> About the {{querySrv.list[id].type}} query</a>
 
     <hr class="small">

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

@@ -16,7 +16,7 @@
     </form>
   </div>
   <div style="display:inline-block" ng-repeat="id in querySrv.ids|pinnedQuery:true">
-    <span class="pointer" ng-show="$first" ng-click="panel.pinned = !panel.pinned"><span class="pins">Pinned</span> <i ng-class="{'icon-caret-right':panel.pinned,'icon-caret-left':!panel.pinned}"></i></span>
+    <span class="pointer badge pins" ng-show="$first" ng-click="panel.pinned = !panel.pinned">Pinned <i ng-class="{'icon-caret-right':panel.pinned,'icon-caret-left':!panel.pinned}"></i></span>
     <span ng-show="panel.pinned" class="badge pinned">
       <i class="icon-circle pointer" ng-show="querySrv.list[id].enable" ng-style="{color: querySrv.list[id].color}" data-unique="1" bs-popover="'app/panels/query/meta.html'" data-placement="bottomLeft"></i>
       <i class="pointer icon-circle-blank" bs-tooltip="'Activate query'" ng-click="querySrv.list[id].enable=true;dashboard.refresh();" ng-hide="querySrv.list[id].enable" ng-style="{color: querySrv.list[id].color}"></i>

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

@@ -10,7 +10,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
 
   'css!./query.css'
 ], function (angular, app, _) {
@@ -38,12 +38,7 @@ define([
     $scope.querySrv = querySrv;
 
     // A list of query types for the query config popover
-    $scope.queryTypes = _.map(querySrv.queryTypes, function(v,k) {
-      return {
-        name:k,
-        require:v.require
-      };
-    });
+    $scope.queryTypes = querySrv.types;
 
     var queryHelpModal = $modal({
       template: './app/panels/query/helpModal.html',

data/lib/kibana/assets/app/panels/query/query.css

@@ -7,16 +7,21 @@
 }
 .begin-query {
   position:absolute;
-  left:13px;
+  left:10px;
   top:5px;
 }
 .end-query {
   position:absolute;
-  right:15px;
+  right:10px;
   top:5px;
 }
+
+.end-query i, .begin-query i {
+  margin: 0px;
+}
+
 .panel-query {
-  padding-left: 35px !important;
+  padding-left: 25px !important;
   height: 31px !important;
   -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
   -moz-box-sizing: border-box;    /* Firefox, other Gecko */
@@ -28,7 +33,7 @@
 }
 
 .form-search:hover .has-remove {
-  padding-left: 50px !important;
+  padding-left: 40px !important;
 }
 .remove-query {
   opacity: 0;
@@ -39,9 +44,6 @@
 .form-search:hover .remove-query {
   opacity: 1;
 }
-.query-panel .pins {
-  text-decoration: underline;
-}
 .query-panel .pinned {
   margin-right: 5px;
 }

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

@@ -14,7 +14,7 @@ define([
   'angular',
   'app',
   'jquery',
-  'underscore',
+  'lodash',
   'kbn',
   'moment',
   './timeSeries',
@@ -46,7 +46,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
         }
       ],
       status  : "Experimental",
-      description : "Sparklines are tiny, simple, time series charts, shown seperately. Because "+
+      description : "Sparklines are tiny, simple, time series charts, shown separately. Because "+
         "sparklines are unclutted by grids, axis markers and colors, they are perfect for spotting"+
         " change in a series"
     };

data/lib/kibana/assets/app/panels/sparklines/timeSeries.js

@@ -1,8 +1,8 @@
 define([
-  'underscore',
-  './interval'
+  './interval',
+  'lodash'
 ],
-function (_, Interval) {
+function (Interval, _) {
   'use strict';
 
   var ts = {};

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

@@ -0,0 +1,36 @@
+<div class="row-fluid">
+    <h5>Details</h5>
+    <div class="editor-option">
+      <label class="small">Function</label>
+      <select ng-change="set_refresh(true)" class="input-small" ng-model="panel.mode" ng-options="f for f in ['count','min','mean','max','total']"></select>
+    </div>
+    <div class="editor-option">
+      <label class="small">Field <tip>This field must contain a numeric value</tip></label>
+        <input ng-change="set_refresh(true)" placeholder="Start typing" bs-typeahead="fields.list" type="text" class="input-large" ng-model="panel.field">
+    </div>
+    <div class="editor-option">
+      <label class="small">Unit</label>
+        <input type="text" class="input-large" ng-model="panel.unit">
+    </div>
+    <h5>Formating</h5>
+    <div class="editor-option">
+      <label class="small">Format</label>
+      <select ng-change="set_refresh(true)" class="input-small" ng-model="panel.format" ng-options="f for f in ['number','float','money','bytes']"></select>
+    </div>
+    <div class="editor-option">
+      <label class="small">Font Size</label>
+      <select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
+    </div>
+    <div class="editor-option">
+      <label class="small">Display Breakdowns</label>
+      <select class="input-mini" ng-model="panel.display_breakdown" ng-options="f for f in ['yes', 'no']"></select></span>
+    </div>
+    <div class="editor-option">
+      <label class="small">Label column name</label>
+        <input type="text" class="input-large" ng-model="panel.label_name">
+    </div>
+    <div class="editor-option">
+      <label class="small">Value column name</label>
+        <input type="text" class="input-large" ng-model="panel.value_name">
+    </div>
+</div>

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

@@ -0,0 +1,15 @@
+<div ng-controller="stats" ng-init="init()">
+  <h1 ng-style="panel.style" style="text-align: center; line-height: .6em">{{data.value|formatstats:panel.format}} <small style="font-size: .5em; line-height: 0;">{{panel.unit}}</small></h1>
+  <table ng-show="panel.display_breakdown == 'yes'" cellspacing="0" class="table-hover table table-condensed" style="margin-top: 38px;">
+    <tbody>
+      <tr>
+       <th><a href="" ng-click="set_sort('label')" ng-class="{'icon-chevron-down': panel.sort_field == 'label' && panel.sort_reverse == true, 'icon-chevron-up': panel.sort_field == 'label' && panel.sort_reverse == false}"> {{panel.label_name}} </a></th>
+       <th style="text-align: right;"><a href="" ng-click="set_sort('value')" ng-class="{'icon-chevron-down': panel.sort_field == 'value' && panel.sort_reverse == true, 'icon-chevron-up': panel.sort_field == 'value' && panel.sort_reverse == false}"> {{panel.value_name}} </a></th>
+      </tr>
+      <tr ng-repeat="item in data.rows | orderBy:panel.sort_field:panel.sort_reverse">
+        <td><i class="icon-circle" ng-style="{color:item.color}"></i> {{item.label}}</td>
+        <td style="text-align: right;">{{item.value|formatstats:panel.format}} {{panel.unit}}</td>
+      </tr>
+    </tbody>
+  </table>
+</div>

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

@@ -0,0 +1,199 @@
+/*
+
+  ## Stats Module
+
+  ### Parameters
+  * format :: The format of the value returned. (Default: number)
+  * style :: The font size of the main number to be displayed.
+  * mode :: The aggergate value to use for display
+  * spyable ::  Dislay the 'eye' icon that show the last elasticsearch query
+
+*/
+define([
+  'angular',
+  'app',
+  'lodash',
+  'jquery',
+  'kbn',
+  'numeral'
+], function (
+  angular,
+  app,
+  _,
+  $,
+  kbn,
+  numeral
+) {
+
+  'use strict';
+
+  var module = angular.module('kibana.panels.stats', []);
+  app.useModule(module);
+
+  module.controller('stats', function ($scope, querySrv, dashboard, filterSrv) {
+
+    $scope.panelMeta = {
+      modals : [
+        {
+          description: "Inspect",
+          icon: "icon-info-sign",
+          partial: "app/partials/inspector.html",
+          show: $scope.panel.spyable
+        }
+      ],
+      editorTabs : [
+        {title:'Queries', src:'app/partials/querySelect.html'}
+      ],
+      status: 'Beta',
+      description: 'A statistical panel for displaying aggregations using the Elastic Search statistical facet query.'
+    };
+
+
+    var defaults = {
+      queries     : {
+        mode        : 'all',
+        ids         : []
+      },
+      style   : { "font-size": '24pt'},
+      format: 'number',
+      mode: 'count',
+      display_breakdown: 'yes',
+      sort_field: '',
+      sort_reverse: false,
+      label_name: 'Query',
+      value_name: 'Value',
+      spyable     : true
+    };
+
+    _.defaults($scope.panel, defaults);
+
+    $scope.init = function () {
+      $scope.ready = false;
+      $scope.$on('refresh', function () {
+        $scope.get_data();
+      });
+      $scope.get_data();
+    };
+
+    $scope.set_sort = function(field) {
+      if($scope.panel.sort_field === field && $scope.panel.sort_reverse === false) {
+        $scope.panel.sort_reverse = true;
+      } else if($scope.panel.sort_field === field && $scope.panel.sort_reverse === true) {
+        $scope.panel.sort_field = '';
+        $scope.panel.sort_reverse = false;
+      } else {
+        $scope.panel.sort_field = field;
+        $scope.panel.sort_reverse = false;
+      }
+    };
+
+    $scope.get_data = function () {
+      if(dashboard.indices.length === 0) {
+        return;
+      }
+
+      $scope.panelMeta.loading = true;
+
+      var request,
+        results,
+        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(queries,function(q) {
+        boolQuery = boolQuery.should(querySrv.toEjsObj(q));
+      });
+
+      request = request
+        .facet($scope.ejs.StatisticalFacet('stats')
+          .field($scope.panel.field)
+          .facetFilter($scope.ejs.QueryFilter(
+            $scope.ejs.FilteredQuery(
+              boolQuery,
+              filterSrv.getBoolFilter(filterSrv.ids)
+              )))).size(0);
+
+      _.each(queries, function (q) {
+        var alias = q.alias || q.query;
+        var query = $scope.ejs.BoolQuery();
+        query.should(querySrv.toEjsObj(q));
+        request.facet($scope.ejs.StatisticalFacet('stats_'+alias)
+          .field($scope.panel.field)
+          .facetFilter($scope.ejs.QueryFilter(
+            $scope.ejs.FilteredQuery(
+              query,
+              filterSrv.getBoolFilter(filterSrv.ids)
+            )
+          ))
+        );
+      });
+
+      // Populate the inspector panel
+      $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
+
+      results = request.doSearch();
+
+      results.then(function(results) {
+        $scope.panelMeta.loading = false;
+        var value = results.facets.stats[$scope.panel.mode];
+
+        var rows = queries.map(function (q) {
+          var alias = q.alias || q.query;
+          var obj = _.clone(q);
+          obj.label = alias;
+          obj.Label = alias.toLowerCase(); //sort field
+          obj.value = results.facets['stats_'+alias][$scope.panel.mode];
+          obj.Value = results.facets['stats_'+alias][$scope.panel.mode]; //sort field
+          return obj;
+        });
+
+        $scope.data = {
+          value: value,
+          rows: rows
+        };
+
+        $scope.$emit('render');
+      });
+    };
+
+    $scope.set_refresh = function (state) {
+      $scope.refresh = state;
+    };
+
+    $scope.close_edit = function() {
+      if($scope.refresh) {
+        $scope.get_data();
+      }
+      $scope.refresh =  false;
+      $scope.$emit('render');
+    };
+
+  });
+
+  module.filter('formatstats', function(){
+    return function (value,format) {
+      switch (format) {
+      case 'money':
+        value = numeral(value).format('$0,0.00');
+        break;
+      case 'bytes':
+        value = numeral(value).format('0.00b');
+        break;
+      case 'float':
+        value = numeral(value).format('0.000');
+        break;
+      default:
+        value = numeral(value).format('0,0');
+      }
+      return value;
+    };
+  });
+
+});

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

@@ -1,49 +1,45 @@
   <div class="row-fluid">
-    <div class="section span6">
-      <h5>Columns</h5>
-      <form class="input-append editor-option">
-        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model='newfield'>
-        <button class="btn" ng-click="toggle_field(newfield);newfield=''"><i class="icon-plus"></i></button>
-      </form><br>
-      <span style="margin-left:3px" ng-repeat="field in $parent.panel.fields" class="label">{{field}} <i class="pointer icon-remove-sign" ng-click="toggle_field(field)"></i></span>
-    </div>
-    <div class="section span6">
-      <h5>Hightlighted Fields</h5>
-      <form class="input-append editor-option">
-        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model='newhighlight' ng-change="set_refresh(true)">
-        <button class="btn" ng-click="toggle_highlight(newhighlight);newhighlight=''"><i class="icon-plus"></i></button>
-      </form><br>
-      <span style="margin-left:3px" ng-repeat="field in $parent.panel.highlight" class="label">{{field}} <i class="pointer icon-remove-sign" ng-click="toggle_highlight(field);set_refresh(true)" ></i></span>
-    </div>
-  </div>
-
-  <div class="editor-row">
-    <div class="section">
+    <div class="span6 section">
       <h5>Options</h5>
       <div class="editor-option">
-        <h6>Header</h6><input type="checkbox" ng-model="panel.header" ng-checked="panel.header">
+        <label class="small">Header</label><input type="checkbox" ng-model="panel.header" ng-checked="panel.header">
       </div>
       <div class="editor-option">
-        <h6>Sorting</h6><input type="checkbox" ng-model="panel.sortable" ng-checked="panel.sortable">
+        <label class="small">Sorting</label><input type="checkbox" ng-model="panel.sortable" ng-checked="panel.sortable">
       </div>
       <div class="editor-option" style="white-space:nowrap" ng-show='panel.sortable'>
-        <h6>Sort</h6>
+        <label class="small">Sort</label>
         <input class="input-small" bs-typeahead="fields.list" ng-model="panel.sort[0]" type="text"></input>
         <i ng-click="set_sort(panel.sort[0])" ng-class="{'icon-chevron-up': panel.sort[1] == 'asc','icon-chevron-down': panel.sort[1] == 'desc'}"></i>
       </div>
-      <div class="editor-option"><h6>Font Size</h6>
+      <div class="editor-option"><label class="small">Font Size</label>
         <select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
       </div>
       <div class="editor-option">
-        <h6>Trim Factor <tip>Trim fields to this long divided by # of rows. Requires data refresh.</tip></h6>
+        <label class="small">Trim Factor <tip>Trim fields to this long divided by # of rows. Requires data refresh.</tip></label>
         <input type="number" class="input-small" ng-model="panel.trimFactor" ng-change="set_refresh(true)">
       </div>
+      <br>
       <div class="editor-option">
-        <h6>Local Time <tip>Adjust time field to browser's local time</tip></h6><input type="checkbox" ng-change="set_refresh(true)" ng-model="panel.localTime" ng-checked="panel.localTime">
+        <label class="small">Local Time <tip>Adjust time field to browser's local time</tip></label><input type="checkbox" ng-change="set_refresh(true)" ng-model="panel.localTime" ng-checked="panel.localTime">
       </div>
       <div class="editor-option" ng-show="panel.localTime">
-        <h6>Time Field</h6>
+        <label class="small">Time Field</label>
         <input type="text" class="input-small" ng-model="panel.timeField" ng-change="set_refresh(true)" bs-typeahead="fields.list">
       </div>
     </div>
+    <div class="section span6">
+      <h5>Columns</h5>
+      <form class="input-append editor-option">
+        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model='newfield'>
+        <button class="btn" ng-click="panel.fields = _.toggleInOut(panel.fields,newfield);newfield=''"><i class="icon-plus"></i></button>
+      </form><br>
+      <span style="margin-left:3px" ng-repeat="field in panel.fields" class="label">{{field}} <i class="pointer icon-remove-sign" ng-click="panel.fields = _.toggleInOut(panel.fields,field)"></i></span>
+      <h5>Hightlighted Fields</h5>
+      <form class="input-append editor-option">
+        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model='newhighlight' ng-change="set_refresh(true)">
+        <button class="btn" ng-click="panel.highlight = _.toggleInOut(panel.highlight,newhighlight);newhighlight=''"><i class="icon-plus"></i></button>
+      </form><br>
+      <span style="margin-left:3px" ng-repeat="field in panel.highlight" class="label">{{field}} <i class="pointer icon-remove-sign" ng-click="panel.highlight = _.toggleInOut(panel.highlight,field);set_refresh(true)" ></i></span>
+    </div>
   </div>