kibana-sinatra 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ae246456b81df5e196942cf5cc54902c20963cf
-  data.tar.gz: d8747df503e6a8317618d611d5d19200abecfc60
+  metadata.gz: 3b0ab86a8330f137d771fbb28969b03b700f88fa
+  data.tar.gz: ebc86b24d4d6bf697114cb8776d37a6ae5a8f3a6
 SHA512:
-  metadata.gz: 7cf30e392b4ce6c72bd8f9d8c28b78d3b4d15142003b91669f1009a601bd96cfa2641f3ebbe6336c150c8c1cdb1b1c38d3987fef762e4866af861ceeda65cdac
-  data.tar.gz: 12b2a2c6aa112dad0b28f9c2012177ebbf3a2c8b2ffef6bd0a48014fc2d218eef27420f5ca3d9a44b69cf55b6bce8f947ae36e4fc0e2be10addcfa06834b1066
+  metadata.gz: 72d3a09749d602f4e71f234cb43d62ef619d31e66878a797aac8375de9b252dcd97f8fe70970ed651c9577e19eaff0935e6ecf7b4ef32211e9a1e37a17c94091
+  data.tar.gz: e41655af7a3c3220abdfb7b4534d51dc2f2e0611260e29bbf7f3386bbb80d7ebec8d60f737c406ab46d91fcd54b5dc4005cad73f09cc8928b7b227e0674e9187

data/README.md

@@ -6,7 +6,7 @@
 
 This gem provides [Kibana 3](https://github.com/elasticsearch/kibana) inside a [Sinatra](http://www.sinatrarb.com/) app that you can include in any Rack based system, including Rails.
 
-It is currently based on Kibana 3 commit [0f16e1cc6184ed101e63106b4b386cebc3e92652](https://github.com/elasticsearch/kibana/commits/0f16e1cc6184ed101e63106b4b386cebc3e92652)
+It is currently based on Kibana 3 commit [84ed4069f7797a9e364e050063e6897927d2a0d7](https://github.com/elasticsearch/kibana/commits/84ed4069f7797a9e364e050063e6897927d2a0d7)
 
 ## Installation
 

data/kibana-sinatra.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "uuid"
   spec.add_development_dependency "rubyzip"
   spec.add_development_dependency "rack-test"
+  spec.add_development_dependency "minitest"
   spec.add_dependency "sinatra", "~> 1.4"
 end

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

@@ -4,13 +4,14 @@
 define([
   'angular',
   'jquery',
-  'underscore',
+  'lodash',
   'require',
   'elasticjs',
   'bootstrap',
   'angular-sanitize',
   'angular-strap',
   'angular-dragdrop',
+  'angular-cookies',
   'extend-jquery',
   'bindonce',
 ],
@@ -29,6 +30,9 @@ function (angular, $, _, appLevelRequire) {
   // This stores the Kibana revision number, @REV@ is replaced by grunt.
   app.constant('kbnVersion',"@REV@");
 
+  // The minimum version that must be in the cluster
+  app.constant('esMinVersion','0.90.9');
+
   // Use this for cache busting partials
   app.constant('cacheBust',"cache-bust="+Date.now());
 
@@ -94,6 +98,7 @@ function (angular, $, _, appLevelRequire) {
     '$strap.directives',
     'ngSanitize',
     'ngDragDrop',
+    'ngCookies',
     'kibana',
     'pasvaz.bindonce'
   ];
@@ -124,7 +129,7 @@ function (angular, $, _, appLevelRequire) {
     angular
       .element(document)
       .ready(function() {
-        $('body').attr('ng-controller', 'DashCtrl');
+        $('html').attr('ng-controller', 'DashCtrl');
         angular.bootstrap(document, apps_deps)
           .invoke(['$rootScope', function ($rootScope) {
             _.each(pre_boot_modules, function (module) {
@@ -150,4 +155,4 @@ function (angular, $, _, appLevelRequire) {
   });
 
   return app;
-});
+});

data/lib/kibana/assets/app/components/kbn.js

@@ -1,4 +1,9 @@
-define(['jquery','underscore','moment','chromath'],
+define([
+  'jquery',
+  'lodash',
+  'moment',
+  'chromath'
+],
 function($, _, moment) {
   'use strict';
 
@@ -218,7 +223,7 @@ function($, _, moment) {
   kbn.describe_interval = function (string) {
     var matches = string.match(kbn.interval_regex);
     if (!matches || !_.has(kbn.intervals_in_seconds, matches[2])) {
-      throw new Error('Invalid interval string, expexcting a number followed by one of "Mwdhmsy"');
+      throw new Error('Invalid interval string, expecting a number followed by one of "Mwdhmsy"');
     } else {
       return {
         sec: kbn.intervals_in_seconds[matches[2]],
@@ -499,18 +504,22 @@ function($, _, moment) {
     }
   };
 
-  kbn.byteFormat = function(size, decimals) {
+  kbn.byteFormat = function (size, decimals, min_resolution) {
     var ext, steps = 0;
 
-    if(_.isUndefined(decimals)) {
+    if (_.isUndefined(decimals)) {
       decimals = 2;
-    } else if (decimals === 0) {
-      decimals = undefined;
     }
 
+    if (_.isUndefined(min_resolution)) {
+      min_resolution = 0;
+    }
+
+
     while (Math.abs(size) >= 1024) {
       steps++;
       size /= 1024;
+      min_resolution /= 1024;
     }
 
     switch (steps) {
@@ -543,21 +552,35 @@ function($, _, moment) {
       break;
     }
 
+    if (min_resolution) {
+      min_resolution *= Math.pow(10, decimals);
+      while (min_resolution % 1 !== 0) {
+        decimals++;
+        min_resolution *= 10;
+      }
+    }
+
+    if (decimals === 0) {
+      decimals = undefined;
+    }
+
     return (size.toFixed(decimals) + ext);
   };
 
-  kbn.shortFormat = function(size, decimals) {
+  kbn.shortFormat = function (size, decimals, min_resolution) {
     var ext, steps = 0;
 
-    if(_.isUndefined(decimals)) {
+    if (_.isUndefined(decimals)) {
       decimals = 2;
-    } else if (decimals === 0) {
-      decimals = undefined;
+    }
+    if (_.isUndefined(min_resolution)) {
+      min_resolution = 0;
     }
 
     while (Math.abs(size) >= 1000) {
       steps++;
       size /= 1000;
+      min_resolution /= 1000;
     }
 
     switch (steps) {
@@ -590,6 +613,18 @@ function($, _, moment) {
       break;
     }
 
+    if (min_resolution) {
+      min_resolution *= Math.pow(10, decimals);
+      while (min_resolution % 1 !== 0) {
+        decimals++;
+        min_resolution *= 10;
+      }
+    }
+
+    if (decimals === 0) {
+      decimals = undefined;
+    }
+
     return (size.toFixed(decimals) + ext);
   };
 

data/lib/kibana/assets/app/components/{underscore.extended.js → lodash.extended.js}

@@ -1,11 +1,9 @@
 define([
-  'underscore-src'
+  'lodash-src'
 ],
-function () {
+function (_) {
   'use strict';
 
-  var _ = window._;
-
   /*
     Mixins :)
   */

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

@@ -12,9 +12,11 @@ require.config({
     css:                      '../vendor/require/css',
     text:                     '../vendor/require/text',
     moment:                   '../vendor/moment',
+    blob:                     '../vendor/blob',
     filesaver:                '../vendor/filesaver',
     chromath:                 '../vendor/chromath',
     angular:                  '../vendor/angular/angular',
+    'angular-cookies':        '../vendor/angular/angular-cookies',
     'angular-dragdrop':       '../vendor/angular/angular-dragdrop',
     'angular-strap':          '../vendor/angular/angular-strap',
     'angular-sanitize':       '../vendor/angular/angular-sanitize',
@@ -22,8 +24,8 @@ require.config({
     datepicker:               '../vendor/angular/datepicker',
     bindonce:                 '../vendor/angular/bindonce',
 
-    underscore:               'components/underscore.extended',
-    'underscore-src':         '../vendor/underscore',
+    lodash:                   'components/lodash.extended',
+    'lodash-src':             '../vendor/lodash',
     bootstrap:                '../vendor/bootstrap/bootstrap',
 
     jquery:                   '../vendor/jquery/jquery-1.8.0',
@@ -42,13 +44,10 @@ require.config({
 
 
     modernizr:                '../vendor/modernizr-2.6.1',
+    numeral:                '../vendor/numeral',
     elasticjs:                '../vendor/elasticjs/elastic-angular-client',
   },
   shim: {
-    underscore: {
-      exports: '_'
-    },
-
     angular: {
       deps: ['jquery','config'],
       exports: 'angular'

data/lib/kibana/assets/app/components/settings.js

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

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

@@ -20,7 +20,7 @@
 define([
   'angular',
   'config',
-  'underscore',
+  'lodash',
   'services/all'
 ],
 function (angular, config, _) {
@@ -29,9 +29,7 @@ function (angular, config, _) {
   var module = angular.module('kibana.controllers');
 
   module.controller('DashCtrl', function(
-    $scope, $route, ejsResource, fields, dashboard, alertSrv, panelMove, esVersion) {
-
-    $scope.requiredElasticSearchVersion = ">=0.90.3";
+    $scope, $route, ejsResource, fields, dashboard, alertSrv, panelMove, esVersion, kbnVersion) {
 
     $scope.editor = {
       index: 0
@@ -47,7 +45,8 @@ function (angular, config, _) {
 
     $scope.init = function() {
       $scope.config = config;
-      // Make stuff, including underscore.js available to views
+      $scope.kbnVersion = kbnVersion;
+      // Make stuff, including lodash available to views
       $scope._ = _;
       $scope.dashboard = dashboard;
       $scope.dashAlerts = alertSrv;
@@ -104,6 +103,12 @@ function (angular, config, _) {
       }
     };
 
+    $scope.pulldownTabStyle = function(i) {
+      var classes = ['bgPrimary','bgSuccess','bgWarning','bgDanger','bgInverse','bgInfo'];
+      i = i%classes.length;
+      return classes[i];
+    };
+
     $scope.setEditorTabs = function(panelMeta) {
       $scope.editorTabs = ['General','Panel'];
       if(!_.isUndefined(panelMeta.editorTabs)) {

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

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

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

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

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

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

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

@@ -52,7 +52,7 @@
           ],
           "type": "text",
           "mode": "markdown",
-          "content": "### Welcome to Kibana. \nGlad you could make it. Happy to have you here! Lets get started, shall we?\n##### Requirements\n* **A good browser.**  \n    The latest version of Chrome or Firefox is recommended. Safari (latest version) and Internet Explorer 9 and above are also supported.\n* **A webserver.**  \n    Just somewhere to host the HTML and Javascript. Basically any webserver will work.\n* **Elasticsearch**  \n   0.20.5 or above. Kibana will soon move to requiring Elasticsearch 0.90 or above, so upgrading is recommended.\n\n##### Configuration\nIf Kibana and Elasticsearch are on the same host, and you're using the default Elasticsearch port, then you're all set. Kibana is configured to use that setup by default!  \n\nIf not, you need to edit *config.js* and set the *elasticsearch* parameter with the URL (including port, probably 9200) of your Elasticsearch server. The host part should be the entire, fully qualified domain name, or IP, **not localhost**.\n#### Are you a Logstash User?\n+ **YES** - Great! We have a prebuilt dashboard: [(Logstash Dashboard)](index.html#/dashboard/file/logstash.json). See the note to the right about making it your global default  \n\n+ **NO** - Hey, no problem, you just have a bit of setup to do. You have a few choices:  \n\n    1. [Sample Dashboard](index.html#/dashboard/file/guided.json) *I don't have much data yet, please extract some basics for me*  \n    2. [Unconfigured Dashboard](index.html#/dashboard/file/noted.json) *I have a lot of data and I don't want Kibana to query it at once*\n    3. [Blank Dashboard](index.html#/dashboard/file/blank.json) *I'm comfortable figuring it out on my own*",
+          "content": "### Welcome to Kibana. \nGlad you could make it. Happy to have you here! Lets get started, shall we?\n##### Requirements\n* **A good browser.**  \n    The latest version of Chrome or Firefox is recommended. Safari (latest version) and Internet Explorer 9 and above are also supported.\n* **A webserver.**  \n    Just somewhere to host the HTML and Javascript. Basically any webserver will work.\n* **Elasticsearch**  \n   0.90.9 or above. \n\n##### Configuration\nIf Kibana and Elasticsearch are on the same host, and you're using the default Elasticsearch port, then you're all set. Kibana is configured to use that setup by default!  \n\nIf not, you need to edit *config.js* and set the *elasticsearch* parameter with the URL (including port, probably 9200) of your Elasticsearch server. The host part should be the entire, fully qualified domain name, or IP, **not localhost**.\n#### Are you a Logstash User?\n+ **YES** - Great! We have a prebuilt dashboard: [(Logstash Dashboard)](index.html#/dashboard/file/logstash.json). See the note to the right about making it your global default  \n\n+ **NO** - Hey, no problem, you just have a bit of setup to do. You have a few choices:  \n\n    1. [Sample Dashboard](index.html#/dashboard/file/guided.json) *I don't have much data yet, please extract some basics for me*  \n    2. [Unconfigured Dashboard](index.html#/dashboard/file/noted.json) *I have a lot of data and I don't want Kibana to query it at once*\n    3. [Blank Dashboard](index.html#/dashboard/file/blank.json) *I'm comfortable figuring it out on my own*",
           "style": {},
           "status": "Stable"
         }

data/lib/kibana/assets/app/dashboards/logstash.js

@@ -10,13 +10,13 @@
  * interval :: Sets the index interval (eg: day,week,month,year), Default: day
  *
  * split :: The character to split the queries on Default: ','
- * query :: By default, a comma seperated list of queries to run. Default: *
+ * query :: By default, a comma separated list of queries to run. Default: *
  *
  * from :: Search this amount of time back, eg 15m, 1h, 2d. Default: 15m
  * timefield :: The field containing the time to filter on, Default: @timestamp
  *
- * fields :: comma seperated list of fields to show in the table
- * sort :: comma seperated field to sort on, and direction, eg sort=@timestamp,desc
+ * fields :: comma separated list of fields to show in the table
+ * sort :: comma separated field to sort on, and direction, eg sort=@timestamp,desc
  *
  */
 
@@ -56,7 +56,7 @@ if(!_.isUndefined(ARGS.index)) {
   };
 }
 
-// In this dashboard we let users pass queries as comma seperated list to the query parameter.
+// In this dashboard we let users pass queries as comma separated list to the query parameter.
 // Or they can specify a split character using the split aparameter
 // If query is defined, split it into a list of query objects
 // NOTE: ids must be integers, hence the parseInt()s

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

@@ -157,7 +157,7 @@
     "pattern": "[logstash-]YYYY.MM.DD",
     "default": "NO_TIME_FILTER_OR_INDEX_PATTERN_NOT_MATCHED"
   },
-  "style": "dark",
+  "style": "{{ARGS.style || 'dark'}}",
   "panel_hints": true,
   "pulldowns": [
     {

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

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

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

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

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

@@ -1,8 +1,8 @@
 define([
   'angular',
-  'app',
+  'lodash'
 ],
-function (angular) {
+function (angular,_) {
   'use strict';
 
   angular
@@ -10,15 +10,33 @@ function (angular) {
     .directive('configModal', function($modal,$q) {
       return {
         restrict: 'A',
-        link: function(scope, elem) {
+        link: function(scope, elem, attrs) {
+          var
+            model = attrs.kbnModel,
+            partial = attrs.configModal;
+
+
           // create a new modal. Can't reuse one modal unforunately as the directive will not
           // re-render on show.
           elem.bind('click',function(){
+
+            // Create a temp scope so we can discard changes to it if needed
+            var tmpScope = scope.$new();
+            tmpScope[model] = angular.copy(scope[model]);
+
+            tmpScope.editSave = function(panel) {
+              // Correctly set the top level properties of the panel object
+              _.each(panel,function(v,k) {
+                scope[model][k] = panel[k];
+              });
+            };
+
             var panelModal = $modal({
-              template: './app/partials/paneleditor.html',
+              //template: './app/partials/paneleditor.html',
+              template: partial,
               persist: true,
               show: false,
-              scope: scope,
+              scope: tmpScope,
               keyboard: false
             });
 

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

@@ -1,61 +1,70 @@
 define([
-  'angular'
+  'angular',
+  'jquery'
 ],
-function (angular) {
+function (angular,$) {
   'use strict';
 
   angular
     .module('kibana.directives')
     .directive('kibanaPanel', function($compile) {
-      var container = '<div class="panelCont"></div>';
-
-      var editorTemplate =
-
-        '<div class="row-fluid panel-extra"><div class="panel-extra-container">' +
-
-          '<span class="extra row-button" ng-show="panel.editable != false">' +
-            '<span confirm-click="row.panels = _.without(row.panels,panel)" '+
-            'confirmation="Are you sure you want to remove this {{panel.type}} panel?" class="pointer">'+
-            '<i class="icon-remove pointer" bs-tooltip="\'Remove\'"></i></span>'+
-          '</span>' +
-
-          '<span class="extra row-button" ng-hide="panel.draggable == false">' +
-            '<span class="pointer" bs-tooltip="\'Drag here to move\'"' +
-            'data-drag=true data-jqyoui-options="{revert: \'invalid\',helper:\'clone\'}"'+
-            ' jqyoui-draggable="'+
-            '{'+
-              'animate:false,'+
-              'mutate:false,'+
-              'index:{{$index}},'+
-              'onStart:\'panelMoveStart\','+
-              'onStop:\'panelMoveStop\''+
-              '}"  ng-model="row.panels"><i class="icon-move"></i></span>'+
-          '</span>' +
-          '<span class="extra row-button" ng-show="panel.draggable == false">' +
-            '<span class="row-text">{{panel.type}}</span>'+
-          '</span>' +
-
-          '<span class="row-button extra" ng-show="panel.editable != false">' +
-            '<span config-modal class="pointer">'+
-            '<i class="icon-cog pointer" bs-tooltip="\'Configure\'"></i></span>'+
-          '</span>' +
-
-          '<span ng-repeat="task in panelMeta.modals" class="row-button extra" ng-show="task.show">' +
-            '<span bs-modal="task.partial" class="pointer"><i ' +
-              'bs-tooltip="task.description" ng-class="task.icon" class="pointer"></i></span>'+
-          '</span>' +
-
-          '<span class="row-button extra" ng-show="panelMeta.loading == true">' +
-            '<span>'+
-              '<i class="icon-spinner icon-spin icon-large"></i>' +
-            '</span>'+
-          '</span>' +
+      var container = '<div class="panel-container" ng-style="{\'min-height\':row.height}"></div>';
+      var content = '<div class="panel-content"></div>';
+
+      var panelHeader =
+      '<div class="panel-header">'+
+        '<div class="row-fluid">' +
+          '<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>' +
+        '</div>\n' +
+
+        '<div class="row-fluid panel-extra">' +
+          '<div class="panel-extra-container">' +
+
+            '<span class="extra row-button" ng-show="panel.editable != false && panel.removable != false">' +
+              '<span confirm-click="row.panels = _.without(row.panels,panel)" '+
+              'confirmation="Are you sure you want to remove this {{panel.type}} panel?" class="pointer">'+
+              '<i class="icon-remove pointer" bs-tooltip="\'Remove\'"></i></span>'+
+            '</span>' +
+
+            '<span class="extra row-button" ng-hide="panel.draggable == false">' +
+              '<span class="pointer" bs-tooltip="\'Drag here to move\'"' +
+              'data-drag=true data-jqyoui-options="kbnJqUiDraggableOptions"'+
+              ' jqyoui-draggable="'+
+              '{'+
+                'animate:false,'+
+                'mutate:false,'+
+                'index:{{$index}},'+
+                'onStart:\'panelMoveStart\','+
+                'onStop:\'panelMoveStop\''+
+                '}"  ng-model="row.panels"><i class="icon-move"></i></span>'+
+            '</span>' +
+
+            '<span class="row-button extra" ng-show="panel.editable != false">' +
+              '<span config-modal="./app/partials/paneleditor.html" kbn-model="panel" class="pointer">'+
+              '<i class="icon-cog pointer" bs-tooltip="\'Configure\'"></i></span>'+
+            '</span>' +
 
-          '<span class="row-button row-text panel-title" ng-show="panel.title">' +
-            '{{panel.title}}' +
-          '</span>'+
+            '<span ng-repeat="task in panelMeta.modals" class="row-button extra" ng-show="task.show">' +
+              '<span bs-modal="task.partial" class="pointer"><i ' +
+                'bs-tooltip="task.description" ng-class="task.icon" class="pointer"></i></span>'+
+            '</span>' +
 
-        '</div></div>';
+            '<span class="row-button extra" ng-show="panelMeta.loading == true">' +
+              '<span>'+
+                '<i class="icon-spinner icon-spin icon-large"></i>' +
+              '</span>'+
+            '</span>' +
+
+            '<span class="panel-text panel-title">' +
+              '{{panel.title?panel.title:panel.type}}' +
+            '</span>'+
+
+          '</div>'+
+        '</div>\n'+
+      '</div>';
       return {
         restrict: 'E',
         link: function($scope, elem, attr) {
@@ -63,6 +72,14 @@ function (angular) {
           // load the module.js if we have any
           var newScope = $scope.$new();
 
+          $scope.kbnJqUiDraggableOptions = {
+            revert: 'invalid',
+            helper: function() {
+              return $('<div style="width:200px;height:100px;background: rgba(100,100,100,0.50);"/>');
+            },
+            placeholder: 'keep'
+          };
+
           // compile the module and uncloack. We're done
           function loadModule($module) {
             $module.appendTo(elem);
@@ -93,7 +110,10 @@ function (angular) {
               $controllers = $controllers.add($module.find('ngcontroller, [ng-controller], .ng-controller'));
 
               if ($controllers.length) {
-                $controllers.first().prepend(editorTemplate);
+                $controllers.first().prepend(panelHeader);
+
+                $controllers.first().find('.panel-header').nextAll().wrapAll(content);
+
                 $scope.require([
                   'panels/'+nameAsPath+'/module'
                 ], function() {