kibana-sinatra 3.0.0.0 → 3.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d9b44942fdaddd855873685bacc3370c477558c
-  data.tar.gz: 0b2bc7f6628e4d34158a04292c5578e95b72b504
+  metadata.gz: 8a60578b7212ab46b0322991c4c6bdf4248008bb
+  data.tar.gz: 75631dc7670f9a33295b221bf6b2b97481c7d6d4
 SHA512:
-  metadata.gz: 93c52d30d9dc65f8016595114e1688ca75992ac5c5d124e21b0d9f6d30d2dd648b3db86af2793ab68351fd8b3acef95d4f001586ee295188e2a307c35a1d5bd7
-  data.tar.gz: 46b16ff2fe63598b93d3c68ab5ff0d66e35fe0242535ad6fdaa225827b53f5d5e8545b8342b0ce329bc24645384066521deaa864be2495e26ce469e6b6b678c3
+  metadata.gz: 3899211b14c10cf4d02a9157d034eb205a229ef03fe141eba9c907a0be4ffb65f8f01965a9262111c0dc7f2ac097e7f08bdc6018daa6c5a31c444a7835608876
+  data.tar.gz: 52b59580df2b66f222bb1a8d98963812ef70f9bd198d1e8a7e1c625bd9eb079e1106a94018c1cf80f7832f6688523f384627d8356eb3ab2942f372dd23406cfe

data/README.md

@@ -4,9 +4,7 @@
 [![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 [84ed4069f7797a9e364e050063e6897927d2a0d7](https://github.com/elasticsearch/kibana/commits/84ed4069f7797a9e364e050063e6897927d2a0d7)
+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](https://github.com/rack/rack) based system, including [Rails](http://www.rubyonrails.org/).
 
 ## Installation
 
@@ -73,6 +71,14 @@ At last, you need to just run rackup.
 rackup
 ```
 
+## Versions
+
+Kibana-sinatra's version number will match the upstream Kibana version number, plus an additional build number. For example:
+
+Kibana-sinatra v.`3.0.0.0` is equivalent to upstream Kibana v.`3.0.0`, and is our build `0`.
+
+We aim to keep in step with Kibana's released versions.
+
 ## Contributing
 
 1. Fork it

data/lib/kibana/assets/app/components/extend-jquery.js

@@ -44,4 +44,4 @@ function ($) {
   })();
 
   return $;
-});
+});

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

@@ -629,4 +629,4 @@ function($, _, moment) {
   };
 
   return kbn;
-});
+});

data/lib/kibana/assets/app/components/lodash.extended.js

@@ -31,4 +31,4 @@ function (_) {
   });
 
   return _;
-});
+});

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

@@ -9,6 +9,7 @@ require.config({
     settings:                 'components/settings',
     kbn:                      'components/kbn',
 
+    vendor:                   '../vendor',
     css:                      '../vendor/require/css',
     text:                     '../vendor/require/text',
     moment:                   '../vendor/moment',

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

@@ -3,4 +3,4 @@ define([
   './dashLoader',
   './row',
   './pulldown'
-], function () {});
+], function () {});

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

@@ -108,4 +108,4 @@ function (angular, config, _) {
 
     $scope.init();
   });
-});
+});

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

@@ -42,4 +42,4 @@ function (angular, app, _) {
     }
   );
 
-});
+});

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

@@ -109,4 +109,4 @@ function (angular, app, _) {
     }
   );
 
-});
+});

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

@@ -29,4 +29,4 @@
     "default": "_all",
     "warm_fields": false
   }
-}
+}

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

@@ -269,4 +269,4 @@
     }
   ],
   "refresh": false
-}
+}

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

@@ -158,4 +158,4 @@
     }
   ],
   "refresh": false
-}
+}

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

@@ -32,4 +32,4 @@ function (angular, app, _) {
         }
       };
     });
-});
+});

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

@@ -10,4 +10,4 @@ define([
   './confirmClick',
   './esVersion',
   './configModal'
-], function () {});
+], function () {});

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

@@ -31,4 +31,4 @@ function (angular, app, _) {
         }
       };
     });
-});
+});

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

@@ -49,4 +49,4 @@ function (angular,_) {
         }
       };
     });
-});
+});

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

@@ -23,4 +23,4 @@ function (angular) {
       },
     };
   });
-});
+});

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

@@ -34,4 +34,4 @@ function (angular) {
       }
     };
   });
-});
+});

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

@@ -21,4 +21,4 @@ function (angular) {
         }
       };
     });
-});
+});

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

@@ -128,4 +128,4 @@ function (angular,$) {
       };
     });
 
-});
+});

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

@@ -9,7 +9,7 @@ function (angular, _) {
     .module('kibana.directives')
     .directive('kibanaSimplePanel', function($compile) {
       var panelLoading = '<span ng-show="panelMeta.loading == true">' +
-        '<span style="font-size:72px;font-weight:200">'+
+        '<span style="font-size:24px;font-weight:200">'+
           '<i class="icon-spinner icon-spin"></i> loading ...' +
         '</span>'+
       '</span>';
@@ -74,4 +74,4 @@ function (angular, _) {
       };
     });
 
-});
+});

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

@@ -17,4 +17,4 @@ function (angular) {
       };
     }]);
 
-});
+});

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

@@ -22,4 +22,4 @@ function (angular) {
         }
       };
     });
-});
+});

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

@@ -17,4 +17,4 @@ function (angular, kbn) {
         }
       };
     });
-});
+});

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

@@ -56,4 +56,4 @@ function (angular, _) {
     };
   });
 
-});
+});

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

@@ -16,8 +16,8 @@ define([
 
   module.filter('pinnedQuery', function(querySrv) {
     return function( items, pinned) {
-      var ret = _.filter(querySrv.ids,function(id){
-        var v = querySrv.list[id];
+      var ret = _.filter(querySrv.ids(),function(id){
+        var v = querySrv.list()[id];
         if(!_.isUndefined(v.pin) && v.pin === true && pinned === true) {
           return true;
         }
@@ -110,6 +110,14 @@ define([
     };
   });
 
+  module.filter('editable', function () {
+    return function (data) {
+      return _.filter(data, function (item) {
+        return item.editable !== false;
+      });
+    };
+  });
+
   module.filter('gistid', function() {
     var gist_pattern = /(\d{5,})|([a-z0-9]{10,})|(gist.github.com(\/*.*)\/[a-z0-9]{5,}\/*$)/;
     return function(input) {
@@ -122,4 +130,4 @@ define([
     };
   });
 
-});
+});

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

@@ -145,7 +145,7 @@ function (angular, app, _, L, localRequire) {
         var request = $scope.ejs.Request().indices(dashboard.indices[_segment])
           .query($scope.ejs.FilteredQuery(
             boolQuery,
-            filterSrv.getBoolFilter(filterSrv.ids).must($scope.ejs.ExistsFilter($scope.panel.field))
+            filterSrv.getBoolFilter(filterSrv.ids()).must($scope.ejs.ExistsFilter($scope.panel.field))
           ))
           .fields([$scope.panel.field,$scope.panel.tooltip])
           .size($scope.panel.size);
@@ -255,7 +255,7 @@ function (angular, app, _, L, localRequire) {
 
             _.each(scope.data, function(p) {
               if(!_.isUndefined(p.tooltip) && p.tooltip !== '') {
-                markerList.push(L.marker(p.coordinates).bindLabel(p.tooltip));
+                markerList.push(L.marker(p.coordinates).bindLabel(_.isArray(p.tooltip) ? p.tooltip[0] : p.tooltip));
               } else {
                 markerList.push(L.marker(p.coordinates));
               }

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

@@ -33,48 +33,48 @@
   </style>
 
   <div class='filtering-container'>
-    <span ng-show="filterSrv.ids.length == 0">
+    <span ng-show="dashboard.current.services.filter.ids.length == 0">
       <h5>No filters available</h5>
     </span>
-    <div ng-repeat="id in filterSrv.ids" class="small filter-panel-filter">
+    <div ng-repeat="id in dashboard.current.services.filter.ids" class="small filter-panel-filter">
       <div>
-        <strong>{{filterSrv.list[id].type}}</strong>
-        <span ng-show="!filterSrv.list[id].editing && isEditable(filterSrv.list[id])" class="filter-mandate" ng-click="filterSrv.list[id].editing = true">
-          {{filterSrv.list[id].mandate}}
+        <strong>{{dashboard.current.services.filter.list[id].type}}</strong>
+        <span ng-show="!dashboard.current.services.filter.list[id].editing && isEditable(dashboard.current.services.filter.list[id])" class="filter-mandate" ng-click="dashboard.current.services.filter.list[id].editing = true">
+          {{dashboard.current.services.filter.list[id].mandate}}
         </span>
-        <span ng-show="!isEditable(filterSrv.list[id])">
-          {{filterSrv.list[id].mandate}}
+        <span ng-show="!isEditable(dashboard.current.services.filter.list[id])">
+          {{dashboard.current.services.filter.list[id].mandate}}
         </span>
 
-        <i ng-class="getFilterClass(filterSrv.list[id])" class="icon-circle"></i>
+        <i ng-class="getFilterClass(dashboard.current.services.filter.list[id])" class="icon-circle"></i>
 
-        <span ng-show="filterSrv.list[id].editing">
-          <select class="input-small" ng-model="filterSrv.list[id].mandate" ng-options="f for f in ['must','mustNot','either']"></select>
+        <span ng-show="dashboard.current.services.filter.list[id].editing">
+          <select class="input-small" ng-model="dashboard.current.services.filter.list[id].mandate" ng-options="f for f in ['must','mustNot','either']"></select>
         </span>
 
         <i class="filter-action pointer icon-remove" bs-tooltip="'Remove'" ng-click="remove(id)"></i>
-        <i class="filter-action pointer" ng-class="{'icon-check': filterSrv.list[id].active,'icon-check-empty': !filterSrv.list[id].active}" bs-tooltip="'Toggle'" ng-click="toggle(id)"></i>
-        <i class="filter-action pointer icon-edit" ng-hide="filterSrv.list[id].editing || !isEditable(filterSrv.list[id])" bs-tooltip="'Edit'" ng-click="filterSrv.list[id].editing = true"></i>
+        <i class="filter-action pointer" ng-class="{'icon-check': dashboard.current.services.filter.list[id].active,'icon-check-empty': !dashboard.current.services.filter.list[id].active}" bs-tooltip="'Toggle'" ng-click="toggle(id)"></i>
+        <i class="filter-action pointer icon-edit" ng-hide="dashboard.current.services.filter.list[id].editing || !isEditable(dashboard.current.services.filter.list[id])" bs-tooltip="'Edit'" ng-click="dashboard.current.services.filter.list[id].editing = true"></i>
       </div>
 
-      <div ng-hide="filterSrv.list[id].editing && isEditable(filterSrv.list[id])">
+      <div ng-hide="dashboard.current.services.filter.list[id].editing && isEditable(dashboard.current.services.filter.list[id])">
         <ul class="unstyled">
-          <li ng-repeat="(key,value) in filterSrv.list[id] track by $index" ng-show="show_key(key)">
+          <li ng-repeat="(key,value) in dashboard.current.services.filter.list[id] track by $index" ng-show="show_key(key)">
             <strong>{{key}}</strong> : {{value}}
           </li>
         </ul>
       </div>
-      <form ng-show="filterSrv.list[id].editing && isEditable(filterSrv.list[id])">
+      <form ng-show="dashboard.current.services.filter.list[id].editing && isEditable(dashboard.current.services.filter.list[id])">
         <ul class="unstyled">
-          <li ng-repeat="key in _.keys(filterSrv.list[id])" ng-show="show_key(key)">
-            <strong>{{key}}</strong> : <input type='text' ng-model="filterSrv.list[id][key]">
+          <li ng-repeat="key in _.keys(dashboard.current.services.filter.list[id])" ng-show="show_key(key)">
+            <strong>{{key}}</strong> : <input type='text' ng-model="dashboard.current.services.filter.list[id][key]">
           </li>
         </ul>
         <div>
 
-          <button type="submit" ng-click="filterSrv.list[id].editing=undefined;refresh()" class="filter-apply btn btn-mini btn-success" bs-tooltip="'Save and refresh'">Apply</button>
+          <button type="submit" ng-click="dashboard.current.services.filter.list[id].editing=undefined;refresh()" class="filter-apply btn btn-mini btn-success" bs-tooltip="'Save and refresh'">Apply</button>
 
-          <button ng-click="filterSrv.list[id].editing=undefined" class="filter-apply btn-mini btn" bs-tooltip="'Save without refresh'">Save</button>
+          <button ng-click="dashboard.current.services.filter.list[id].editing=undefined" class="filter-apply btn-mini btn" bs-tooltip="'Save without refresh'">Save</button>
         </div>
       </form>
     </div>

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

@@ -27,6 +27,8 @@ function (angular, app, _) {
     };
     _.defaults($scope.panel,_d);
 
+    $scope.dashboard = dashboard;
+
     $scope.$on('filter', function() {
       $scope.row.notice = true;
     });
@@ -41,7 +43,7 @@ function (angular, app, _) {
 
     // This function should be moved to the service
     $scope.toggle = function(id) {
-      filterSrv.list[id].active = !filterSrv.list[id].active;
+      dashboard.current.services.filter.list[id].active = !dashboard.current.services.filter.list[id].active;
       dashboard.refresh();
     };
 

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

@@ -131,7 +131,7 @@ define([
 
       request = request
         .query(boolQuery)
-        .filter(filterSrv.getBoolFilter(filterSrv.ids))
+        .filter(filterSrv.getBoolFilter(filterSrv.ids()))
         .size(0);
 
       $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);

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

@@ -22,6 +22,9 @@
     <div class="editor-option">
       <label class="small">Derivative <tip>Plot the change per interval in the series</tip></label><input type="checkbox" ng-model="panel.derivative" ng-checked="panel.derivative" ng-change="set_refresh(true)">
     </div>
+    <div class="editor-option">
+      <label class="small">Zero fill <tip>Fills zeros in gaps.</tip></label><input type="checkbox" ng-model="panel.zerofill" ng-checked="panel.zerofill" ng-change="set_refresh(true)">
+    </div>
   </div>
   <div class="section">
   <h5>Time Options</h5>

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

@@ -226,6 +226,7 @@ function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
       /** @scratch /panels/histogram/3
        * derivative:: Show each point on the x-axis as the change from the previous point
        */
+
       derivative    : false,
       /** @scratch /panels/histogram/3
        * tooltip object::
@@ -345,7 +346,7 @@ function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
       _.each(queries, function(q) {
         var query = $scope.ejs.FilteredQuery(
           querySrv.toEjsObj(q),
-          filterSrv.getBoolFilter(filterSrv.ids)
+          filterSrv.getBoolFilter(filterSrv.ids())
         );
 
         var facet = $scope.ejs.DateHistogramFacet(q.id);
@@ -417,7 +418,7 @@ function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
                 interval: _interval,
                 start_date: _range && _range.from,
                 end_date: _range && _range.to,
-                fill_style: $scope.panel.derivative ? 'null' : 'minimal'
+                fill_style: $scope.panel.derivative ? 'null' : $scope.panel.zerofill ? 'minimal' : 'no'
               };
               time_series = new timeSeries.ZeroFilled(tsOpts);
               hits = 0;
@@ -772,8 +773,7 @@ function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
         var $tooltip = $('<div>');
         elem.bind("plothover", function (event, pos, item) {
           var group, value, timestamp, interval;
-          interval = scope.panel.legend ?
-            "" : " per " + (scope.panel.scaleSeconds ? '1s' : scope.panel.interval);
+          interval = " per " + (scope.panel.scaleSeconds ? '1s' : scope.panel.interval);
           if (item) {
             if (item.series.info.alias || scope.panel.tooltip.query_as_alias) {
               group = '<small style="font-size:0.9em;">' +

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

@@ -122,7 +122,7 @@ define([
       _.each(queries, function(q) {
         var _q = $scope.ejs.FilteredQuery(
           querySrv.toEjsObj(q),
-          filterSrv.getBoolFilter(filterSrv.ids));
+          filterSrv.getBoolFilter(filterSrv.ids()));
 
         request = request
           .facet($scope.ejs.QueryFacet(q.id)

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

@@ -121,7 +121,7 @@ function (angular, app, _, $) {
           .facetFilter($scope.ejs.QueryFilter(
             $scope.ejs.FilteredQuery(
               boolQuery,
-              filterSrv.getBoolFilter(filterSrv.ids)
+              filterSrv.getBoolFilter(filterSrv.ids())
               )))).size(0);
 
       $scope.populate_modal(request);

data/lib/kibana/assets/app/panels/query/editors/topN.html

@@ -1,12 +1,12 @@
   <fieldset>
     <label class="small">Field</label><br>
-    <input ng-model="querySrv.list[id].field" type="text" bs-typeahead="fields.list" placeholder="Field">
+    <input ng-model="dashboard.current.services.query.list[id].field" type="text" bs-typeahead="fields.list" placeholder="Field">
     <p>
     <label class="small">Count</label><br>
-    <input ng-model="querySrv.list[id].size" type="number">
+    <input ng-model="dashboard.current.services.query.list[id].size" type="number">
     <p>
     <label class="small">Union</label><br>
-      <select class="input-small" ng-model="querySrv.list[id].union">
+      <select class="input-small" ng-model="dashboard.current.services.query.list[id].union">
       <option ng-repeat="mode in ['none','AND','OR']">{{mode}}</option>
     </select>
   </fieldset>