kibana-sinatra 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21377d439be1057f9413662fee65a2a6bd0328c4
-  data.tar.gz: 3d3c501f3c505ff9c8408d679e0e8eb6e44a26bf
+  metadata.gz: 0ae246456b81df5e196942cf5cc54902c20963cf
+  data.tar.gz: d8747df503e6a8317618d611d5d19200abecfc60
 SHA512:
-  metadata.gz: 1881dec9046579b356dd06023529ba62b17f491c74d0060a31ae19fdcd271b04658ec2c891ba10181940a01eb7e82813caca46e565ec78115789c9b565d2a94e
-  data.tar.gz: e00e61cb597a791c5f3c7a383c55300b05166f65b1410dd038fbd02e2e40e70a7ec26763ade25ccfb246f0343095500a8f4bc2ee4ce81d70498b71e787e989a4
+  metadata.gz: 7cf30e392b4ce6c72bd8f9d8c28b78d3b4d15142003b91669f1009a601bd96cfa2641f3ebbe6336c150c8c1cdb1b1c38d3987fef762e4866af861ceeda65cdac
+  data.tar.gz: 12b2a2c6aa112dad0b28f9c2012177ebbf3a2c8b2ffef6bd0a48014fc2d218eef27420f5ca3d9a44b69cf55b6bce8f947ae36e4fc0e2be10addcfa06834b1066

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 [f194336277280467f4d27ab8b65c8f69c5c7122e](https://github.com/elasticsearch/kibana/commits/master)
+It is currently based on Kibana 3 commit [0f16e1cc6184ed101e63106b4b386cebc3e92652](https://github.com/elasticsearch/kibana/commits/0f16e1cc6184ed101e63106b4b386cebc3e92652)
 
 ## Installation
 
@@ -36,7 +36,7 @@ module Kibana::Sinatra
     def elasticsearch_url
       "http://\"+window.location.hostname+\":9200"
     end
-    
+
     def kibana_index
       "kibana-int"
     end
@@ -47,11 +47,32 @@ end
 In your `config/routes.rb` file mount the Kibana::Sinatra::Web class to a route:
 
     mount Kibana::Sinatra::Web => '/kibana', :trailing_slash => true
-    
+
 The trailing slash is important due to the way Kibana links to CSS & JS files.
 
 Start your server and you should now be able to load `/kibana/` and Kibana 3 should start up!
 
+### Launch as Rack app
+
+First you will need to configure Kibana's config.js same as "Inside Rails".
+
+And add config.ru on top of your directory.
+
+```ruby
+require 'sinatra'
+require 'kibana/sinatra/web'
+
+# If you need to configure elasticsearch_url, put your configuration here just like the Rails example.
+
+run Kibana::Sinatra::Web
+```
+
+At last, you need to just run rackup.
+
+```
+rackup
+```
+
 ## Contributing
 
 1. Fork it
@@ -59,3 +80,7 @@ Start your server and you should now be able to load `/kibana/` and Kibana 3 sho
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Contributors
+
+Thanks for all the help to our [awesome contributors](https://github.com/ianneub/kibana-sinatra/graphs/contributors)!

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

@@ -12,9 +12,10 @@ define([
   'angular-strap',
   'angular-dragdrop',
   'extend-jquery',
-  'bindonce'
+  'bindonce',
 ],
 function (angular, $, _, appLevelRequire) {
+
   "use strict";
 
   var app = angular.module('kibana', []),
@@ -25,6 +26,12 @@ function (angular, $, _, appLevelRequire) {
     // features if we define them after boot time
     register_fns = {};
 
+  // This stores the Kibana revision number, @REV@ is replaced by grunt.
+  app.constant('kbnVersion',"@REV@");
+
+  // Use this for cache busting partials
+  app.constant('cacheBust',"cache-bust="+Date.now());
+
   /**
    * Tells the application to watch the module, once bootstraping has completed
    * the modules controller, service, etc. functions will be overwritten to register directly
@@ -59,6 +66,7 @@ function (angular, $, _, appLevelRequire) {
   };
 
   app.config(function ($routeProvider, $controllerProvider, $compileProvider, $filterProvider, $provide) {
+
     $routeProvider
       .when('/dashboard', {
         templateUrl: 'app/partials/dashboard.html',
@@ -72,6 +80,7 @@ function (angular, $, _, appLevelRequire) {
       .otherwise({
         redirectTo: 'dashboard'
       });
+
     // this is how the internet told me to dynamically add modules :/
     register_fns.controller = $controllerProvider.register;
     register_fns.directive  = $compileProvider.directive;
@@ -128,9 +137,12 @@ function (angular, $, _, appLevelRequire) {
               var $scope = this;
               $scope.requireContext(deps, function () {
                 var deps = _.toArray(arguments);
-                $scope.$apply(function () {
-                  fn.apply($scope, deps);
-                });
+                // Check that this is a valid scope.
+                if($scope.$id) {
+                  $scope.$apply(function () {
+                    fn.apply($scope, deps);
+                  });
+                }
               });
             };
           }]);

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

@@ -50,7 +50,7 @@ require.config({
     },
 
     angular: {
-      deps: ['jquery'],
+      deps: ['jquery','config'],
       exports: 'angular'
     },
 
@@ -67,6 +67,7 @@ require.config({
     },
 
     // simple dependency declaration
+    //
     'jquery-ui':            ['jquery'],
     'jquery.flot':          ['jquery'],
     'jquery.flot.byte':     ['jquery', 'jquery.flot'],

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

@@ -10,9 +10,10 @@ function (_) {
      * @type {Object}
      */
     var defaults = {
-      elasticsearch : "http://"+window.location.hostname+":9200",
-      panel_names   : [],
-      kibana_index  : 'kibana-int'
+      elasticsearch     : "http://"+window.location.hostname+":9200",
+      panel_names       : [],
+      kibana_index      : 'kibana-int',
+      default_route     : '/dashboard/file/default.json'
     };
 
     // This initializes a new hash on purpose, to avoid adding parameters to

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

@@ -31,7 +31,7 @@ function (angular, config, _) {
   module.controller('DashCtrl', function(
     $scope, $route, ejsResource, fields, dashboard, alertSrv, panelMove, esVersion) {
 
-    $scope.requiredElasticSearchVersion = ">=0.20.5";
+    $scope.requiredElasticSearchVersion = ">=0.90.3";
 
     $scope.editor = {
       index: 0

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

@@ -7,7 +7,7 @@ function (angular, _) {
 
   var module = angular.module('kibana.controllers');
 
-  module.controller('dashLoader', function($scope, $http, timer, dashboard, alertSrv) {
+  module.controller('dashLoader', function($scope, $http, timer, dashboard, alertSrv, $location) {
     $scope.loader = dashboard.current.loader;
 
     $scope.init = function() {
@@ -35,8 +35,8 @@ function (angular, _) {
     };
 
     $scope.set_default = function() {
-      if(dashboard.set_default()) {
-        alertSrv.set('Local Default Set',dashboard.current.title+' has been set as your local default','success',5000);
+      if(dashboard.set_default($location.path())) {
+        alertSrv.set('Home Set','This page has been set as your default Kibana dashboard','success',5000);
       } else {
         alertSrv.set('Incompatible Browser','Sorry, your browser is too old for this feature','error',5000);
       }
@@ -44,7 +44,8 @@ function (angular, _) {
 
     $scope.purge_default = function() {
       if(dashboard.purge_default()) {
-        alertSrv.set('Local Default Clear','Your local default dashboard has been cleared','success',5000);
+        alertSrv.set('Local Default Clear','Your Kibana default dashboard has been reset to the default',
+          'success',5000);
       } else {
         alertSrv.set('Incompatible Browser','Sorry, your browser is too old for this feature','error',5000);
       }

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

@@ -26,6 +26,7 @@
   "index": {
     "interval": "none",
     "pattern": "[logstash-]YYYY.MM.DD",
-    "default": "_all"
+    "default": "_all",
+    "warm_fields": false
   }
 }

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

@@ -64,61 +64,14 @@
   "index": {
     "interval": "none",
     "pattern": "[logstash-]YYYY.MM.DD",
-    "default": "_all"
+    "default": "_all",
+    "warm_fields": false
   },
   "style": "dark",
   "failover": false,
   "panel_hints": true,
-  "pulldowns": [
-    {
-      "type": "query",
-      "collapse": true,
-      "notice": false,
-      "query": "*",
-      "pinned": true,
-      "history": [],
-      "remember": 10
-    },
-    {
-      "type": "filtering",
-      "collapse": true,
-      "notice": false
-    }
-  ],
-  "nav": [
-    {
-      "type": "timepicker",
-      "collapse": false,
-      "notice": false,
-      "status": "Stable",
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ],
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "timefield": "@timestamp",
-      "now": true,
-      "filter_id": 0
-    }
-  ],
+  "pulldowns": [],
+  "nav": [],
   "loader": {
     "save_gist": false,
     "save_elasticsearch": true,

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

@@ -200,7 +200,8 @@
   "index": {
     "interval": "none",
     "pattern": "[logstash-]YYYY.MM.DD",
-    "default": "_all"
+    "default": "_all",
+    "warm_fields": false
   },
   "style": "dark",
   "failover": false,

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

@@ -128,6 +128,8 @@
           },
           "overflow": "min-height",
           "fields": [],
+          "localTime": true,
+          "timeField": "@timestamp",
           "highlight": [],
           "sortable": true,
           "header": true,

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

@@ -89,7 +89,8 @@
   "index": {
     "interval": "none",
     "pattern": "[logstash-]YYYY.MM.DD",
-    "default": "_all"
+    "default": "_all",
+    "warm_fields": false
   },
   "style": "dark",
   "failover": false,

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

@@ -12,6 +12,11 @@ function (angular, app, _) {
       return {
         restrict: 'A',
         link: function($scope, elem) {
+
+          $scope.$on("$destroy",function() {
+            elem.remove();
+          });
+
           $scope.$watch('panel.type', function() {
             var _type = $scope.panel.type;
             $scope.reset_panel(_type);

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

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

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

@@ -0,0 +1,34 @@
+define([
+  'angular',
+  'app',
+],
+function (angular) {
+  'use strict';
+
+  angular
+    .module('kibana.directives')
+    .directive('configModal', function($modal,$q) {
+      return {
+        restrict: 'A',
+        link: function(scope, elem) {
+          // create a new modal. Can't reuse one modal unforunately as the directive will not
+          // re-render on show.
+          elem.bind('click',function(){
+            var panelModal = $modal({
+              template: './app/partials/paneleditor.html',
+              persist: true,
+              show: false,
+              scope: scope,
+              keyboard: false
+            });
+
+            // and show it
+            $q.when(panelModal).then(function(modalEl) {
+              modalEl.modal('show');
+            });
+            scope.$apply();
+          });
+        }
+      };
+    });
+});

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

@@ -13,7 +13,6 @@ function (angular) {
 
         '<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">'+
@@ -37,7 +36,7 @@ function (angular) {
           '</span>' +
 
           '<span class="row-button extra" ng-show="panel.editable != false">' +
-            '<span bs-modal="\'app/partials/paneleditor.html\'" class="pointer">'+
+            '<span config-modal class="pointer">'+
             '<i class="icon-cog pointer" bs-tooltip="\'Configure\'"></i></span>'+
           '</span>' +
 
@@ -62,23 +61,30 @@ function (angular) {
         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();
 
           // compile the module and uncloack. We're done
           function loadModule($module) {
             $module.appendTo(elem);
             elem.wrap(container);
             /* jshint indent:false */
-            $compile(elem.contents())($scope);
+            $compile(elem.contents())(newScope);
             elem.removeClass("ng-cloak");
           }
 
+          newScope.$on('$destroy',function(){
+            elem.unbind();
+            elem.remove();
+          });
+
           $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/'+nameAsPath+'/module.html'
+              'text!panels/'+nameAsPath+'/module.html',
+              'text!panels/'+nameAsPath+'/editor.html'
             ], function ($, moduleTemplate) {
               var $module = $(moduleTemplate);
               // top level controllers

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

@@ -60,14 +60,16 @@ function (angular, _) {
             loadController(name);
           });
 
-          $scope.$watch(attr.panel, function (panel) {
-            // If the panel attribute is specified, create a new scope. This ruins configuration
-            // so don't do it with anything that needs to use editor.html
-            if(!_.isUndefined(panel)) {
-              $scope = $scope.$new();
-              $scope.panel = angular.fromJson(panel);
-            }
-          });
+          if(attr.panel) {
+            $scope.$watch(attr.panel, function (panel) {
+              // If the panel attribute is specified, create a new scope. This ruins configuration
+              // so don't do it with anything that needs to use editor.html
+              if(!_.isUndefined(panel)) {
+                $scope = $scope.$new();
+                $scope.panel = angular.fromJson(panel);
+              }
+            });
+          }
         }
       };
     });

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

@@ -1,17 +1,17 @@
-  <div class="row-fluid">
-    <div class="span4">
+  <div class="editor-row">
+    <div class="editor-option">
       <form>
         <h6>Coordinate Field <tip>geoJSON array! Long,Lat NOT Lat,Long</tip></h6>
         <input  bs-typeahead="fields.list" type="text" class="input-small" ng-model="panel.field">
       </form>
     </div>
-    <div class="span4">
+    <div class="editor-option">
       <form>
         <h6>Tooltip Field</h6>
         <input  bs-typeahead="fields.list" type="text" class="input-small" ng-model="panel.tooltip">
       </form>
     </div>
-    <div class="span2"><h6>Max Points</h6>
+    <div class="editor-option"><h6>Max Points</h6>
       <input type="number" class="input-small" ng-model="panel.size">
     </div>
   </div>