kibana-sinatra 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 221a7a79930e7d8f883991735a36f74c1b5bd1dd
-  data.tar.gz: 025fb9fc6da32eec6bc51afd7539787f4a7d7d3d
+  metadata.gz: b90d776ed0faabd51b00e390a59c193d63c4eb94
+  data.tar.gz: d38a9fb1987082bd9c38ff97be8763c985bf75d4
 SHA512:
-  metadata.gz: d1ea7865b8a2402452b6322cc87d86532c5149c118689f90790460a0672277a23834959c076fe4ef84d1b9a5e3ea026d930320b523a33164415e65142b38eb09
-  data.tar.gz: 3277260d44cb68aff4e94e11715548d49f398b5d4e6344fa4a9c102d681c99093e5199a84ce03ef59bd3db9621672efcee5053aa4fbc629e7aed5d56571af899
+  metadata.gz: 9e7aa803378bd32ad9e524ed7c11cb77cff766d936496db3dd8e17ffa08048eddd9090afadf2eca7c67e26b413f875166c8f673a1ce1ba8e425e8f82eaf342cf
+  data.tar.gz: 221b2797b0615c18553e404dcae19ba30fc32096c04137e22fc57cff53a703074dcc4b210113e392e1537986b86fe958dda0369218847ffc40bc067855cfa855

data/README.md

@@ -4,6 +4,8 @@
 
 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)
+
 ## Installation
 
 Add this line to your application's Gemfile:

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

@@ -6,7 +6,6 @@ define([
   'jquery',
   'underscore',
   'require',
-
   'elasticjs',
   'bootstrap',
   'angular-sanitize',

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

@@ -20,6 +20,7 @@ function ($) {
         'font-weight' : 200,
         'background-color': '#1f1f1f',
         'border-radius': '5px',
+        'z-index': 9999
       }
     };
 

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

@@ -1,4 +1,4 @@
-define(['jquery', 'underscore','moment'],
+define(['jquery','underscore','moment','chromath'],
 function($, _, moment) {
   'use strict';
 
@@ -13,14 +13,10 @@ function($, _, moment) {
     return field_array.sort();
   };
 
-  kbn.get_all_fields = function(data) {
-    var fields = [];
-    _.each(data,function(hit) {
-      fields = _.uniq(fields.concat(_.keys(hit)));
-    });
-    // Remove stupid angular key
-    fields = _.without(fields,'$$hashKey');
-    return fields;
+  kbn.get_all_fields = function(data,flat) {
+    return _.uniq(_.without(_.reduce(data,function(memo,hit) {
+      return flat ? memo.concat(_.keys(kbn.flatten_json(hit._source))) : memo.concat(_.keys(hit._source));
+    },[]),'$$hashkey'));
   };
 
   kbn.has_field = function(obj,field) {
@@ -41,7 +37,7 @@ function($, _, moment) {
       }
     });
     var counts = _.countBy(_.without(field_array,field),function(field){return field;});
-    return counts;
+    return _.map(counts, function(num, key){return {name:key,count:num};});
   };
 
   kbn.recurse_field_dots = function(object,field) {
@@ -315,6 +311,15 @@ function($, _, moment) {
       }
       unit = mathString.charAt(i++);
       switch (unit) {
+      case 'y':
+        if (type === 0) {
+          roundUp ? dateTime.endOf('year') : dateTime.startOf('year');
+        } else if (type === 1) {
+          dateTime.add('years',num);
+        } else if (type === 2) {
+          dateTime.subtract('years',num);
+        }
+        break;
       case 'M':
         if (type === 0) {
           roundUp ? dateTime.endOf('month') : dateTime.startOf('month');
@@ -458,5 +463,21 @@ function($, _, moment) {
       ].join(';') + '"></div>';
   };
 
+  kbn.colorSteps = function(col,steps) {
+
+    var _d = steps > 5 ? 1.6/steps : 0.25, // distance between steps
+      _p = []; // adjustment percentage
+
+    // Create a range of numbers between -0.8 and 0.8
+    for(var i = 1; i<steps+1; i+=1) {
+      _p.push(i%2 ? ((i-1)*_d*-1)/2 : i*_d/2);
+    }
+
+    // Create the color range
+    return _.map(_p.sort(function(a,b){return a-b;}),function(v) {
+      return v<0 ? Chromath.darken(col,v*-1).toString() : Chromath.lighten(col,v).toString();
+    });
+  };
+
   return kbn;
 });

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

@@ -13,7 +13,7 @@ require.config({
     text:                     '../vendor/require/text',
     moment:                   '../vendor/moment',
     filesaver:                '../vendor/filesaver',
-
+    chromath:                 '../vendor/chromath',
     angular:                  '../vendor/angular/angular',
     'angular-dragdrop':       '../vendor/angular/angular-dragdrop',
     'angular-strap':          '../vendor/angular/angular-strap',
@@ -32,6 +32,7 @@ require.config({
 
     'jquery.flot':            '../vendor/jquery/jquery.flot',
     'jquery.flot.pie':        '../vendor/jquery/jquery.flot.pie',
+    'jquery.flot.events':     '../vendor/jquery/jquery.flot.events',
     'jquery.flot.selection':  '../vendor/jquery/jquery.flot.selection',
     'jquery.flot.stack':      '../vendor/jquery/jquery.flot.stack',
     'jquery.flot.stackpercent':'../vendor/jquery/jquery.flot.stackpercent',
@@ -66,6 +67,7 @@ require.config({
     'jquery-ui':            ['jquery'],
     'jquery.flot':          ['jquery'],
     'jquery.flot.pie':      ['jquery', 'jquery.flot'],
+    'jquery.flot.events':   ['jquery', 'jquery.flot'],
     'jquery.flot.selection':['jquery', 'jquery.flot'],
     'jquery.flot.stack':    ['jquery', 'jquery.flot'],
     'jquery.flot.stackpercent':['jquery', 'jquery.flot'],
@@ -86,5 +88,6 @@ require.config({
     datepicker:             ['jquery', 'bootstrap'],
 
     elasticjs:              ['angular', '../vendor/elasticjs/elastic']
-  }
+  },
+  waitSeconds: 60,
 });

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

@@ -18,6 +18,10 @@ function () {
       array.splice(index, 1);
       return array;
     },
+    // If variable is value, then return alt. If variable is anything else, return value;
+    toggle: function (variable, value, alt) {
+      return variable === value ? alt : value;
+    },
     toggleInOut: function(array,value) {
       if(_.contains(array,value)) {
         array = _.without(array,value);

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

@@ -10,13 +10,15 @@ function (angular, config, _) {
   var module = angular.module('kibana.controllers');
 
   module.controller('DashCtrl', function(
-    $scope, $route, ejsResource, fields, dashboard, alertSrv, panelMove) {
+    $scope, $route, ejsResource, fields, dashboard, alertSrv, panelMove, esVersion) {
+
+    $scope.requiredElasticSearchVersion = ">=0.20.5";
+
     $scope.editor = {
       index: 0
     };
 
-    // For moving stuff around the dashboard. Needs better names
-    $scope.panelMove = panelMove;
+    // For moving stuff around the dashboard.
     $scope.panelMoveDrop = panelMove.onDrop;
     $scope.panelMoveStart = panelMove.onStart;
     $scope.panelMoveStop = panelMove.onStop;
@@ -24,16 +26,18 @@ function (angular, config, _) {
     $scope.panelMoveOut = panelMove.onOut;
 
 
-
     $scope.init = function() {
       $scope.config = config;
-      // Make underscore.js available to views
+      // Make stuff, including underscore.js available to views
       $scope._ = _;
       $scope.dashboard = dashboard;
       $scope.dashAlerts = alertSrv;
+      $scope.esVersion = esVersion;
+
+      // Clear existing alerts
       alertSrv.clearAll();
 
-      // Provide a global list of all see fields
+      // Provide a global list of all seen fields
       $scope.fields = fields;
       $scope.reset_row();
 

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

@@ -11,9 +11,6 @@ function (angular, _) {
     $scope.loader = dashboard.current.loader;
 
     $scope.init = function() {
-      $scope.advancedLoad = false;
-      $scope.advancedSave = false;
-
       $scope.gist_pattern = /(^\d{5,}$)|(^[a-z0-9]{10,}$)|(gist.github.com(\/*.*)\/[a-z0-9]{5,}\/*$)/;
       $scope.gist = $scope.gist || {};
       $scope.elasticsearch = $scope.elasticsearch || {};

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

@@ -73,7 +73,7 @@ if(!_.isUndefined(ARGS.query)) {
   queries = {
     0: {
       query: '*',
-      id: 0
+      id: 0,
     }
   };
 }
@@ -93,7 +93,7 @@ dashboard.services.filter = {
       field: ARGS.timefield||"@timestamp",
       type: "time",
       active: true,
-      id: 0
+      id: 0,
     }
   },
   ids: [0]

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

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

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

@@ -0,0 +1,24 @@
+/*
+  Only show an element if it meets an Elasticsearch version requirement
+*/
+
+define([
+  'angular',
+  'app',
+],
+function (angular) {
+  'use strict';
+
+  angular
+    .module('kibana.directives')
+    .directive('esVersion', function(esVersion) {
+      return {
+        restrict: 'A',
+        link: function(scope, elem, attr) {
+          if(!esVersion.is(attr.esVersion)) {
+            elem.hide();
+          }
+        }
+      };
+    });
+});

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

@@ -13,8 +13,15 @@ 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">'+
+            '<i class="icon-remove pointer" bs-tooltip="\'Remove\'"></i></span>'+
+          '</span>' +
+
           '<span class="extra row-button" ng-hide="panel.draggable == false">' +
-            '<span class="row-text pointer" bs-tooltip="\'Drag here to move\'"' +
+            '<span class="pointer" bs-tooltip="\'Drag here to move\'"' +
             'data-drag=true data-jqyoui-options="{revert: \'invalid\',helper:\'clone\'}"'+
             ' jqyoui-draggable="'+
             '{'+
@@ -23,18 +30,12 @@ function (angular) {
               'index:{{$index}},'+
               'onStart:\'panelMoveStart\','+
               'onStop:\'panelMoveStop\''+
-              '}"  ng-model="row.panels">{{panel.type}}</span>'+
+              '}"  ng-model="row.panels"><i class="icon-move"></i></span>'+
           '</span>' +
           '<span class="extra row-button" ng-show="panel.draggable == false">' +
             '<span class="row-text">{{panel.type}}</span>'+
           '</span>' +
 
-          '<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">'+
-            '<i class="icon-remove pointer" bs-tooltip="\'Remove\'"></i></span>'+
-          '</span>' +
-
           '<span class="row-button extra" ng-show="panel.editable != false">' +
             '<span bs-modal="\'app/partials/paneleditor.html\'" class="pointer">'+
             '<i class="icon-cog pointer" bs-tooltip="\'Configure\'"></i></span>'+

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

@@ -1,12 +1,19 @@
 define([
-  'angular'
+  'angular',
+  'underscore'
 ],
-function (angular) {
+function (angular, _) {
   'use strict';
 
   angular
     .module('kibana.directives')
     .directive('kibanaSimplePanel', function($compile) {
+      var panelLoading = '<span ng-show="panelMeta.loading == true">' +
+        '<span style="font-size:72px;font-weight:200">'+
+          '<i class="icon-spinner icon-spin"></i> loading ...' +
+        '</span>'+
+      '</span>';
+
       return {
         restrict: 'E',
         link: function($scope, elem, attr) {
@@ -22,10 +29,10 @@ function (angular) {
             elem.removeClass("ng-cloak");
           }
 
-          $scope.$watch(attr.type, function (name) {
+          function loadController(name) {
             elem.addClass("ng-cloak");
-
             // load the panels module file, then render it in the dom.
+
             $scope.require([
               'jquery',
               'text!panels/'+name+'/module.html'
@@ -37,6 +44,7 @@ function (angular) {
               $controllers = $controllers.add($module.find('ngcontroller, [ng-controller], .ng-controller'));
 
               if ($controllers.length) {
+                $controllers.first().prepend(panelLoading);
                 $scope.require([
                   'panels/'+name+'/module'
                 ], function() {
@@ -46,6 +54,19 @@ function (angular) {
                 loadModule($module);
               }
             });
+          }
+
+          $scope.$watch(attr.type, function (name) {
+            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);
+            }
           });
         }
       };

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

@@ -24,6 +24,18 @@ define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, m
     };
   });
 
+  /*
+    Filter an array of objects by elasticsearch version requirements
+  */
+  module.filter('esVersion', function(esVersion) {
+    return function(items, require) {
+      var ret = _.filter(items,function(qt) {
+        return esVersion.is(qt[require]) ? true : false;
+      });
+      return ret;
+    };
+  });
+
   module.filter('slice', function() {
     return function(arr, start, end) {
       if(!_.isUndefined(arr)) {
@@ -37,7 +49,7 @@ define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, m
       if(_.isObject(arr) && !_.isArray(arr)) {
         return angular.toJson(arr);
       } else {
-        return arr.toString();
+        return _.isNull(arr) ? null : arr.toString();
       }
     };
   });

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

@@ -101,10 +101,11 @@ function (angular, app, _, L, localRequire) {
         var _segment = _.isUndefined(segment) ? 0 : segment;
 
         $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
-        // This could probably be changed to a BoolFilter
+        var queries = querySrv.getQueryObjs($scope.panel.queries.ids);
+
         var boolQuery = $scope.ejs.BoolQuery();
-        _.each($scope.panel.queries.ids,function(id) {
-          boolQuery = boolQuery.should(querySrv.getEjsObj(id));
+        _.each(queries,function(q) {
+          boolQuery = boolQuery.should(querySrv.toEjsObj(q));
         });
 
         var request = $scope.ejs.Request().indices(dashboard.indices[_segment])

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

@@ -1,23 +1 @@
-<div>
-  <div class="row-fluid">
-    <div class="span1">
-      <label class="small">Length</label>
-      <input type="number" style="width:80%" ng-model="panel.size" ng-change="set_refresh(true)">
-    </div>
-    <div class="span3">
-      <label class="small">Field</label>
-      <input type="text" bs-typeahead="fields.list" style="width:80%" ng-change="set_refresh(true)" ng-model='panel.field'></select>
-    </div>
-    <div class="span3">
-      <label class="small">Query Mode</label>
-      <select style="width:80%" ng-change="set_refresh(true)" ng-model='panel.mode' ng-options="f for f in ['terms only','AND', 'OR']"></select>
-    </div>
-    <div class="span4">
-      <label class="small">Exclude Terms(s) (comma seperated)</label>
-      <input array-join type="text" style="width:90%" ng-change="set_refresh(true)" ng-model='panel.exclude'></input>
-    </div>
-    <div class="span1">
-      <label class="small"> Rest </label><input type="checkbox" ng-model="panel.rest" ng-checked="panel.rest" ng-change="set_refresh(true)">
-    </div>
-  </div>
-</div>
+<div></div>

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

@@ -1,33 +1,3 @@
 <div ng-controller='derivequeries' ng-init="init()">
-<style>
-  .end-derive {
-    position:absolute;
-    right:15px;
-    top:5px;
-  }
-  .panel-derive-field {
-    text-decoration: underline;
-    cursor: pointer;
-  }
-  .panel-derive {
-    padding-right: 35px !important;
-    height: 31px !important;
-    -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-    -moz-box-sizing: border-box;    /* Firefox, other Gecko */
-    box-sizing: border-box;         /* Opera/IE 8+ */
-  }
-</style>
-  <label class="small">Create new queries from
-    <span class="panel-derive-field" ng-show="!editing" ng-click="editing=true">{{panel.field}}</span>
-    <select ng-show="editing && fields.list.length>1" class="input-medium" ng-model="panel.field" ng-options="f for f in fields.list" ng-change='editing=false' ng-blur="editing=false"></select>
-    <input ng-show="editing && fields.list.length<2" type="text" ng-model="panel.field" ng-blur="editing=false"/>
-    ({{panel.mode}} mode)</label>
-  <div>
-    <form class="form-search" style="position:relative" ng-submit="get_data()">
-      <input class="search-query panel-derive input-block-level" bs-typeahead="panel.history" data-min-length=0 data-items=100 type="text" ng-model="panel.query"/>
-      <span class="end-derive">
-        <i class="icon-search pointer" ng-click="get_data()"></i>
-      </span
-    </form>
-  </div>
+ <h4>This panel has been removed and replaced with the new topN query type. Click the colored dot associated with a query to configure the, much improved, equivilent of a derived query.</h4>
 </div>