fluent-plugin-elb-log 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3816c144ddcef435c237835bb110c21219347bec
-  data.tar.gz: f66a68e0e773adfe6021d56003079e4aab908b93
+  metadata.gz: d4964547c8f6c81ddc8be0aee95bc942420cd824
+  data.tar.gz: 30fb414dc08343f64ee4c671aab0e5246fb8ba55
 SHA512:
-  metadata.gz: 127af81c80b4faa0ddf3af8f43ab98d86e26da37728f07cc5657872c13929302c1e0c0c1f05a56f1b4c391acfdc483fe53d5b23baf081b77ceb5eca2fc8ac0a1
-  data.tar.gz: 5ddcddbb6ad7b42da4710316dc8639ae51293681760539d7291c3ec4ac15476c7ac358ca6e388820d94dc28157178f3cd621de81c06c86614b8f0fde34cb1f0d
+  metadata.gz: 26bb99092bb3b2d5bd403f1e840cfe0f33ac75355e26dd02794300383f7ed0b29e86bd3bd66953d33fca842ddbf661b00290815af6f9b4f1c6b79b609c6bca53
+  data.tar.gz: 3d4c476adb92920fa4c51a1f7d109fbe5fe8138b9a05b6b5d8c939f5ea7d9ac6e2899656b769e861008636a5f886396f5462271af878bbab56db46b2c96438b6

data/fluent-plugin-elb-log.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-elb-log"
-  spec.version       = "0.2.7"
+  spec.version       = "0.2.8"
   spec.authors       = ["shinsaka"]
   spec.email         = ["shinx1265@gmail.com"]
   spec.summary       = "Amazon ELB log input plugin"

data/lib/fluent/plugin/in_elb_log.rb

@@ -1,9 +1,16 @@
+require 'fluent/input'
+
 class Fluent::Elb_LogInput < Fluent::Input
   Fluent::Plugin.register_input('elb_log', self)
 
   LOGFILE_REGEXP = /^((?<prefix>.+?)\/|)AWSLogs\/(?<account_id>[0-9]{12})\/elasticloadbalancing\/(?<region>.+?)\/(?<logfile_date>[0-9]{4}\/[0-9]{2}\/[0-9]{2})\/[0-9]{12}_elasticloadbalancing_.+?_(?<logfile_elb_name>[^_]+)_(?<elb_timestamp>[0-9]{8}T[0-9]{4}Z)_(?<elb_ip_address>.+?)_(?<logfile_hash>.+)\.log$/
   ACCESSLOG_REGEXP = /^(?<time>\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}\.\d{6}Z) (?<elb>.+?) (?<client>[^ ]+)\:(?<client_port>.+?) (?<backend>.+?)(\:(?<backend_port>.+?))? (?<request_processing_time>.+?) (?<backend_processing_time>.+?) (?<response_processing_time>.+?) (?<elb_status_code>.+?) (?<backend_status_code>.+?) (?<received_bytes>.+?) (?<sent_bytes>.+?) \"(?<request_method>.+?) (?<request_uri>.+?) (?<request_protocol>.+?)\"( \"(?<user_agent>.*?)\" (?<ssl_cipher>.+?) (?<ssl_protocol>.+)(| (?<option3>.*)))?/
 
+  # To support log_level option implemented by Fluentd v0.10.43
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   # Define `router` method to support v0.10.57 or earlier
   unless method_defined?(:router)
     define_method("router") { Fluent::Engine }
@@ -62,7 +69,7 @@ class Fluent::Elb_LogInput < Fluent::Input
       ec2 = Aws::EC2::Client.new(region: @region)
       !ec2.config.credentials.nil?
     rescue => e
-      $log.warn "EC2 Client error occurred: #{e.message}"
+      log.warn "EC2 Client error occurred: #{e.message}"
     end
   end
 
@@ -72,25 +79,25 @@ class Fluent::Elb_LogInput < Fluent::Input
       # get timestamp last proc
       start_time = @start_time ? Time.parse(@start_time).utc : Time.at(0)
       timestamp = start_time.to_i
-      $log.debug "timestamp file #{@timestamp_file} read"
+      log.debug "timestamp file #{@timestamp_file} read"
       File.open(@timestamp_file, File::RDONLY) do |file|
         timestamp = file.read.to_i if file.size > 0
       end
-      $log.debug "timestamp start at:" + Time.at(timestamp).to_s
+      log.debug "timestamp start at:" + Time.at(timestamp).to_s
       return timestamp
     rescue => e
-      $log.warn "timestamp file get and parse error occurred: #{e.message}"
+      log.warn "timestamp file get and parse error occurred: #{e.message}"
     end
   end
 
   def put_timestamp_file(timestamp)
     begin
-      $log.debug "timestamp file #{@timestamp_file} write"
+      log.debug "timestamp file #{@timestamp_file} write"
       File.open(@timestamp_file, File::WRONLY|File::CREAT|File::TRUNC) do |file|
         file.puts timestamp.to_s
       end
     rescue => e
-      $log.warn "timestamp file get and parse error occurred: #{e.message}"
+      log.warn "timestamp file get and parse error occurred: #{e.message}"
     end
   end
 
@@ -106,34 +113,34 @@ class Fluent::Elb_LogInput < Fluent::Input
       if @http_proxy
         options[:http_proxy] = @http_proxy
       end
-      $log.debug "S3 client connect"
+      log.debug "S3 client connect"
       Aws::S3::Client.new(options)
     rescue => e
-      $log.warn "S3 Client error occurred: #{e.message}"
+      log.warn "S3 Client error occurred: #{e.message}"
     end
   end
 
   def s3bucket_is_ok
     begin
-      $log.debug "search bucket #{@s3_bucketname}"
+      log.debug "search bucket #{@s3_bucketname}"
 
       s3_client.list_buckets.buckets.any? do |bucket|
         bucket.name == @s3_bucketname
       end
     rescue => e
-      $log.warn "S3 Client error occurred: #{e.message}"
+      log.warn "S3 Client error occurred: #{e.message}"
     end
   end
 
   def input
-    $log.debug "start"
+    log.debug "start"
 
     timestamp = get_timestamp_file()
 
     object_keys = get_object_keys(timestamp)
     object_keys = sort_object_key(object_keys)
 
-    $log.info "processing #{object_keys.count} object(s)."
+    log.info "processing #{object_keys.count} object(s)."
 
     object_keys.each do |object_key|
       record_common = {
@@ -176,7 +183,7 @@ class Fluent::Elb_LogInput < Fluent::Input
           elb_timestamp_unixtime = Time.parse(matches[:elb_timestamp]).to_i
           next if elb_timestamp_unixtime <= timestamp
 
-          $log.debug content.key
+          log.debug content.key
           object_keys << {
             key: content.key,
             prefix: matches[:prefix],
@@ -193,7 +200,7 @@ class Fluent::Elb_LogInput < Fluent::Input
       end
       return object_keys
     rescue => e
-      $log.warn "error occurred: #{e.message}"
+      log.warn "error occurred: #{e.message}"
     end
   end
 
@@ -203,13 +210,13 @@ class Fluent::Elb_LogInput < Fluent::Input
         a[:elb_timestamp_unixtime] <=> b[:elb_timestamp_unixtime]
       end
     rescue => e
-      $log.warn "error occurred: #{e.message}"
+      log.warn "error occurred: #{e.message}"
     end
   end
 
   def get_file_from_s3(object_name)
     begin
-      $log.debug "getting object from s3 name is #{object_name}"
+      log.debug "getting object from s3 name is #{object_name}"
 
       # read an object from S3 to a file and write buffer file
       File.open(@buf_file, File::WRONLY|File::CREAT|File::TRUNC) do |file|
@@ -221,7 +228,7 @@ class Fluent::Elb_LogInput < Fluent::Input
         end
       end
     rescue => e
-      $log.warn "error occurred: #{e.message}"
+      log.warn "error occurred: #{e.message}"
     end
   end
 
@@ -232,7 +239,7 @@ class Fluent::Elb_LogInput < Fluent::Input
         file.each_line do |line|
           line_match = ACCESSLOG_REGEXP.match(line)
           unless line_match
-            $log.info "nomatch log found: #{line} in #{record_common['key']}"
+            log.info "nomatch log found: #{line} in #{record_common['key']}"
             next
           end
   
@@ -263,7 +270,7 @@ class Fluent::Elb_LogInput < Fluent::Input
         end
       end
     rescue => e
-      $log.warn "error occurred: #{e.message}"
+      log.warn "error occurred: #{e.message}"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-log
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd