kibana-sinatra 0.0.8 → 3.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0ab86a8330f137d771fbb28969b03b700f88fa
-  data.tar.gz: ebc86b24d4d6bf697114cb8776d37a6ae5a8f3a6
+  metadata.gz: 1d9b44942fdaddd855873685bacc3370c477558c
+  data.tar.gz: 0b2bc7f6628e4d34158a04292c5578e95b72b504
 SHA512:
-  metadata.gz: 72d3a09749d602f4e71f234cb43d62ef619d31e66878a797aac8375de9b252dcd97f8fe70970ed651c9577e19eaff0935e6ecf7b4ef32211e9a1e37a17c94091
-  data.tar.gz: e41655af7a3c3220abdfb7b4534d51dc2f2e0611260e29bbf7f3386bbb80d7ebec8d60f737c406ab46d91fcd54b5dc4005cad73f09cc8928b7b227e0674e9187
+  metadata.gz: 93c52d30d9dc65f8016595114e1688ca75992ac5c5d124e21b0d9f6d30d2dd648b3db86af2793ab68351fd8b3acef95d4f001586ee295188e2a307c35a1d5bd7
+  data.tar.gz: 46b16ff2fe63598b93d3c68ab5ff0d66e35fe0242535ad6fdaa225827b53f5d5e8545b8342b0ce329bc24645384066521deaa864be2495e26ce469e6b6b678c3

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

@@ -228,19 +228,19 @@ function($, _, moment) {
       return {
         sec: kbn.intervals_in_seconds[matches[2]],
         type: matches[2],
-        count: parseInt(matches[1], 10)
+        count: parseFloat(matches[1])
       };
     }
   };
 
   kbn.interval_to_ms = function(string) {
     var info = kbn.describe_interval(string);
-    return info.sec * 1000 * info.count;
+    return Math.ceil(info.sec * 1000 * info.count);
   };
 
   kbn.interval_to_seconds = function (string) {
     var info = kbn.describe_interval(string);
-    return info.sec * info.count;
+    return Math.ceil(info.sec * info.count);
   };
 
   // This should go away, moment.js can do this

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

@@ -1,22 +1,3 @@
-/** @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',
@@ -31,6 +12,8 @@ function (angular, config, _) {
   module.controller('DashCtrl', function(
     $scope, $route, ejsResource, fields, dashboard, alertSrv, panelMove, esVersion, kbnVersion) {
 
+    $scope.Math = Math;
+
     $scope.editor = {
       index: 0
     };

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

@@ -167,7 +167,7 @@
           "pages": 5,
           "offset": 0,
           "sort": [
-            "_id",
+            "_score",
             "desc"
           ],
           "style": {

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

@@ -6,6 +6,6 @@
   </style>
   <!-- This solution might work well for other panels that have trouble with heights -->
   <div  style="padding-right:10px;padding-top:10px;height:{{panel.height|| row.height}};overflow:hidden">
-    <div bettermap id='bettermap' params="{{panel}}" style="height:100%"></div>
+    <div bettermap id="{{$id}}" params="{{panel}}" style="height:100%"></div>
   </div>
 </div>

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

@@ -1,8 +1,10 @@
 /** @scratch /panels/5
+ *
  * include::panels/bettermap.asciidoc[]
  */
 
 /** @scratch /panels/bettermap/0
+ *
  * == Bettermap
  * Status: *Experimental*
  *
@@ -60,6 +62,7 @@ function (angular, app, _, L, localRequire) {
     // Set and populate defaults
     var _d = {
       /** @scratch /panels/bettermap/3
+       *
        * === Parameters
        *
        * field:: The field that contains the coordinates, in geojson format. GeoJSON is
@@ -80,6 +83,7 @@ function (angular, app, _, L, localRequire) {
        */
       tooltip : "_id",
       /** @scratch /panels/bettermap/5
+       *
        * ==== Queries
        * queries object:: This object describes the queries to use on this panel.
        * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
@@ -205,8 +209,7 @@ function (angular, app, _, L, localRequire) {
   module.directive('bettermap', function() {
     return {
       restrict: 'A',
-      link: function(scope, elem, attrs) {
-
+      link: function(scope, elem) {
         elem.html('<center><img src="img/load_big.gif"></center>');
 
         // Receive render events
@@ -224,18 +227,22 @@ function (angular, app, _, L, localRequire) {
         var map, layerGroup;
 
         function render_panel() {
+          elem.css({height:scope.row.height});
+
           scope.require(['./leaflet/plugins'], function () {
             scope.panelMeta.loading = false;
             L.Icon.Default.imagePath = 'app/panels/bettermap/leaflet/images';
             if(_.isUndefined(map)) {
-              map = L.map(attrs.id, {
+              map = L.map(scope.$id, {
                 scrollWheelZoom: false,
                 center: [40, -86],
                 zoom: 10
               });
 
               // This could be made configurable?
-              L.tileLayer('https://ssl_tiles.cloudmade.com/57cbb6ca8cac418dbb1a402586df4528/22677/256/{z}/{x}/{y}.png', {
+              L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg', {
+                attribution: '"Data, imagery and map information provided by MapQuest, '+
+                  'OpenStreetMap <http://www.openstreetmap.org/copyright> and contributors, ODbL',
                 maxZoom: 18,
                 minZoom: 2
               }).addTo(map);

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

@@ -1,8 +1,10 @@
 /** @scratch /panels/5
+ *
  * include::panels/column.asciidoc[]
  */
 
 /** @scratch /panels/column/0
+ *
  * == Column
  * Status: *Stable*
  *
@@ -34,6 +36,7 @@ function (angular, app, _, config) {
     // Set and populate defaults
     var _d = {
       /** @scratch /panels/column/3
+       *
        * === Parameters
        *
        * panel:: An array of panel objects

data/lib/kibana/assets/app/panels/{pie → goal}/editor.html

@@ -1,30 +1,6 @@
-  <div class="editor-row" ng-switch="panel.mode">
+  <div class="editor-row">
 
     <div class="section">
-      <h5>Mode</h5>
-      <div class="editor-option">
-        <label class="small">Mode</label>
-        <select class="input-small" ng-change="set_mode(panel.mode);set_refresh(true)" ng-model="panel.mode" ng-options="f for f in ['terms','goal']"></select>
-      </div>
-    </div>
-
-    <div class="section" ng-switch-when="terms">
-      <h5>Parameters</h5>
-      <div class="editor-option">
-        <label class="small">Field</label>
-        <input type="text" class="input-small" bs-typeahead="fields.list" ng-model="panel.query.field" ng-change="set_refresh(true)">
-      </div>
-      <div class="editor-option">
-        <label class="small">Length</label>
-        <input class="input-mini" type="number" ng-model="panel.size" ng-change="set_refresh(true)">
-      </div>
-      <div class="editor-option">
-        <label class="small">Exclude Terms(s) (comma separated)</label>
-        <input array-join type="text" ng-model='panel.exclude'></input>
-      </div>
-    </div>
-
-    <div class="section" ng-switch-when="goal">
       <h5>Parameters</h5>
       <div class="editor-option">
         <form style="margin-bottom: 0px">

data/lib/kibana/assets/app/panels/{pie → goal}/module.html

@@ -1,13 +1,13 @@
-<div ng-controller='pie' ng-init="init()">
+<div ng-controller='goal' ng-init="init()">
   <style>
-    .pieLabel { pointer-events: none }
+    .goal-label { pointer-events: none }
   </style>
   <div ng-show="panel.legend == 'above'" ng-repeat="query in legend" style="float:left;padding-left: 10px;">
     <span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span>
-  </div><br>
+  </div>
   <div style="clear:both"></div>
 
-  <div pie class="pointer" params="{{panel}}" style="position:relative"></div>
+  <div goal params="{{panel}}" style="position:relative"></div>
 
   <div ng-show="panel.legend == 'below'" ng-repeat="query in legend" style="float:left;padding-left: 10px;">
     <span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span>

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

@@ -0,0 +1,252 @@
+/** @scratch /panels/5
+ *
+ * include::panels/goal.asciidoc[]
+ */
+
+/** @scratch /panels/goal/0
+ *
+ * == Goal
+ * Status: *Stable*
+ *
+ * The goal panel display progress towards a fixed goal on a pie chart
+ *
+ */
+define([
+  'angular',
+  'app',
+  'lodash',
+  'jquery',
+  'kbn',
+  'config',
+  'chromath'
+], function (angular, app, _, $, kbn) {
+  'use strict';
+
+  var module = angular.module('kibana.panels.goal', []);
+  app.useModule(module);
+
+  module.controller('goal', function($scope, $rootScope, querySrv, dashboard, filterSrv) {
+
+    $scope.panelMeta = {
+      editorTabs : [
+        {title:'Queries', src:'app/partials/querySelect.html'}
+      ],
+      modals : [
+        {
+          description: "Inspect",
+          icon: "icon-info-sign",
+          partial: "app/partials/inspector.html",
+          show: $scope.panel.spyable
+        }
+      ],
+      status  : "Stable",
+      description : "Displays the progress towards a fixed goal on a pie chart"
+    };
+
+    // Set and populate defaults
+    var _d = {
+      /** @scratch /panels/goal/3
+       *
+       * === Parameters
+       * donut:: Draw a hole in the middle of the pie, creating a tasty donut.
+       */
+      donut   : true,
+      /** @scratch /panels/goal/3
+       * tilt:: Tilt the pie back into an oval shape
+       */
+      tilt    : false,
+      /** @scratch /panels/goal/3
+       * legend:: The location of the legend, above, below or none
+       */
+      legend  : "above",
+      /** @scratch /panels/goal/3
+       * labels:: Set to false to disable drawing labels inside the pie slices
+       */
+      labels  : true,
+      /** @scratch /panels/goal/3
+       * spyable:: Set to false to disable the inspect function.
+       */
+      spyable : true,
+      /** @scratch /panels/goal/3
+       *
+       * ==== Query
+       *
+       * query object::
+       * query.goal::: the fixed goal for goal mode
+       */
+      query   : {goal: 100},
+      /** @scratch /panels/goal/5
+       *
+       * ==== Queries
+       *
+       * queries object:: This object describes the queries to use on this panel.
+       * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
+       * queries.ids::: In +selected+ mode, which query ids are selected.
+       */
+      queries     : {
+        mode        : 'all',
+        ids         : []
+      },
+    };
+    _.defaults($scope.panel,_d);
+
+    $scope.init = function() {
+      $scope.$on('refresh',function(){$scope.get_data();});
+      $scope.get_data();
+    };
+
+    $scope.set_refresh = function (state) {
+      $scope.refresh = state;
+    };
+
+    $scope.close_edit = function() {
+      if($scope.refresh) {
+        $scope.get_data();
+      }
+      $scope.refresh =  false;
+      $scope.$emit('render');
+    };
+
+    $scope.get_data = function() {
+
+      // Make sure we have everything for the request to complete
+      if(dashboard.indices.length === 0) {
+        return;
+      }
+
+
+      $scope.panelMeta.loading = true;
+      var request = $scope.ejs.Request().indices(dashboard.indices);
+
+      $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
+      var queries = querySrv.getQueryObjs($scope.panel.queries.ids);
+
+      // This could probably be changed to a BoolFilter
+      var boolQuery = $scope.ejs.BoolQuery();
+      _.each(queries,function(q) {
+        boolQuery = boolQuery.should(querySrv.toEjsObj(q));
+      });
+
+      var results;
+
+      request = request
+        .query(boolQuery)
+        .filter(filterSrv.getBoolFilter(filterSrv.ids))
+        .size(0);
+
+      $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
+
+      results = request.doSearch();
+
+      results.then(function(results) {
+        $scope.panelMeta.loading = false;
+        var complete  = results.hits.total;
+        var remaining = $scope.panel.query.goal - complete;
+        $scope.data = [
+          { label : 'Complete', data : complete, color: querySrv.colors[parseInt($scope.$id, 16)%8] },
+          { data : remaining, color: Chromath.lighten(querySrv.colors[parseInt($scope.$id, 16)%8],0.70).toString() }
+        ];
+        $scope.$emit('render');
+      });
+    };
+
+  });
+
+  module.directive('goal', function(querySrv) {
+    return {
+      restrict: 'A',
+      link: function(scope, elem) {
+
+        elem.html('<center><img src="img/load_big.gif"></center>');
+
+        // Receive render events
+        scope.$on('render',function(){
+          render_panel();
+        });
+
+        // Or if the window is resized
+        angular.element(window).bind('resize', function(){
+          render_panel();
+        });
+
+        // Function for rendering panel
+        function render_panel() {
+          // IE doesn't work without this
+          elem.css({height:scope.row.height});
+
+          var label;
+
+          label = {
+            show: scope.panel.labels,
+            radius: 0,
+            formatter: function(label, series){
+              var font = parseInt(scope.row.height.replace('px',''),10)/8 + String('px');
+              if(!(_.isUndefined(label))) {
+                return '<div style="font-size:'+font+';font-weight:bold;text-align:center;padding:2px;color:#fff;">'+
+                Math.round(series.percent)+'%</div>';
+              } else {
+                return '';
+              }
+            },
+          };
+
+          var pie = {
+            series: {
+              pie: {
+                innerRadius: scope.panel.donut ? 0.45 : 0,
+                tilt: scope.panel.tilt ? 0.45 : 1,
+                radius: 1,
+                show: true,
+                combine: {
+                  color: '#999',
+                  label: 'The Rest'
+                },
+                label: label,
+                stroke: {
+                  width: 0
+                }
+              }
+            },
+            //grid: { hoverable: true, clickable: true },
+            grid:   {
+              backgroundColor: null,
+              hoverable: true,
+              clickable: true
+            },
+            legend: { show: false },
+            colors: querySrv.colors
+          };
+
+          // Populate legend
+          if(elem.is(":visible")){
+            require(['jquery.flot.pie'], function(){
+              scope.legend = $.plot(elem, scope.data, pie).getData();
+              if(!scope.$$phase) {
+                scope.$apply();
+              }
+            });
+          }
+
+        }
+
+        var $tooltip = $('<div>');
+        elem.bind('plothover', function (event, pos, item) {
+          if (item) {
+            $tooltip
+              .html([
+                kbn.query_color_dot(item.series.color, 15),
+                (item.series.label || ''),
+                parseFloat(item.series.percent).toFixed(1) + '%'
+              ].join(' '))
+              .place_tt(pos.pageX, pos.pageY, {
+                offset: 10
+              });
+          } else {
+            $tooltip.remove();
+          }
+        });
+
+      }
+    };
+  });
+});