kibana-sinatra 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 897512369a6b277f44b6b5ed555c99848c26b0da
-  data.tar.gz: 9422c7cd1c3e9e1c1c92927e27933da39ec52d95
+  metadata.gz: 221a7a79930e7d8f883991735a36f74c1b5bd1dd
+  data.tar.gz: 025fb9fc6da32eec6bc51afd7539787f4a7d7d3d
 SHA512:
-  metadata.gz: 68e8330aa19e504ebefe3bf684add055883466d4fd6b8e52ee2842391fb53fda33b0d8cb5d4ebe13aa3c4524066c4e711a302c8a37decfe0b47c25f2ff4382b0
-  data.tar.gz: 0f81d2e506e4e09dafbb343173a21709b3375752706f6d4ac95a067c7fcfedd63d1adef63f07f2e29257ec3d3abbe96af45f44c8a3ed9a9d5742da58fb8799df
+  metadata.gz: d1ea7865b8a2402452b6322cc87d86532c5149c118689f90790460a0672277a23834959c076fe4ef84d1b9a5e3ea026d930320b523a33164415e65142b38eb09
+  data.tar.gz: 3277260d44cb68aff4e94e11715548d49f398b5d4e6344fa4a9c102d681c99093e5199a84ce03ef59bd3db9621672efcee5053aa4fbc629e7aed5d56571af899

data/README.md

@@ -1,6 +1,8 @@
 # Kibana::Sinatra
 
-TODO: Write a gem description
+[![Dependency Status](https://gemnasium.com/ianneub/kibana-sinatra.png)](https://gemnasium.com/ianneub/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.
 
 ## Installation
 
@@ -18,7 +20,33 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Inside Rails
+
+First you will need to configure Kibana's config.js file so that a web browser can find your [elasticsearch](http://www.elasticsearch.org/) cluster.
+
+Create a new file in `config/initializers` and include the following code. Replace the strings with the location of your elasticsearch cluster and the kibana index. Note that both of these are optional.
+
+```ruby
+module Kibana::Sinatra
+  class Web
+    def self.elasticsearch_url
+      "http://\"+window.location.hostname+\":9200"
+    end
+    
+    def self.kibana_index
+      "kibana-int"
+    end
+  end
+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!
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,2 @@
 require "bundler/gem_tasks"
+require "./lib/tasks/update"

data/kibana-sinatra.gemspec

@@ -20,5 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "uuid"
+  spec.add_development_dependency "rubyzip"
   spec.add_dependency "sinatra", "~> 1.4"
 end

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

@@ -1,5 +1,5 @@
-define(['jquery', 'underscore'],
-function($, _) {
+define(['jquery', 'underscore','moment'],
+function($, _, moment) {
   'use strict';
 
   var kbn = {};
@@ -247,6 +247,136 @@ function($, _) {
     return new Date(new Date().getTime() - (kbn.interval_to_ms(string)));
   };
 
+  /* This is a simplified version of elasticsearch's date parser */
+  kbn.parseDate = function(text) {
+    if(_.isDate(text)) {
+      return text;
+    }
+    var time,
+      mathString = "",
+      index,
+      parseString;
+    if (text.substring(0,3) === "now") {
+      time = new Date();
+      mathString = text.substring("now".length);
+    } else {
+      index = text.indexOf("||");
+      parseString;
+      if (index === -1) {
+        parseString = text;
+        mathString = ""; // nothing else
+      } else {
+        parseString = text.substring(0, index);
+        mathString = text.substring(index + 2);
+      }
+      // We're going to just require ISO8601 timestamps, k?
+      time = new Date(parseString);
+    }
+
+    if (!mathString.length) {
+      return time;
+    }
+
+    //return [time,parseString,mathString];
+    return kbn.parseDateMath(mathString, time);
+  };
+
+  kbn.parseDateMath = function(mathString, time, roundUp) {
+    var dateTime = moment(time);
+    for (var i = 0; i < mathString.length; ) {
+      var c = mathString.charAt(i++),
+        type,
+        num,
+        unit;
+      if (c === '/') {
+        type = 0;
+      } else if (c === '+') {
+        type = 1;
+      } else if (c === '-') {
+        type = 2;
+      } else {
+        return false;
+      }
+
+      if (isNaN(mathString.charAt(i))) {
+        num = 1;
+      } else {
+        var numFrom = i;
+        while (!isNaN(mathString.charAt(i))) {
+          i++;
+        }
+        num = parseInt(mathString.substring(numFrom, i),10);
+      }
+      if (type === 0) {
+        // rounding is only allowed on whole numbers
+        if (num !== 1) {
+          return false;
+        }
+      }
+      unit = mathString.charAt(i++);
+      switch (unit) {
+      case 'M':
+        if (type === 0) {
+          roundUp ? dateTime.endOf('month') : dateTime.startOf('month');
+        } else if (type === 1) {
+          dateTime.add('months',num);
+        } else if (type === 2) {
+          dateTime.subtract('months',num);
+        }
+        break;
+      case 'w':
+        if (type === 0) {
+          roundUp ? dateTime.endOf('week') : dateTime.startOf('week');
+        } else if (type === 1) {
+          dateTime.add('weeks',num);
+        } else if (type === 2) {
+          dateTime.subtract('weeks',num);
+        }
+        break;
+      case 'd':
+        if (type === 0) {
+          roundUp ? dateTime.endOf('day') : dateTime.startOf('day');
+        } else if (type === 1) {
+          dateTime.add('days',num);
+        } else if (type === 2) {
+          dateTime.subtract('days',num);
+        }
+        break;
+      case 'h':
+      case 'H':
+        if (type === 0) {
+          roundUp ? dateTime.endOf('hour') : dateTime.startOf('hour');
+        } else if (type === 1) {
+          dateTime.add('hours',num);
+        } else if (type === 2) {
+          dateTime.subtract('hours',num);
+        }
+        break;
+      case 'm':
+        if (type === 0) {
+          roundUp ? dateTime.endOf('minute') : dateTime.startOf('minute');
+        } else if (type === 1) {
+          dateTime.add('minutes',num);
+        } else if (type === 2) {
+          dateTime.subtract('minutes',num);
+        }
+        break;
+      case 's':
+        if (type === 0) {
+          roundUp ? dateTime.endOf('second') : dateTime.startOf('second');
+        } else if (type === 1) {
+          dateTime.add('seconds',num);
+        } else if (type === 2) {
+          dateTime.subtract('seconds',num);
+        }
+        break;
+      default:
+        return false;
+      }
+    }
+    return dateTime.toDate();
+  };
+
   // LOL. hahahahaha. DIE.
   kbn.flatten_json = function(object,root,array) {
     if (typeof array === 'undefined') {

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

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

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

@@ -11,18 +11,25 @@ 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 || {};
     };
 
     $scope.showDropdown = function(type) {
-      var _l = $scope.loader;
+      if(_.isUndefined(dashboard.current.loader)) {
+        return true;
+      }
+
+      var _l = dashboard.current.loader;
       if(type === 'load') {
         return (_l.load_elasticsearch || _l.load_gist || _l.load_local);
       }
       if(type === 'save') {
-        return (_l.save_elasticsearch || _l.save_gist || _l.local_local || _l.save_default);
+        return (_l.save_elasticsearch || _l.save_gist || _l.save_local || _l.save_default);
       }
       if(type === 'share') {
         return (_l.save_temp);
@@ -120,4 +127,4 @@ function (angular, _) {
 
   });
 
-});
+});

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

@@ -0,0 +1,45 @@
+define([
+  'angular',
+  'app',
+  'underscore'
+],
+function (angular, app, _) {
+  'use strict';
+
+  var module = angular.module('kibana.controllers');
+
+  module.controller('PulldownCtrl', function($scope, $rootScope, $timeout,ejsResource, querySrv) {
+      var _d = {
+        collapse: false,
+        notice: false,
+        enable: true
+      };
+
+      _.defaults($scope.pulldown,_d);
+
+      $scope.init = function() {
+        $scope.querySrv = querySrv;
+
+        // Provide a combined skeleton for panels that must interact with panel and row.
+        // This might create name spacing issues.
+        $scope.panel = $scope.pulldown;
+        $scope.row = $scope.pulldown;
+      };
+
+      $scope.toggle_pulldown = function(pulldown) {
+        pulldown.collapse = pulldown.collapse ? false : true;
+        if (!pulldown.collapse) {
+          $timeout(function() {
+            $scope.$broadcast('render');
+          });
+        } else {
+          $scope.row.notice = false;
+        }
+      };
+
+      $scope.init();
+
+    }
+  );
+
+});

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

@@ -16,6 +16,7 @@ function (angular, app, _) {
         collapsable: true,
         editable: true,
         panels: [],
+        notice: false
       };
 
       _.defaults($scope.row,_d);
@@ -34,6 +35,8 @@ function (angular, app, _) {
           $timeout(function() {
             $scope.$broadcast('render');
           });
+        } else {
+          row.notice = false;
         }
       };
 

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

@@ -13,7 +13,9 @@
           "query": "*",
           "alias": "",
           "color": "#7EB26D",
-          "id": 0
+          "id": 0,
+          "pin": false,
+          "type": "lucene"
         }
       },
       "ids": [
@@ -22,24 +24,12 @@
     },
     "filter": {
       "idQueue": [
+        0,
         1,
         2
       ],
-      "list": {
-        "0": {
-          "from": "2013-07-27T22:08:06.800Z",
-          "to": "2013-07-27T23:08:06.801Z",
-          "field": "@timestamp",
-          "type": "time",
-          "mandate": "must",
-          "active": true,
-          "alias": "",
-          "id": 0
-        }
-      },
-      "ids": [
-        0
-      ]
+      "list": {},
+      "ids": []
     }
   },
   "rows": [
@@ -59,7 +49,7 @@
           ],
           "type": "text",
           "mode": "markdown",
-          "content": "![kibana](img/kibana.png)  \n\n##### Did you just upgrade? Not expecting this screen?\nIf you were using the old default page you might not be expecting this screen. I understand, change can be awkward. Let me explain. \n\n##### Setting a global default dashboard\nKibana has always shipped with an interface for Logstash, still does! You can access it [here](index.html#dashboard/file/logstash.json). However, if you want to make it your default again, all you you need to do is rename a file!\nIn your Kibana installation directory: \n\nRename *logstash.json* to *default.json* and refresh. Should be all set.\n\n##### But wait, there's more!\nIn fact, you can add any exported dashboard to that directory and access it as *http://YOUR-HOST -HERE/index.html#dashboard/file/YOUR-DASHBOARD.json*. Neat trick eh?",
+          "content": "![kibana](img/kibana.png)  \n\n##### Did you just upgrade? Not expecting this screen?\nIf you were using the old default page you might not be expecting this screen. I understand, change can be awkward. Let me explain. \n\n##### Setting a global default dashboard\nKibana has always shipped with an interface for Logstash, still does! You can access it [here](index.html#dashboard/file/logstash.json). However, if you want to make it your default again, all you need to do is rename a file!\nIn your Kibana installation directory: \n\nRename *logstash.json* to *default.json* and refresh. Should be all set.\n\n##### But wait, there's more!\nIn fact, you can add any exported dashboard to that directory and access it as *http://YOUR-HOST -HERE/index.html#dashboard/file/YOUR-DASHBOARD.json*. Neat trick eh?",
           "style": {},
           "title": "",
           "status": "Stable"
@@ -77,7 +67,8 @@
           "style": {},
           "status": "Stable"
         }
-      ]
+      ],
+      "notice": false
     }
   ],
   "editable": false,
@@ -85,5 +76,73 @@
     "interval": "none",
     "pattern": "[logstash-]YYYY.MM.DD",
     "default": "_all"
-  }
+  },
+  "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
+    }
+  ],
+  "loader": {
+    "save_gist": false,
+    "save_elasticsearch": true,
+    "save_local": true,
+    "save_default": true,
+    "save_temp": true,
+    "save_temp_ttl_enable": true,
+    "save_temp_ttl": "30d",
+    "load_gist": true,
+    "load_elasticsearch": true,
+    "load_elasticsearch_size": 20,
+    "load_local": true,
+    "hide": false
+  },
+  "refresh": false
 }