rack-logstash-writer 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55e028d5e62b97b3c6ea5ea78bf4c9073e74bf6b
-  data.tar.gz: 8776e5883b2322995556d624b8a531dc740121cb
+  metadata.gz: 7ff2b86195cfeda0d8087a23d4ea91059993c0a1
+  data.tar.gz: 35fcf1f76924d92d67534730151bceb9a21f8603
 SHA512:
-  metadata.gz: 1e6a996eeaa3f3b786da57278057c3a4c022a17f393e179f2b3a89e08c601e0710e1cbcd02f2dae38c3b35d75a41af0f46672c90695434e178e65033d748d034
-  data.tar.gz: 1f281f6ebae165c85a8dbda4b324e68b9f2e0814222c9ece32dc57e3d42806e34b939a95e688a19be5670ce17f89e89ce22f89bd26f7070d4faebabda024f5dc
+  metadata.gz: 518508d1c5acf891ded2773f8139286992c751f2269b7e782e73385e56c11f2d65ec2348c676f49fe720e4ff92544da092e5d8822ba3b997537bf748d6c4002e
+  data.tar.gz: 8f539024bc70c3e191f12e3817fff186ba7cdbad2b6b63555b15e8ec665f3e972db319bb9003fdd1840813a326db86c1895cd54f1e14bd3657715340a1e46c43

data/README.md

@@ -34,6 +34,7 @@ use Rack::LogstashWriter , {url: "file:///home/org/Desktop/logsample", # require
     response_headers: {'head1'=>'head1'}, # optional, parameters to add to the report from the responce headers. default nil
     statuses: [*(500..600)], # optional, send events to log stash only for those statuses. default [*(500..600)] 
     body_len: 50 # optional, include the first given chars from the body. default 1000
+    body_regex: {:name_to_show => 'regex'}, include the regular expression from the body
     }
     
 run Proc.new {[200, {"Content-Type" => "application/json"}, ['{ "message" : "Hello!" }']]}

data/examples/regular rack file/config.ru

@@ -19,7 +19,9 @@ use Rack::LogstashWriter , {url: "file:///home/org/Desktop/logsample", # or anot
     request_headers: {'head1'=>'head1'},
     response_headers: {'head1'=>'head1'},
     statuses: [*(500..600)] ,
-    body_len: 50 }
+    body_len: 50 ,
+    body_regex: {service_name: 'service_namev:(.*).*[,]?.*}' }
+}
 
 map '/hello.json' do
   run JSONServer.new

data/examples/sinatra-project/config.ru

@@ -1,10 +1,15 @@
-require 'rack/logstash-writer'
+# require 'rack/logstash-writer'
+
+ require ::File.expand_path('../../../lib/rack/logstash-writer', __FILE__)
 
 # Rails.root/config.ru
 require ::File.expand_path('../lib/sinatra', __FILE__)
 
 # use Rails::Rack::Debugger
 # use Rack::ContentLength
-use Rack::LogstashWriter, {url: "file:///home/org/Desktop/logsample" ,statuses: [*(200..600)], body_len: 0, #response_headers: {'User-agent'=>'ua-nimrod'},
-                           request_headers: {'User-agent'=>'ua-nimrod'}} #"udp://localhost:5228" #  "udp://localhost:5228"
+use Rack::LogstashWriter, {url: "tcp://localhost:5228" ,statuses: [*(200..600)], body_len: 100, response_headers: {'message' => 'This-is-a-message-man'},
+                           request_headers: {'User-agent'=>'ua-nimrod'}, #"udp://localhost:5228" #   "file:///home/org/Desktop/logsample"
+                           body_regex: {service_name: 'service_namev:(.*).*[,]?.*}' }
+}
+
 run Sinatra::Application

data/examples/sinatra-project/lib/sinatra.rb

@@ -6,10 +6,20 @@ get '/' do
 end
 
 get '/hello/:name' do |n|
-  ssdaasdsdwads
   # matches "GET /hello/foo" and "GET /hello/bar"
   # params['name'] is 'foo' or 'bar'
   # n stores params['name']
   "Hello #{n}!"
 end
 
+get '/goodbye/:name' do |n|
+  "Goodbye #{n}!"
+  [555, {"Content-Type" => "application/json"}, ['{\"keyword_finder\":\"http://localhost:11120\",\"service_namev:\"abi-mgmt\"}'] ]
+  # [{"\"db_host\":\"localhost\",\"env\":\"development\",\"redis\":\"redis://localhost:6379\",\"keyword_finder\":\"http://localhost:11120\",\"service_name\":\"abi-mgmt\"}\""}
+end
+
+get '/error/:name' do |n|
+  "Error #{n}!"
+  1/0
+end
+

data/lib/rack/logstash-writer.rb

@@ -1,11 +1,10 @@
 require 'socket'
 require 'uri'
 require 'json'
+require 'socket'
 
 module Rack
-
   class LogstashWriter
-
     # Initialize a new Rack adapter, logstash writer
     # @param [Hash] options
     # @option options [String] :url: required, udp and files schemes are also avaliable. no default values.
@@ -58,14 +57,20 @@ module Rack
           :method => env["REQUEST_METHOD"],
           :path => env["PATH_INFO"],
           :query_string => env["QUERY_STRING"],
+          :host => env["REMOTE_HOST"],
           :status => status.to_i,
           :duration => (Time.now - began_at),
           :remote_addr => env['REMOTE_ADDR'],
           :request => request_line(env),
-          :length => extract_content_length(response_headers),
+          :service_name => Dir.pwd.split("/").last ,
           :"X-Forwarded-For" => response_headers['X-Forwarded-For']
       }
 
+      if data[:host] =='localhost'
+         soc = Socket.ip_address_list.map {|s| s.ip_address}.reject {|s| s=='127.0.0.1'}.select {|s| 16 >(s.size) && (s.size)>10}.first
+         data[:host] = "ip-#{soc.gsub(".","-")}"
+      end
+
       # This just works for all body types (magic?)... see http://www.rubydoc.info/github/rack/rack/Rack/BodyProxy
       body.each{|x| data[:body] = x[0..@options[:body_len]] }
       @options[:request_headers].each { |header, log_key| env_key = "HTTP_#{header.upcase.gsub('-', '_')}" ; data[log_key] = env[env_key] if env[env_key]} if !@options[:request_headers].nil?
@@ -73,9 +78,18 @@ module Rack
 
       data[:error_msg] = env["sinatra.error"] if env.has_key?("sinatra.error")
 
-      event = {'@fields' => data, '@tags' => ['request'], '@timestamp' => ::Time.now.utc, '@version' => 1}
+      @options[:body_regex].each { |k,v| data[k] = data[:body].to_s.match(/#{v}/).captures[0].gsub("\\","").gsub("\"","") rescue data[k]= "" } if !@options[:body_regex].nil?
+
+      severity = "DEBUG"
+      case status
+        when 300..399 then severity = "WARN"
+        when 400..599 then severity = "ERROR"
+      end
+      event = {:severity => severity}.merge data
+      # logger.puts({'@fields' => data, '@tags' => ['request'], '@timestamp' => ::Time.now.utc, '@version' => 23})
+      # TODO to include this lines
       begin
-        device.puts( event.to_json + '\n' )
+        device.puts( event.to_json )
       # rescue Errno::EPIPE, Errno::EINVAL
       rescue Exception => e
         STDERR.puts "Error : Failed to write log to : #{@options[:url]}, #{e.message}."
@@ -90,9 +104,5 @@ module Rack
       line
     end
 
-    def extract_content_length headers
-      value = headers[CONTENT_LENGTH] or return '-'
-      value.to_s == '0' ? '-' : value
-    end
   end
-end
+end

data/lib/rack/logstash-writer/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class LogstashWriter
-    VERSION = "1.0.5"
+    VERSION = "1.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-logstash-writer
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - or garfunkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake