papertrail 0.9.4 → 0.9.5

data/README.md

@@ -60,9 +60,12 @@ You may want to alias "trail" to "papertrail", like:
         -s, --system SYSTEM              System to search
         -g, --group GROUP                Group to search
         -j, --json                       Output raw json data
+        --min-time MIN                   Earliest time to search from.
+        --max-time MAX                   Latest time to search from.
+
 
     Usage: 
-      papertrail [-f] [-s system] [-g group] [-d seconds] [-c papertrail.yml] [-j] [query]
+      papertrail [-f] [-s system] [-g group] [-d seconds] [-c papertrail.yml] [-j] [--min-time mintime] [--max-time maxtime] [query]
 
     Examples:
       papertrail -f
@@ -71,6 +74,7 @@ You may want to alias "trail" to "papertrail", like:
       papertrail -s ns1 "connection refused"
       papertrail -f "(www OR db) (nginx OR pgsql) -accepted"
       papertrail -f -g Production "(nginx OR pgsql) -accepted"
+      papertrail -g Production --min-time 'yesterday at noon' --max-time 'today at 4am'
 
     More: http://papertrailapp.com/
 
@@ -107,6 +111,21 @@ word for the program name:
 the "1;31;43" are bold (1), foreground red (31), background yellow (43),
 and can be any ANSI [escape characters].
 
+### UTF-8 (non-English searches)
+
+When searching in a language other than English, if you get no matches, you 
+may need to explicitly tell Ruby to use UTF-8. Ruby 1.9 honors the `LANG` 
+shell environment variable, and your shell may not set it to `UTF-8`.
+
+To test, try:
+
+    ruby -E:UTF-8 -S papertrail your_search
+
+If that works, add `-E:UTF-8` to the `RUBYOPT` variable to set the encoding 
+at invocation. For example, to persist that in a `.bashrc`:
+
+    export RUBYOPT="-E:UTF-8"
+
 
 ## Contribute
 

data/lib/papertrail.rb

@@ -1,5 +1,5 @@
 module Papertrail
- VERSION = "0.9.4"
+ VERSION = "0.9.5"
 end
 
 require 'papertrail/search_client'

data/lib/papertrail/cli.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'yaml'
+require 'chronic'
 
 require 'papertrail/connection'
 require 'papertrail/cli_helpers'
@@ -50,6 +51,12 @@ module Papertrail
         opts.on("-j", "--json", "Output raw json data") do |v|
           options[:json] = true
         end
+        opts.on("--min-time MIN", "Earliest time to search from.") do |v|
+          options[:min_time] = v
+        end
+        opts.on("--max-time MAX", "Latest time to search from.") do |v|
+          options[:max_time] = v
+        end
 
         opts.separator usage
       end.parse!
@@ -77,6 +84,8 @@ module Papertrail
         end
       end
 
+      set_min_max_time!(options, query_options)
+
       search_query = connection.query(ARGV[0], query_options)
 
       if options[:follow]
@@ -106,7 +115,7 @@ module Papertrail
       <<-EOF
 
   Usage: 
-    papertrail [-f] [-s system] [-g group] [-d seconds] [-c papertrail.yml] [-j] [query]
+    papertrail [-f] [-s system] [-g group] [-d seconds] [-c papertrail.yml] [-j] [--min-time mintime] [--max-time maxtime] [query]
 
   Examples:
     papertrail -f
@@ -115,6 +124,7 @@ module Papertrail
     papertrail -s ns1 "connection refused"
     papertrail -f "(www OR db) (nginx OR pgsql) -accepted"
     papertrail -f -g Production "(nginx OR pgsql) -accepted"
+    papertrail -g Production --min-time 'yesterday at noon' --max-time 'today at 4am'
 
   More: https://papertrailapp.com/
 

data/lib/papertrail/cli_add_system.rb

@@ -36,6 +36,9 @@ module Papertrail
         opts.on("-s", "--system SYSTEM", "Name of system to add") do |v|
           options[:system] = v
         end
+        opts.on("-n", "--hostname HOSTNAME", "Optional hostname which can be used to filter events from the same IP by syslog hostname") do |v|
+          options[:hostname] = v
+        end
         opts.on("-i", "--ip-address IP_ADDRESS", "IP address of system") do |v|
           options[:ip] = v
         end
@@ -52,13 +55,13 @@ module Papertrail
       raise OptionParser::MissingArgument, 'ip' if options[:ip].nil?
 
       connection = Papertrail::Connection.new(options)
-      
+
       # Bail if system already exists
       if connection.show_source(options[:system])
         exit 0
       end
 
-      if connection.register_source(options[:system], options[:ip])
+      if connection.register_source(options[:system], options[:ip], options[:hostname])
         exit 0
       end
 
@@ -72,8 +75,8 @@ module Papertrail
     def usage
       <<-EOF
 
-  Usage: 
-    papertrail-add-system [-s system] [-i ip-address] [-c papertrail.yml] 
+  Usage:
+    papertrail-add-system [-s system] [-i ip-address] [-n hostname] [-c papertrail.yml]
 
   Example:
     papertrail-add-system -s mysystemname -i 1.2.3.4

data/lib/papertrail/cli_helpers.rb

@@ -21,5 +21,16 @@ module Papertrail
 
       new_hash
     end
+
+    def set_min_max_time!(opts, q_opts)
+      q_opts[:min_time] = parse_time(opts[:min_time]).to_i if opts[:min_time]
+      q_opts[:max_time] = parse_time(opts[:max_time]).to_i if opts[:max_time]
+    end
+
+    def parse_time(tstring)
+      Chronic.parse(tstring) ||
+        raise(ArgumentError, "Could not parse time string '#{tstring}'")
+    end
+
   end
 end

data/lib/papertrail/connection.rb

@@ -96,8 +96,10 @@ module Papertrail
       end
     end
 
-    def register_source(name, ip_address)
-      @connection.post("systems.json", :system => { :name => name, :ip_address => ip_address })
+    def register_source(name, ip_address, hostname = nil)
+      opts = { :name => name, :ip_address => ip_address }
+      opts.merge! :hostname => hostname unless hostname.nil?
+      @connection.post("systems.json", :system => opts)
     end
 
     def unregister_source(name)

data/papertrail.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'papertrail'
-  s.version           = '0.9.4'
-  s.date              = '2012-08-13'
+  s.version           = '0.9.5'
+  s.date              = '2012-09-27'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('addressable')
   s.add_dependency('yajl-ruby')
+  s.add_dependency('chronic')
   s.add_dependency('faraday', [ '>= 0.6', '< 0.9' ])
   s.add_dependency('faraday_middleware', [ '~> 0.8.4' ])
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Papertrail
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-13 00:00:00 -07:00
+date: 2012-09-27 00:00:00 -07:00
 default_executable: papertrail
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,18 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  name: chronic
+  requirement: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -58,11 +70,11 @@ dependencies:
         - 9
         version: "0.9"
   name: faraday
-  requirement: *id003
+  requirement: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -72,7 +84,7 @@ dependencies:
         - 4
         version: 0.8.4
   name: faraday_middleware
-  requirement: *id004
+  requirement: *id005
   prerelease: false
 description: Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).
 email: troy@sevenscale.com