kibana-sinatra 3.0.1.0 → 3.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a60578b7212ab46b0322991c4c6bdf4248008bb
-  data.tar.gz: 75631dc7670f9a33295b221bf6b2b97481c7d6d4
+  metadata.gz: 8e814d7c44de07824618a49d1ef6f7fd1f65b9da
+  data.tar.gz: cd129e565427adc2443cdc2b7678f134f580d6f4
 SHA512:
-  metadata.gz: 3899211b14c10cf4d02a9157d034eb205a229ef03fe141eba9c907a0be4ffb65f8f01965a9262111c0dc7f2ac097e7f08bdc6018daa6c5a31c444a7835608876
-  data.tar.gz: 52b59580df2b66f222bb1a8d98963812ef70f9bd198d1e8a7e1c625bd9eb079e1106a94018c1cf80f7832f6688523f384627d8356eb3ab2942f372dd23406cfe
+  metadata.gz: 5ebf59a58f1b18902b23f4066da73eb7fcb3b134053e28e0bf17d6b728c9f165b34d91b1bf24197c21470d63eb062d692e418401dfb2103ef06db00f7735306f
+  data.tar.gz: 428d2994e538ed095cf9f0babe236e68bb096e87669b2fa427e534712daa784a96da670d578f23797943de3a29df29d547b15b450a32194ce760a0090108510f

data/lib/kibana/assets/app/components/require.config.js

@@ -45,7 +45,8 @@ require.config({
 
 
     modernizr:                '../vendor/modernizr-2.6.1',
-    numeral:                '../vendor/numeral',
+    numeral:                  '../vendor/numeral',
+    jsonpath:                 '../vendor/jsonpath',
     elasticjs:                '../vendor/elasticjs/elastic-angular-client',
   },
   shim: {
@@ -62,6 +63,10 @@ require.config({
       exports: 'Modernizr'
     },
 
+    jsonpath: {
+      exports: 'jsonPath'
+    },
+
     jquery: {
       exports: 'jQuery'
     },

data/lib/kibana/assets/app/controllers/dash.js

@@ -25,6 +25,9 @@ function (angular, config, _) {
     $scope.panelMoveOver = panelMove.onOver;
     $scope.panelMoveOut = panelMove.onOut;
 
+    angular.element(window).bind('resize', function(){
+      $scope.$broadcast('render');
+    });
 
     $scope.init = function() {
       $scope.config = config;

data/lib/kibana/assets/app/dashboards/default.json

@@ -24,7 +24,7 @@
   "rows": [
     {
       "title": "Intro",
-      "height": "450px",
+      "height": "700px",
       "editable": false,
       "collapse": false,
       "collapsable": false,

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

@@ -9,5 +9,6 @@ define([
   './tip',
   './confirmClick',
   './esVersion',
-  './configModal'
+  './configModal',
+  './resizable'
 ], function () {});

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

@@ -13,8 +13,13 @@ function (angular) {
         function file_selected(evt) {
           var files = evt.target.files; // FileList object
           var readerOnload = function() {
-            return function(e) {
-              dashboard.dash_load(JSON.parse(e.target.result));
+            return function(event) {
+              try {
+                dashboard.dash_load(JSON.parse(event.target.result));
+              }
+              catch (err)  {
+                alertSrv.set('Oops','The dashboard file you want to upload is malformed, please correct it and retry.','error');
+              }
               scope.$apply();
             };
           };

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

@@ -7,9 +7,9 @@ function (angular,$) {
 
   angular
     .module('kibana.directives')
-    .directive('kibanaPanel', function($compile) {
-      var container = '<div class="panel-container" ng-style="{\'min-height\':row.height}"></div>';
-      var content = '<div class="panel-content"></div>';
+    .directive('kibanaPanel', function($compile, $rootScope) {
+      var container = '<div class="panel-container"></div>';
+      var content = '<div class="panel-content" ng-style="{\'min-height\':row.height}"></div>';
 
       var panelHeader =
       '<div class="panel-header">'+
@@ -66,12 +66,17 @@ function (angular,$) {
         '</div>\n'+
       '</div>';
       return {
-        restrict: 'E',
+        restrict: 'A',
+        replace: true,
         link: function($scope, elem, attr) {
           // once we have the template, scan it for controllers and
           // load the module.js if we have any
           var newScope = $scope.$new();
 
+          elem.parent().parent().parent().resize(function() {
+            $rootScope.$broadcast('render');
+          });
+
           $scope.kbnJqUiDraggableOptions = {
             revert: 'invalid',
             helper: function() {
@@ -83,7 +88,7 @@ function (angular,$) {
           // compile the module and uncloack. We're done
           function loadModule($module) {
             $module.appendTo(elem);
-            elem.wrap(container);
+            elem.wrapInner(container);
             /* jshint indent:false */
             $compile(elem.contents())(newScope);
             elem.removeClass("ng-cloak");

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

@@ -0,0 +1,34 @@
+define([
+  'angular',
+],
+function (angular) {
+  'use strict';
+
+  angular
+    .module('kibana.directives')
+    .directive('resizable', function() {
+      return {
+        restrict: 'A',
+        link: function(scope, elem) {
+
+          var getOpts = function() {
+            return {
+              maxWidth: elem.parent().width(),
+              grid: elem.parent().width()/12,
+              handles: 'e'
+            };
+          };
+
+          // Re-render if the window is resized
+          angular.element(window).bind('resize', function(){
+            elem.resizable(getOpts());
+          });
+
+          elem.resizable(getOpts());
+          elem.resize(function (event, ui) {
+            scope.panel.span = Math.round(((ui.size.width / elem.parent().width()) * 100) * 1.2 / 10);
+          });
+        }
+      };
+    });
+});

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

@@ -52,11 +52,11 @@ function (angular, app, _, L, localRequire) {
         }
       ],
       status  : "Experimental",
-      description : "Displays geo points in clustered groups on a map. The cavaet for this panel is"+
+      description : "Displays geo points in clustered groups on a map. The caveat for this panel is"+
         " that, for better or worse, it does NOT use the terms facet and it <b>does</b> query "+
         "sequentially. This however means that it transfers more data and is generally heavier to"+
         " compute, while showing less actual data. If you have a time filter, it will attempt to"+
-        " show to most recent points in your search, up to your defined limit"
+        " show to most recent points in your search, up to your defined limit."
     };
 
     // Set and populate defaults
@@ -227,7 +227,7 @@ function (angular, app, _, L, localRequire) {
         var map, layerGroup;
 
         function render_panel() {
-          elem.css({height:scope.row.height});
+          elem.css({height:scope.panel.height||scope.row.height});
 
           scope.require(['./leaflet/plugins'], function () {
             scope.panelMeta.loading = false;

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

@@ -1,16 +1,11 @@
 <div ng-controller="column" ng-init="init();">
-  <!-- Panels -->
-  <div ng-repeat="(name, panel) in panel.panels" ng-hide="panel.height == '0px' || panel.hide" class="row-fluid panel" style="min-height:{{panel.height}}; position:relative">
-    <!-- Error Panel -->
-    <div class="row-fluid">
-      <div class="span12 alert 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>
-    </div>
-    <!-- Content Panel -->
-    <div class="row-fluid">
-      <kibana-panel type="panel.type"></kibana-panel>
-    </div>
+  <!-- All the panels in the column -->
+  <div
+    ng-repeat="(name, panel) in panel.panels|filter:isPanel"
+    ng-cloak ng-hide="panel.height == '0px' || panel.hide"
+    kibana-panel type='panel.type'
+    class="row-fluid panel"
+    style="min-height:{{panel.height}}; position:relative"
+    ng-model="row.panels">
   </div>
-</div>
+</div>

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

@@ -164,15 +164,10 @@ define([
           render_panel();
         });
 
-        // Or if the window is resized
-        angular.element(window).bind('resize', function(){
-          render_panel();
-        });
-
         // Function for rendering panel
         function render_panel() {
           // IE doesn't work without this
-          elem.css({height:scope.row.height});
+          elem.css({height:scope.panel.height||scope.row.height});
 
           var label;
 
@@ -180,7 +175,8 @@ define([
             show: scope.panel.labels,
             radius: 0,
             formatter: function(label, series){
-              var font = parseInt(scope.row.height.replace('px',''),10)/8 + String('px');
+              var font = parseInt(
+                (scope.panel.height||scope.row.height).replace('px',''),10)/8 + String('px');
               if(!(_.isUndefined(label))) {
                 return '<div style="font-size:'+font+';font-weight:bold;text-align:center;padding:2px;color:#fff;">'+
                 Math.round(series.percent)+'%</div>';

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

@@ -375,8 +375,8 @@ function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
         // This is a hack proposed by @boaz to work around the fact that we can't get
         // to field data values directly, and we need timestamps as normalized longs
         request = request.sort([
-          $scope.ejs.Sort($scope.panel.annotate.sort[0]).order($scope.panel.annotate.sort[1]),
-          $scope.ejs.Sort($scope.panel.time_field).desc()
+          $scope.ejs.Sort($scope.panel.annotate.sort[0]).order($scope.panel.annotate.sort[1]).ignoreUnmapped(true),
+          $scope.ejs.Sort($scope.panel.time_field).desc().ignoreUnmapped(true)
         ]);
       }
 
@@ -579,15 +579,6 @@ function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
           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);
-        });
-
         var scale = function(series,factor) {
           return _.map(series,function(p) {
             return [p[0],p[1]*factor];
@@ -616,7 +607,7 @@ function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
         function render_panel(data) {
           // IE doesn't work without this
           try {
-            elem.css({height:scope.row.height});
+            elem.css({height:scope.panel.height||scope.row.height});
           } catch(e) {return;}
 
           // Populate from the query service

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

@@ -203,15 +203,10 @@ define([
           render_panel();
         });
 
-        // Re-render if the window is resized
-        angular.element(window).bind('resize', function(){
-          render_panel();
-        });
-
         // Function for rendering panel
         function render_panel() {
           // IE doesn't work without this
-          elem.css({height:scope.row.height});
+          elem.css({height:scope.panel.height||scope.row.height});
 
           try {
             _.each(scope.data,function(series) {

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

@@ -53,7 +53,7 @@
         background-color: #1f1f1f;
         border-radius: 5px;
         position: absolute;
-        right: 0px;
+        left: 0px;
         top: 15px;
         display: none;
         z-index: 99;

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

@@ -145,8 +145,8 @@ function (angular, app, _, $) {
       $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
     };
 
-    $scope.build_search = function(field,value) {
-      filterSrv.set({type:'terms',field:field,value:value,mandate:"must"});
+    $scope.build_search = function(field, value) {
+      filterSrv.set({type:'field', field:field, query:value, mandate:"must"});
     };
 
   });
@@ -161,19 +161,16 @@ function (angular, app, _, $) {
 
         // Receive render events
         scope.$on('render',function(){
-          render_panel();
+          slow();
         });
 
-        // Or if the window is resized
-        angular.element(window).bind('resize', function(){
-          render_panel();
+        elem.closest('.panel').resize(function () {
+          elem.empty();
         });
 
         function render_panel() {
-          elem.css({height:scope.row.height});
-
-          elem.text('');
-
+          elem.empty();
+          elem.css({height:scope.panel.height||scope.row.height});
           $('.jvectormap-zoomin,.jvectormap-zoomout,.jvectormap-label').remove();
           require(['./panels/map/lib/map.'+scope.panel.map], function () {
             elem.vectorMap({
@@ -194,7 +191,7 @@ function (angular, app, _, $) {
                 elem.children('.map-legend').text(label.text() + ": " + count);
               },
               onRegionOut: function() {
-                $('.map-legend').hide();
+                elem.children('.map-legend').hide();
               },
               onRegionClick: function(event, code) {
                 var count = _.isUndefined(scope.data[code]) ? 0 : scope.data[code];
@@ -205,9 +202,11 @@ function (angular, app, _, $) {
             });
             elem.prepend('<span class="map-legend"></span>');
 
-            $('.map-legend').hide();
+            elem.children('.map-legend').hide();
           });
         }
+
+        var slow = _.debounce(render_panel, 200);
       }
     };
   });

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

@@ -296,11 +296,6 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
           render_panel();
         });
 
-        // Re-render if the window is resized
-        angular.element(window).bind('resize', function(){
-          render_panel();
-        });
-
         var derivative = function(series) {
           return _.map(series, function(p,i) {
             var _v;

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

@@ -1,8 +1,8 @@
 <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>
+      <label class="small">Featured Stat</label>
+      <select ng-change="set_refresh(true)" class="input-small" ng-model="panel.mode" ng-options="f for f in modes"></select>
     </div>
     <div class="editor-option">
       <label class="small">Field <tip>This field must contain a numeric value</tip></label>
@@ -12,6 +12,12 @@
       <label class="small">Unit</label>
         <input type="text" class="input-large" ng-model="panel.unit">
     </div>
+
+    <h5>Columns</h5>
+    <div class="editor-option" ng-repeat="stat in modes">
+      <label class="small">{{stat}}</label><input type="checkbox" ng-model="panel.show[stat]" ng-checked="panel.show[stat]">
+    </div>
+
     <h5>Formating</h5>
     <div class="editor-option">
       <label class="small">Format</label>
@@ -26,11 +32,7 @@
       <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>
+      <label class="small">Query 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

@@ -1,14 +1,36 @@
 <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;">
+  <style>
+    table.stats-table th, table.stats-table td {
+      text-align: right;
+    }
+
+    table.stats-table th:first-child,  table.stats-table td:first-child {
+      text-align: left !important;
+    }
+
+
+  </style>
+
+  <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}} ({{panel.mode}})</small></h1>
+  <table ng-show="panel.display_breakdown == 'yes'" cellspacing="0" class="table-hover table table-condensed stats-table" 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">
+      <thead>
+        <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 ng-repeat="stat in modes" ng-show="panel.show[stat]">
+          <a href=""
+            ng-click="set_sort(stat)"
+            ng-class="{'icon-chevron-down': panel.sort_field == stat && panel.sort_reverse == true, 'icon-chevron-up': panel.sort_field == stat && panel.sort_reverse == false}">
+            {{stat}}
+          </a>
+          </th>
+        </tr>
+      </thead>
+      <tr ng-repeat="item in data.rows | orderBy:(panel.sort_field == 'label' ? 'label' : 'value.'+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>
+        <td ng-repeat="stat in modes" ng-show="panel.show[stat]">{{item.value[stat]|formatstats:panel.format}} {{panel.unit}}</td>
+
+        <!--<td style="text-align: right;">{{item.value|formatstats:panel.format}} {{panel.unit}}</td>-->
       </tr>
     </tbody>
   </table>