kibana-sinatra 3.1.0.2 → 3.1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d6fb0ca5b9deb5f4ac4021e85db5ed2bc2f8cc1
-  data.tar.gz: 7fcc55bafac7329a79b8e8e56dc5991fe2eb4b2a
+  metadata.gz: 42a24f6644365d6e9ec2c9a9fca3bf4101d88217
+  data.tar.gz: 9e00965d345f23a7299aba04689a2127ab79fd22
 SHA512:
-  metadata.gz: 2054e744ba55b7f4299c1b88ff5780e67f58a6358d4473142e0e9ed7e4f28c4cb6d509f9111cd55f1e0264684b6b4c9c162a8a739e6886a56c9bd9b6ef21bbb8
-  data.tar.gz: 3f9f274511bfaf9edd1382b175e37d98a0dd24f7bd51e60086b71c41b1c18fa6707794e9b40172b24eabda4aff17a76cf444356fd2b89219f6aa086a2319120b
+  metadata.gz: 23127982f74f767ee8732d9a99f155785acf0624492ba76fb71d3de4c929affed233ed7ff01ad20da915947e47d422d3ec3fb595fc305df02ab0e3e660151009
+  data.tar.gz: 966859ccd8652a412a47aaf7613fb49f1ec118dfa97e7e26992a2ff1991dcc0b7b0224aefb07ac84c5bbb3d5f4fac05137e8ffaccfef2ba5a29818cd4ab21787

data/README.md

@@ -81,11 +81,23 @@ If you would like to include custom dashboard JSON files you can do so by overri
 
 This method should return the JSON as a string.
 
-You could then make that JSON file the default by overriding `default_route` like this:
+You could then make that JSON file the default by overriding `default_route`.
+
+Here is a full example:
 
 ```ruby
 module Kibana::Sinatra
   class Web
+
+    def render_dashboard(name)
+      case name
+      when "test.json"
+        "{}"
+      when "asdf.json"
+        {}.to_json
+      end
+    end
+
     def default_route
       "/dashboard/file/test.json"
     end
@@ -93,6 +105,8 @@ module Kibana::Sinatra
 end
 ```
 
+Please note there are some [built in dashboard](https://github.com/ianneub/kibana-sinatra/tree/master/lib/kibana/assets/app/dashboards) files that you will **NOT** be able to override.
+
 ## Versions
 
 Kibana-sinatra's version number will match the upstream Kibana version number, plus an additional build number. For example:

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

@@ -69,9 +69,25 @@ function (angular, $, _, appLevelRequire) {
     }
   };
 
-  app.config(function ($routeProvider, $controllerProvider, $compileProvider, $filterProvider, $provide) {
+  app.config(function ($routeProvider, $controllerProvider, $httpProvider, $compileProvider, $filterProvider, $provide) {
+
+
+    $httpProvider.interceptors.push(['$location', function($location) {
+      return {
+        responseError: function(resp) {
+          if (resp.status === 0) {
+            console.log("redirecting");
+            $location.path('/connectionFailed');
+            console.log(resp);
+          }
+        }
+      };
+    }]);
 
     $routeProvider
+      .when('/connectionFailed', {
+        templateUrl: 'app/partials/connectionFailed.html',
+      })
       .when('/dashboard', {
         templateUrl: 'app/partials/dashboard.html',
       })

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

@@ -58,6 +58,11 @@ function (angular, app, _) {
         $scope.row.panels.push(panel);
       };
 
+      $scope.duplicate_panel = function(panel) {
+        var clone = angular.copy(panel);
+        $scope.row.panels.push(clone);
+      };
+
       /** @scratch /panels/0
        * [[panels]]
        * = Panels

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

@@ -47,6 +47,11 @@ function (angular,$) {
               '<i class="icon-cog pointer" bs-tooltip="\'Configure\'"></i></span>'+
             '</span>' +
 
+            '<span class="row-button extra" ng-show="panel.editable != false">' +
+              '<span ng-click="duplicate_panel(panel)" class="pointer">'+
+              '<i class="icon-copy pointer" bs-tooltip="\'Duplicate\'"></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>'+

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

@@ -241,7 +241,7 @@ function (angular, app, _, L, localRequire) {
 
               // This could be made configurable?
               L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg', {
-                attribution: '"Data, imagery and map information provided by MapQuest, '+
+                attribution: 'Data, imagery and map information provided by MapQuest, '+
                   'OpenStreetMap <http://www.openstreetmap.org/copyright> and contributors, ODbL',
                 maxZoom: 18,
                 minZoom: 2

data/lib/kibana/assets/app/partials/connectionFailed.html

@@ -0,0 +1,20 @@
+
+<p>
+  <div class="row">
+    <div class="container-fluid main">
+      <div class="kibana-container container">
+        <div class="span12">
+          <h1>Connection Failed</h1>
+
+            <h5>Possibility #1: Your elasticsearch server is down or unreachable</h5>
+            This can be caused by a network outage, or a failure of the Elasticsearch process. If you have recently run a query that required a <i>terms</i> facet to be executed it is possible the process has run out of memory and stopped. Be sure to check your Elasticsearch logs for any sign of memory pressure.
+            <h5>Possibility #2: You are running Elasticsearch 1.4 or higher</h5>
+            Elasticsearch 1.4 ships with a security setting that prevents Kibana from connecting. You will need to set <i>http.cors.allow-origin</i> in your <i>elasticsearch.yml</i> to the correct protocol, hostname, and port (if not 80) that your access Kibana from. Note that if you are running Kibana in a sub-url, you should exclude the sub-url path and only include the protocol, hostname and port. For example, <i>http://mycompany.com:8080</i>, not <i>http://mycompany.com:8080/kibana</i>.
+
+            <h5>Click back, or the home button, when you have resolved the connection issue</h5>
+          </ol>
+        </div>
+      </div>
+    </div>
+  </div>
+</p>

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

@@ -77,8 +77,9 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
     this.last = {};
     this.availablePanels = [];
 
-    $rootScope.$on('$routeChangeSuccess',function(){
+    $rootScope.$on('$routeChangeSuccess', function () {
       // Clear the current dashboard to prevent reloading
+      if ($location.path() === '/connectionFailed') { return; }
       self.current = {};
       self.indices = [];
       esVersion.isMinimum().then(function(isMinimum) {

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

@@ -37,7 +37,7 @@ function (angular, _, config, moment) {
       var something;
       indices = _.uniq(_.map(indices,  encodeURIComponent));
 
-      something = ejs.client.get("/" + indices.join(",") + "/_aliases?ignore_missing=true",
+      something = ejs.client.get("/" + indices.join(",") + "/_aliases?ignore_unavailable=true&ignore_missing=true",
         undefined, undefined, function (data, p) {
           if (p === 404) {
             return [];

data/lib/kibana/assets/vendor/angular/angular-strap.js

@@ -772,7 +772,8 @@ angular.module('$strap.directives').directive('bsTimepicker', [
 angular.module('$strap.directives').directive('bsTooltip', [
   '$parse',
   '$compile',
-  function ($parse, $compile) {
+  '$sanitize',
+  function ($parse, $compile, $sanitize) {
     return {
       restrict: 'A',
       scope: true,
@@ -795,7 +796,7 @@ angular.module('$strap.directives').directive('bsTooltip', [
         }
         element.tooltip({
           title: function () {
-            return angular.isFunction(value) ? value.apply(null, arguments) : value;
+            return $sanitize(angular.isFunction(value) ? value.apply(null, arguments) : value);
           },
           html: true
         });
@@ -875,4 +876,4 @@ angular.module('$strap.directives').directive('bsTypeahead', [
       }
     };
   }
-]);
+]);

data/lib/kibana/sinatra/version.rb

@@ -1,5 +1,5 @@
 module Kibana
   module Sinatra
-    VERSION = "3.1.0.2"
+    VERSION = "3.1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kibana-sinatra
 version: !ruby/object:Gem::Version
-  version: 3.1.0.2
+  version: 3.1.1.0
 platform: ruby
 authors:
 - Ian Neubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -249,6 +249,7 @@ files:
 - lib/kibana/assets/app/panels/trends/editor.html
 - lib/kibana/assets/app/panels/trends/module.html
 - lib/kibana/assets/app/panels/trends/module.js
+- lib/kibana/assets/app/partials/connectionFailed.html
 - lib/kibana/assets/app/partials/dashLoader.html
 - lib/kibana/assets/app/partials/dashLoaderShare.html
 - lib/kibana/assets/app/partials/dashboard.html