kibana-sinatra 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488b10d33481ec09a9be9de778d08b984898b6d8
-  data.tar.gz: 9b115a2965cba2cb58bc0f01e03c745f7c2af59a
+  metadata.gz: 21377d439be1057f9413662fee65a2a6bd0328c4
+  data.tar.gz: 3d3c501f3c505ff9c8408d679e0e8eb6e44a26bf
 SHA512:
-  metadata.gz: 3a31c619687789b0f096ac3e9b86b864df72d6b7c07456cb4aae77a940ca8a3f02e486fe7ad4993c6dc531c4b7a6f81567b920dd7c231c809e880a759f15ae68
-  data.tar.gz: 8eae148863560503a60ee3685ca805e53304c574835fb646c0c8d46b7b56748587b2949425444cebfdad4537cfe8396c356f476cb340d4ca223ce9d617d1e43e
+  metadata.gz: 1881dec9046579b356dd06023529ba62b17f491c74d0060a31ae19fdcd271b04658ec2c891ba10181940a01eb7e82813caca46e565ec78115789c9b565d2a94e
+  data.tar.gz: e00e61cb597a791c5f3c7a383c55300b05166f65b1410dd038fbd02e2e40e70a7ec26763ade25ccfb246f0343095500a8f4bc2ee4ce81d70498b71e787e989a4

data/README.md

@@ -2,10 +2,11 @@
 
 [![Dependency Status](https://gemnasium.com/ianneub/kibana-sinatra.png)](https://gemnasium.com/ianneub/kibana-sinatra)
 [![Build Status](https://travis-ci.org/ianneub/kibana-sinatra.png)](https://travis-ci.org/ianneub/kibana-sinatra)
+[![Gem Version](https://badge.fury.io/rb/kibana-sinatra.png)](http://badge.fury.io/rb/kibana-sinatra)
 
 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 [90d765d942f194c9561b3d25b3f7c1bc734e9203](https://github.com/elasticsearch/kibana/commits/master)
+It is currently based on Kibana 3 commit [f194336277280467f4d27ab8b65c8f69c5c7122e](https://github.com/elasticsearch/kibana/commits/master)
 
 ## Installation
 

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

@@ -11,7 +11,8 @@ define([
   'angular-sanitize',
   'angular-strap',
   'angular-dragdrop',
-  'extend-jquery'
+  'extend-jquery',
+  'bindonce'
 ],
 function (angular, $, _, appLevelRequire) {
   "use strict";
@@ -84,7 +85,8 @@ function (angular, $, _, appLevelRequire) {
     '$strap.directives',
     'ngSanitize',
     'ngDragDrop',
-    'kibana'
+    'kibana',
+    'pasvaz.bindonce'
   ];
 
   _.each('controllers directives factories services filters'.split(' '),

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

@@ -479,5 +479,119 @@ function($, _, moment) {
     });
   };
 
+  // Find the smallest missing number in an array
+  kbn.smallestMissing = function(arr,start,end) {
+    start = start || 0;
+    end = end || arr.length-1;
+
+    if(start > end) {
+      return end + 1;
+    }
+    if(start !== arr[start]) {
+      return start;
+    }
+    var middle = Math.floor((start + end) / 2);
+
+    if (arr[middle] > middle) {
+      return kbn.smallestMissing(arr, start, middle);
+    } else {
+      return kbn.smallestMissing(arr, middle + 1, end);
+    }
+  };
+
+  kbn.byteFormat = function(size, decimals) {
+    var ext, steps = 0;
+
+    if(_.isUndefined(decimals)) {
+      decimals = 2;
+    } else if (decimals === 0) {
+      decimals = undefined;
+    }
+
+    while (Math.abs(size) >= 1024) {
+      steps++;
+      size /= 1024;
+    }
+
+    switch (steps) {
+    case 0:
+      ext = " B";
+      break;
+    case 1:
+      ext = " KB";
+      break;
+    case 2:
+      ext = " MB";
+      break;
+    case 3:
+      ext = " GB";
+      break;
+    case 4:
+      ext = " TB";
+      break;
+    case 5:
+      ext = " PB";
+      break;
+    case 6:
+      ext = " EB";
+      break;
+    case 7:
+      ext = " ZB";
+      break;
+    case 8:
+      ext = " YB";
+      break;
+    }
+
+    return (size.toFixed(decimals) + ext);
+  };
+
+  kbn.shortFormat = function(size, decimals) {
+    var ext, steps = 0;
+
+    if(_.isUndefined(decimals)) {
+      decimals = 2;
+    } else if (decimals === 0) {
+      decimals = undefined;
+    }
+
+    while (Math.abs(size) >= 1000) {
+      steps++;
+      size /= 1000;
+    }
+
+    switch (steps) {
+    case 0:
+      ext = "";
+      break;
+    case 1:
+      ext = " K";
+      break;
+    case 2:
+      ext = " Mil";
+      break;
+    case 3:
+      ext = " Bil";
+      break;
+    case 4:
+      ext = " Tri";
+      break;
+    case 5:
+      ext = " Quadr";
+      break;
+    case 6:
+      ext = " Quint";
+      break;
+    case 7:
+      ext = " Sext";
+      break;
+    case 8:
+      ext = " Sept";
+      break;
+    }
+
+    return (size.toFixed(decimals) + ext);
+  };
+
   return kbn;
 });

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

@@ -20,6 +20,7 @@ require.config({
     'angular-sanitize':       '../vendor/angular/angular-sanitize',
     timepicker:               '../vendor/angular/timepicker',
     datepicker:               '../vendor/angular/datepicker',
+    bindonce:                 '../vendor/angular/bindonce',
 
     underscore:               'components/underscore.extended',
     'underscore-src':         '../vendor/underscore',
@@ -37,6 +38,8 @@ require.config({
     'jquery.flot.stack':      '../vendor/jquery/jquery.flot.stack',
     'jquery.flot.stackpercent':'../vendor/jquery/jquery.flot.stackpercent',
     'jquery.flot.time':       '../vendor/jquery/jquery.flot.time',
+    'jquery.flot.byte':       '../vendor/jquery/jquery.flot.byte',
+
 
     modernizr:                '../vendor/modernizr-2.6.1',
     elasticjs:                '../vendor/elasticjs/elastic-angular-client',
@@ -66,6 +69,7 @@ require.config({
     // simple dependency declaration
     'jquery-ui':            ['jquery'],
     'jquery.flot':          ['jquery'],
+    'jquery.flot.byte':     ['jquery', 'jquery.flot'],
     'jquery.flot.pie':      ['jquery', 'jquery.flot'],
     'jquery.flot.events':   ['jquery', 'jquery.flot'],
     'jquery.flot.selection':['jquery', 'jquery.flot'],
@@ -81,7 +85,7 @@ require.config({
     'angular-resource':     ['angular'],
     'angular-route':        ['angular'],
     'angular-touch':        ['angular'],
-
+    'bindonce':             ['angular'],
     'angular-strap':        ['angular', 'bootstrap','timepicker', 'datepicker'],
 
     timepicker:             ['jquery', 'bootstrap'],

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

@@ -1,3 +1,22 @@
+/** @scratch /index/0
+ * = Kibana
+ *
+ * // Why can't I have a preamble here?
+ *
+ * == Introduction
+ *
+ * Kibana is an open source (Apache Licensed), browser based analytics and search dashboard for
+ * ElasticSearch. Kibana is a snap to setup and start using. Written entirely in HTML and Javascript
+ * it requires only a plain webserver, Kibana requires no fancy server side components.
+ * Kibana strives to be easy to get started with, while also being flexible and powerful, just like
+ * Elasticsearch.
+ *
+ * include::configuration/config.js.asciidoc[]
+ *
+ * include::panels.asciidoc[]
+ *
+ */
+
 define([
   'angular',
   'config',
@@ -68,9 +87,18 @@ function (angular, config, _) {
       return { 'min-height': row.collapse ? '5px' : row.height };
     };
 
-    $scope.edit_path = function(type) {
+    $scope.panel_path =function(type) {
       if(type) {
-        return 'app/panels/'+type+'/editor.html';
+        return 'app/panels/'+type.replace(".","/");
+      } else {
+        return false;
+      }
+    };
+
+    $scope.edit_path = function(type) {
+      var p = $scope.panel_path(type);
+      if(p) {
+        return p+'/editor.html';
       } else {
         return false;
       }

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

@@ -58,6 +58,25 @@ function (angular, app, _) {
         $scope.row.panels.push(panel);
       };
 
+      /** @scratch /panels/0
+       * [[panels]]
+       * = Panels
+       *
+       * [partintro]
+       * --
+       * *Kibana* dashboards are made up of blocks called +panels+. Panels are organized into rows
+       * and can serve many purposes, though most are designed to provide the results of a query or
+       * multiple queries as a visualization. Other panels may show collections of documents or
+       * allow you to insert instructions for your users.
+       *
+       * Panels can be configured easily via the Kibana web interface. For more advanced usage, such
+       * as templated or scripted dashboards, documentation of panel properties is available in this
+       * section. You may find settings here which are not exposed via the web interface.
+       *
+       * Each panel type has its own properties, hover there are several that are shared.
+       *
+      */
+
       $scope.reset_panel = function(type) {
         var
           defaultSpan = 4,
@@ -65,12 +84,26 @@ function (angular, app, _) {
 
         $scope.panel = {
           error   : false,
+          /** @scratch /panels/1
+           * span:: A number, 1-12, that describes the width of the panel.
+           */
           span    : _as < defaultSpan && _as > 0 ? _as : defaultSpan,
+          /** @scratch /panels/1
+           * editable:: Enable or disable the edit button the the panel
+           */
           editable: true,
+          /** @scratch /panels/1
+           * type:: The type of panel this object contains. Each panel type will require additional
+           * properties. See the panel types list to the right.
+           */
           type    : type
         };
       };
 
+      /** @scratch /panels/2
+       * --
+       */
+
       $scope.init();
 
     }

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

@@ -2,12 +2,6 @@
   "title": "New Dashboard",
   "services": {
     "query": {
-      "idQueue": [
-        1,
-        2,
-        3,
-        4
-      ],
       "list": {
         "0": {
           "query": "*",
@@ -21,11 +15,6 @@
       ]
     },
     "filter": {
-      "idQueue": [
-        0,
-        1,
-        2
-      ],
       "list": {},
       "ids": []
     }

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

@@ -2,12 +2,6 @@
   "title": "Introduction",
   "services": {
     "query": {
-      "idQueue": [
-        1,
-        2,
-        3,
-        4
-      ],
       "list": {
         "0": {
           "query": "*",
@@ -23,11 +17,6 @@
       ]
     },
     "filter": {
-      "idQueue": [
-        0,
-        1,
-        2
-      ],
       "list": {},
       "ids": []
     }

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

@@ -2,12 +2,6 @@
   "title": "Your Basic Dashboard",
   "services": {
     "query": {
-      "idQueue": [
-        1,
-        2,
-        3,
-        4
-      ],
       "list": {
         "0": {
           "query": "*",
@@ -23,11 +17,6 @@
       ]
     },
     "filter": {
-      "idQueue": [
-        0,
-        1,
-        2
-      ],
       "list": {},
       "ids": []
     }

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

@@ -2,9 +2,6 @@
   "title": "Logstash Search",
   "services": {
     "query": {
-      "idQueue": [
-        1
-      ],
       "list": {
         "0": {
           "query": "{{ARGS.query || '*'}}",
@@ -20,9 +17,6 @@
       ]
     },
     "filter": {
-      "idQueue": [
-        1
-      ],
       "list": {
         "0": {
           "type": "time",

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

@@ -2,12 +2,6 @@
   "title": "A few notes",
   "services": {
     "query": {
-      "idQueue": [
-        1,
-        2,
-        3,
-        4
-      ],
       "list": {
         "0": {
           "query": "*",
@@ -23,11 +17,6 @@
       ]
     },
     "filter": {
-      "idQueue": [
-        0,
-        1,
-        2
-      ],
       "list": {},
       "ids": []
     }

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

@@ -17,7 +17,7 @@ function (angular, app, _) {
             $scope.reset_panel(_type);
             if(!_.isUndefined($scope.panel.type)) {
               $scope.panel.loadingEditor = true;
-              $scope.require(['panels/'+$scope.panel.type+'/module'], function () {
+              $scope.require(['panels/'+$scope.panel.type.replace(".","/") +'/module'], function () {
                 var template = '<div ng-controller="'+$scope.panel.type+'" ng-include="\'app/partials/paneladd.html\'"></div>';
                 elem.html($compile(angular.element(template))($scope));
                 $scope.panel.loadingEditor = false;

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

@@ -75,9 +75,10 @@ function (angular) {
           $scope.$watch(attr.type, function (name) {
             elem.addClass("ng-cloak");
             // load the panels module file, then render it in the dom.
+            var nameAsPath = name.replace(".", "/");
             $scope.require([
               'jquery',
-              'text!panels/'+name+'/module.html'
+              'text!panels/'+nameAsPath+'/module.html'
             ], function ($, moduleTemplate) {
               var $module = $(moduleTemplate);
               // top level controllers
@@ -88,7 +89,7 @@ function (angular) {
               if ($controllers.length) {
                 $controllers.first().prepend(editorTemplate);
                 $scope.require([
-                  'panels/'+name+'/module'
+                  'panels/'+nameAsPath+'/module'
                 ], function() {
                   loadModule($module);
                 });