-
Notifications
You must be signed in to change notification settings - Fork 218
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Multiple S3 buckets support for input, dynamic bucket names from SQS, and queue url override #364
Open
abdullahzen
wants to merge
3
commits into
fluent:master
Choose a base branch
from
abdullahzen:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+138
−17
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,8 +76,8 @@ def initialize | |
| desc "Profile name. Default to 'default' or ENV['AWS_PROFILE']" | ||
| config_param :profile_name, :string, default: nil | ||
| end | ||
| desc "S3 bucket name" | ||
| config_param :s3_bucket, :string | ||
| desc "S3 bucket name(s) separated by commas in case of multiple bucket names" | ||
| config_param :s3_buckets, :string | ||
| desc "S3 region name" | ||
| config_param :s3_region, :string, default: ENV["AWS_REGION"] || "us-east-1" | ||
| desc "Use 's3_region' instead" | ||
|
|
@@ -96,6 +96,8 @@ def initialize | |
| config_param :queue_name, :string, default: nil | ||
| desc "SQS Owner Account ID" | ||
| config_param :queue_owner_aws_account_id, :string, default: nil | ||
| desc "SQS queue url, when passed it'll not get the queue URL by name & account ID" | ||
| config_param :queue_url, :string, default: nil | ||
| desc "Use 's3_region' instead" | ||
| config_param :endpoint, :string, default: nil | ||
| desc "Skip message deletion" | ||
|
|
@@ -106,6 +108,7 @@ def initialize | |
| config_param :retry_error_interval, :integer, default: 300 | ||
| end | ||
|
|
||
| # Default tag will include input.s3.bucket_name ###Check the function process(body) | ||
| desc "Tag string" | ||
| config_param :tag, :string, default: "input.s3" | ||
|
|
||
|
|
@@ -145,16 +148,29 @@ def start | |
| s3_client = create_s3_client | ||
| log.debug("Succeeded to create S3 client") | ||
| @s3 = Aws::S3::Resource.new(client: s3_client) | ||
| @bucket = @s3.bucket(@s3_bucket) | ||
|
|
||
| raise "#{@bucket.name} is not found." unless @bucket.exists? | ||
| @buckets = {} | ||
| if (@s3_buckets.include?(",")) | ||
| splitted_buckets = @s3_buckets.split(',') | ||
| splitted_buckets.each do | bucket | | ||
| @buckets[bucket] = @s3.bucket(bucket) | ||
| raise "#{bucket} is not found." unless @buckets[bucket].exists? | ||
| end | ||
| else | ||
| @buckets[@s3_buckets] = @s3.bucket(@s3_buckets) | ||
| raise "#{@s3_buckets} is not found." unless @buckets[@s3_buckets].exists? | ||
| end | ||
|
|
||
| check_apikeys if @check_apikey_on_start | ||
|
|
||
| sqs_client = create_sqs_client | ||
| log.debug("Succeeded to create SQS client") | ||
| response = sqs_client.get_queue_url(queue_name: @sqs.queue_name, queue_owner_aws_account_id: @sqs.queue_owner_aws_account_id) | ||
| sqs_queue_url = response.queue_url | ||
| sqs_queue_url = nil | ||
| if (@sqs.queue_url.nil?) | ||
| response = sqs_client.get_queue_url(queue_name: @sqs.queue_name, queue_owner_aws_account_id: @sqs.queue_owner_aws_account_id) | ||
| sqs_queue_url = response.queue_url | ||
| else | ||
| sqs_queue_url = @sqs.queue_url | ||
| end | ||
| log.debug("Succeeded to get SQS queue URL") | ||
|
|
||
| @poller = Aws::SQS::QueuePoller.new(sqs_queue_url, client: sqs_client) | ||
|
|
@@ -279,29 +295,39 @@ def create_sqs_client | |
| end | ||
|
|
||
| def check_apikeys | ||
| @bucket.objects.first | ||
| log.debug("Succeeded to verify API keys") | ||
| @buckets.each do | bucket_name, bucket_object | | ||
| bucket_object.objects.first | ||
| log.debug("Succeeded to verify API keys for bucket #{bucket_name}") | ||
| end | ||
| rescue => e | ||
| raise "can't call S3 API. Please check your credentials or s3_region configuration. error = #{e.inspect}" | ||
| end | ||
|
|
||
| def process(body) | ||
| s3 = body["Records"].first["s3"] | ||
| raw_key = s3["object"]["key"] | ||
| raw_bucket_name = s3["bucket"]["name"] | ||
| key = CGI.unescape(raw_key) | ||
|
|
||
| io = @bucket.object(key).get.body | ||
| if ([email protected]?(raw_bucket_name)) | ||
| raise "S3 bucket name: #{raw_bucket_name} returned from SQS was not provided in the input configuration as one of the s3 fluentd sources." | ||
| end | ||
|
|
||
| io = @buckets[raw_bucket_name].object(key).get.body | ||
| content = @extractor.extract(io) | ||
| es = Fluent::MultiEventStream.new | ||
| content.each_line do |line| | ||
| @parser.parse(line) do |time, record| | ||
| if @add_object_metadata | ||
| record['s3_bucket'] = @s3_bucket | ||
| record['s3_bucket'] = raw_bucket_name | ||
| record['s3_key'] = raw_key | ||
| end | ||
| es.add(time, record) | ||
| end | ||
| end | ||
| if (@tag == "input.s3") | ||
| @tag = "input.s3.#{raw_bucket_name}" | ||
| end | ||
| router.emit_stream(@tag, es) | ||
| end | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changing parameter name breaks existing configurations.
We couldn't accept this change.
Instead, using deprecated attr in config_param and adding parameter conversion code are needed to accept this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the review. I'll do the requested changes to make it backwards compatible and get back to you 👍