logstash-cli 0.0.1 → 0.0.2

data/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+pkg/*

data/README.md

@@ -8,17 +8,31 @@ Because let's face it, we're CLI junkies :)
 Mucho inspired by a gist of the eminent @lusis - <https://gist.github.com/1388077>
 
 ## Installation
-Installation using the usual steps
+### As a gem
 
-Install rvm , (no gem yet)
+    $ gem install logstash-cli
 
-    $ git clone thisrepo
-    $ cd thisrepo
+### From github
+
+    Tested with rvm and ruby-1.8.7
+
+    $ git clone git://github.com/jedi4ever/logstash-cli.git
+    $ cd logstash-cli
     $ gem install bundler
     $ bundle install
 
 ## Usage
 
+### Using the Gem
+
+    $ logstash-cli
+
+### Using the Github version - through bundler
+
+    $ bundle exec bin/logstash-cli 
+
+## Commandline Options
+
     Usage:
       logstash-cli grep PATTERN
 
@@ -48,8 +62,12 @@ Install rvm , (no gem yet)
 ## Examples
 
     $ logstash-cli grep --esurl="http://logger-1.jedi.be:9200" '@message:jedi4ever AND program:sshd' --last 5d --format csv --delim ':'
+
 ## TODO
 
 - find a way to query existing instances
 - specify last 15m 
 - find a way to get the results by streaming instead of loading all in memory (maybe pagination will help here)
+- live tailing the output
+- produce ascii histograms
+- or sparklines

data/Rakefile

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'bundler'
+require 'bundler/setup'
+
+require 'rake/testtask'
+Bundler::GemHelper.install_tasks

data/lib/logstash-cli/command/grep.rb

@@ -31,10 +31,18 @@ module LogstashCli::Command
 
     $stderr.puts "Searching #{es_url}[#{index_prefix}#{from_date}..#{index_prefix}#{to_date}] - #{pattern}"
 
-    (from_date..to_date).to_a.each do |date|
-      es_index = index_prefix+date.to_s.gsub('-','.')
+    # Total of results to show
+    total_result_size = options[:size]
+
+    # For this index the number of results to show
+    # Previous indexes might already have generate results
+
+    running_result_size = total_result_size.to_i
+
+    # We reverse the order of working ourselves through the index
+    (from_date..to_date).sort.reverse.to_a.each do |date|
 
-      result_size = options[:size]
+      es_index = index_prefix+date.to_s.gsub('-','.')
 
       begin
         Tire.configure {url es_url}
@@ -45,7 +53,7 @@ module LogstashCli::Command
           sort do
             by :@timestamp, 'desc'
           end
-          size result_size
+          size running_result_size
         end
       rescue Exception => e
         $stderr.puts e
@@ -55,6 +63,10 @@ module LogstashCli::Command
 
       begin
         result = Array.new
+
+        # Decrease the number of results to get from the next index
+        running_result_size -= search.results.size
+
         search.results.sort {|a,b| a[:@timestamp] <=> b[:@timestamp] }.each do |res|
 
           metafields.each do |metafield|
@@ -66,9 +78,9 @@ module LogstashCli::Command
           end
 
           output = case options[:format]
-            when 'csv' then result.to_csv({:col_sep => options[:delim]})
-            when 'json' then result.to_json
-          end
+                   when 'csv' then result.to_csv({:col_sep => options[:delim]})
+                   when 'json' then result.to_json
+                   end
           #tstamp = Time.iso8601(res[:@timestamp]).localtime.iso8601
 
           puts output

data/lib/logstash-cli/version.rb

@@ -1,3 +1,3 @@
 module LogstashCli
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logstash-cli
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Patrick Debois
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-11 00:00:00 Z
+date: 2012-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -131,6 +131,7 @@ files:
 - .rvmrc
 - Gemfile
 - README.md
+- Rakefile
 - bin/logstash-cli
 - lib/logstash-cli.rb
 - lib/logstash-cli/cli.rb