fluent-plugin-elb-log 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b90a7ba2cb9c1a065697787d2634625df53bb3f28b2f4a3d88c940071255b848
-  data.tar.gz: 899bbcf97b460fbf709f4aee85a6ab418c8d58cd5fb53f7aeabaf54fcb729511
+  metadata.gz: 27ca22f138e46f8b033a674791600cafd324adcb87a0514d4189cf2e8cd112c2
+  data.tar.gz: 21beb83010ab4273a8e8eb7d1f3b923526a967c9fed8a03eae2e9bde06d1d14a
 SHA512:
-  metadata.gz: dabbbdc5f79f83ba6003057126d62e492da600584840d72d2240eaea1bcc532cf56d9177762b0aa1cdc055e88bfb1d7840f7a11c6b95861905df3dd4e28eedbe
-  data.tar.gz: 48d929caa219fc1b8ef6aa2c5e971cfe2ea1c1f1f6a556ff431b3a7e338eb0c8f9a8701f284aec9ec5e71a7c1304f6cf0d0e403edccfe9d6361324bc362b76a4
+  metadata.gz: 6e6fc7a9042cd756b9521be3bce5ea37e06f2f7d489a440d575977df03a240199ed836ddb8109db7e28817348e1848833201742330109ec1a627efed1345286d
+  data.tar.gz: a65c3a910d2f6ddd794e8e5555f0ef294f012b54097a5da07cf68dc0e5d47e9dc5bd3a267f22ab205bd72a70ea385c74bfc9be28fcf54da32f4b6d513a656b67

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       = "1.4.0"
+  spec.version       = "1.4.1"
   spec.authors       = ["shinsaka","jazzl0ver"]
   spec.email         = ["shinx1265@gmail.com"]
   spec.summary       = "Amazon ELB log input plugin"

data/lib/fluent/plugin/in_elb_log.rb

@@ -13,7 +13,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
   helpers :timer
 
   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>[^_]+)_(?<logfile_timestamp>[0-9]{8}T[0-9]{4}Z)_(?<elb_ip_address>.+?)_(?<logfile_hash>.+)\.log(.gz)?$/
-  ACCESSLOG_REGEXP = /^((?<type>[a-z0-9]+) )?(?<time>\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}\.\d{6}Z) (?<elb>\S+) (?<client>\S+)\:(?<client_port>\S+) (?<target>[^:\s]+)(?::(?<target_port>\S+))? (?<request_processing_time>\S+) (?<target_processing_time>\S+) (?<response_processing_time>\S+) (?<elb_status_code>\S+) (?<target_status_code>\S+) (?<received_bytes>\S+) (?<sent_bytes>\S+) \"(?<request_method>\S+) (?<request_uri>\S+) (?<request_protocol>\S+)\" \"(?<user_agent>.+?)\" (?<ssl_cipher>\S+) (?<ssl_protocol>\S+) (?<target_group_arn>\S+) \"(?<trace_id>\S+)\" \"(?<domain_name>\S+)\" \"(?<chosen_cert_arn>\S+)\" (?<matched_rule_priority>\S+) (?<request_creation_time>\S+) \"(?<actions_executed>\S+)\" \"(?<redirect_url>\S+)\" \"(?<error_reason>\S+)\" \"(?<target_port_list>\S+)\" \"(?<target_status_code_list>\S+)\" \"(?<classification>\S+)\" \"(?<classification_reason>\S+)\" (?<conn_trace_id>\S+)/
+  ACCESSLOG_REGEXP = /^((?<type>[a-z0-9]+) )?(?<time>\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}\.\d{6}Z) (?<elb>\S+) (?<client>\S+)\:(?<client_port>\S+) (?<target>[^:\s]+)(?::(?<target_port>\S+))? (?<request_processing_time>\S+) (?<target_processing_time>\S+) (?<response_processing_time>\S+) (?<elb_status_code>\S+) (?<target_status_code>\S+) (?<received_bytes>\S+) (?<sent_bytes>\S+) \"(?<request_method>\S+) (?<request_uri>\S+) (?<request_protocol>\S+)\" \"(?<user_agent>.*?)\" (?<ssl_cipher>\S+) (?<ssl_protocol>\S+) (?<target_group_arn>\S+) \"(?<trace_id>\S+)\" \"(?<domain_name>\S+)\" \"(?<chosen_cert_arn>\S+)\" (?<matched_rule_priority>\S+) (?<request_creation_time>\S+) \"(?<actions_executed>\S+)\" \"(?<redirect_url>\S+)\" \"(?<error_reason>\S+)\" \"(?<target_port_list>\S+)\" \"(?<target_status_code_list>\S+)\" \"(?<classification>\S+)\" \"(?<classification_reason>\S+)\" (?<conn_trace_id>\S+)/
   config_param :access_key_id, :string, default: nil, secret: true
   config_param :secret_access_key, :string, default: nil, secret: true
   config_param :region, :string
@@ -62,9 +62,10 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
 
     Signal.trap('INT') { shutdown }
 
+	refresh_aws_clients!
+
     if @use_sqs
       input
-      @sqs_client = sqs_client
       setup_sqs_timer
     else
       setup_input_timer
@@ -73,16 +74,22 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
 
   private
 
+  def refresh_aws_clients!
+    log.debug "Refreshing AWS credentials"
+    @s3_client = s3_client
+    @sqs_client = sqs_client if @use_sqs    
+  end
+
   def shutdown
     log.debug "shutdown"
     if @running
 	@running = false
-        if @use_sqs
+	if @use_sqs
           log.debug "pausing shutdown for 2x#{@refresh_interval}"
           sleep 2*@refresh_interval
           unset_sqs if @queue_url && @queue_url != ""
         else
-          log.debug "pausing shutdown for 30 seconds"
+    	  log.debug "pausing shutdown for 30 seconds"
           sleep 30
         end
     end
@@ -91,13 +98,17 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
   def setup_sqs_timer
     if @running
       setup_sqs
+      return unless @running
       timer_execute(:in_elb_log, @refresh_interval) do
 	if @running
-    	    process_sqs
-    	    log.debug "sleeping for #{@refresh_interval}"
+		  refresh_aws_clients!
+    	  process_sqs
+    	  log.debug "sleeping for #{@refresh_interval}"
     	else
+    	  if @queue_url && @queue_url != ""
     	    log.debug "Unsetting SQS"
-	    unset_sqs if @queue_url && @queue_url != ""
+	    unset_sqs
+	  end
 	end
       end
     end
@@ -107,6 +118,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
     if @running
       timer_execute(:in_elb_log, @refresh_interval) do
 	if @running
+			refresh_aws_clients!
     	    input
 	    log.debug "sleeping input for #{@refresh_interval}"
 	end
@@ -120,6 +132,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       !ec2.config.credentials.nil?
     rescue => e
       log.warn "EC2 Client error occurred: #{e.message}"
+      @running = false
     end
   end
 
@@ -128,7 +141,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
     timestamp = Time.now.to_i
     queue_name = "fluent-plugin-elb-log-#{timestamp}"
 
-    sts_client = Aws::STS::Client.new
+    sts_client = Aws::STS::Client.new(region: @region)
     account_id = sts_client.get_caller_identity.account
 
     queue_policy = {
@@ -142,13 +155,13 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
             "Service": "s3.amazonaws.com"
           },
           "Action": "SQS:SendMessage",
-          "Resource": "arn:aws:sqs:us-east-1:#{account_id}:#{queue_name}",
+          "Resource": "arn:aws:sqs:#{@region}:#{account_id}:#{queue_name}",
           "Condition": {
             "StringEquals": {
               "aws:SourceAccount": "#{account_id}"
 	    },
             "ArnLike": {
-    	      "aws:SourceArn": "arn:aws:s3:*:*:#{@s3_bucket}"
+    	      "aws:SourceArn": "arn:aws:s3:*:*:#{@s3_bucketname}"
 	    }
           }
         }
@@ -195,11 +208,14 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
 
     rescue Aws::SQS::Errors::InvalidAttributeValue => e
       log.debug "SQS error: #{e.message}"
+      @running = false
 
     rescue Aws::S3::Errors::InvalidArgument => e
       log.debug "S3 Event error: #{e.message}"
       sqs_client.delete_queue(queue_url: @queue_url)
+      @queue_url = ""
       log.debug "#{queue_arn} deleted"
+      @running = false
     end
   end
 
@@ -234,6 +250,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       return timestamp
     rescue => e
       log.warn "timestamp file get and parse error occurred: #{e.message}"
+      @running = false
     end
   end
 
@@ -245,6 +262,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       end
     rescue => e
       log.warn "timestamp file get and parse error occurred: #{e.message}"
+      @running = false
     end
   end
 
@@ -264,6 +282,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       Aws::S3::Client.new(options)
     rescue => e
       log.warn "S3 Client error occurred: #{e.message}"
+      @running = false
     end
   end
 
@@ -275,6 +294,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       !(get_object_list(1).nil?)
     rescue => e
       log.warn "error occurred: #{e.message}"
+      @running = false
       false
     end
   end
@@ -295,6 +315,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       Aws::SQS::Client.new(options)
     rescue => e
       log.warn "SQS Client error occurred: #{e.message}"
+      @running = false
     end
   end
 
@@ -334,6 +355,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       end
     rescue => e
       log.warn "error occurred: #{e.message}"
+      @running = false
     end
   end
 
@@ -417,6 +439,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       end
       rescue => e
         log.warn "error occurred: #{e.message}"
+        @running = false
     end
   end
 
@@ -427,6 +450,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       end
     rescue => e
       log.warn "error occurred: #{e.message}"
+      @running = false
     end
   end
 
@@ -531,6 +555,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       end
     rescue => e
       log.warn "error occurred: #{e.message}, #{e.backtrace}"
+      @running = false
     end
   end
 
@@ -570,6 +595,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       end
     rescue => e
       log.warn "error occurred: #{e.message}"
+      @running = false
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-log
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - shinsaka
 - jazzl0ver
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-01 00:00:00.000000000 Z
+date: 2026-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -151,7 +151,7 @@ homepage: https://github.com/jazzl0ver/fluent-plugin-elb-log
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Amazon ELB log input plugin
 test_files: