fluent-plugin-redshift-out 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/README.md CHANGED
@@ -80,9 +80,9 @@ Example (watch and upload json formatted apache log):
80
80
 
81
81
  + `type` (required) : The value must be `redshift-out`.
82
82
 
83
- + `aws_key_id` (required) : AWS access key id to access s3 bucket.
83
+ + `aws_key_id` : AWS access key id to access s3 bucket.
84
84
 
85
- + `aws_sec_key` (required) : AWS securet key id to access s3 bucket.
85
+ + `aws_sec_key` : AWS securet key id to access s3 bucket.
86
86
 
87
87
  + `s3_bucket` (required) : s3 bucket name. S3 bucket must be same as the region of your Redshift cluster.
88
88
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.0
1
+ 0.3.0
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
19
19
  gem.add_dependency "fluentd", "~> 0.10.0"
20
20
  gem.add_dependency "aws-sdk", "~> 1.60"
21
21
  gem.add_dependency "multi_json", "~> 1.10"
22
- gem.add_dependency "oj", "~> 2.11"
22
+ gem.add_dependency "yajl-ruby", "~> 1.2"
23
23
  gem.add_dependency "pg", "~> 0.17.0"
24
24
  gem.add_development_dependency "rake"
25
25
  gem.add_development_dependency "simplecov", ">= 0.5.4"
@@ -16,14 +16,14 @@ class RedshiftOutput < BufferedOutput
16
16
  require 'pg'
17
17
  require 'csv'
18
18
  require 'multi_json'
19
- require 'oj'
20
- ::MultiJson.use(:oj)
19
+ require 'yajl'
20
+ ::MultiJson.use(:yajl)
21
21
  end
22
22
 
23
23
  config_param :record_log_tag, :string, :default => 'log'
24
24
  # s3
25
- config_param :aws_key_id, :string
26
- config_param :aws_sec_key, :string
25
+ config_param :aws_key_id, :string, :default => nil
26
+ config_param :aws_sec_key, :string, :default => nil
27
27
  config_param :s3_bucket, :string
28
28
  config_param :s3_region, :string, :default => nil
29
29
  config_param :path, :string, :default => ""
@@ -118,9 +118,9 @@ class RedshiftOutput < BufferedOutput
118
118
  s3_uri = "s3://#{@s3_bucket}/#{s3path}"
119
119
  credentials = @s3.client.credential_provider.credentials
120
120
  sql = "copy #{table_name_with_schema} from '#{s3_uri}'"
121
- sql += " CREDENTIALS 'aws_access_key_id=#{credentials[:access_key_id]}; aws_secret_access_key=#{credentials[:secret_access_key]};"
122
- sql += " token=#{credentials[:session_token]};" if credentials[:session_token]
123
- sql += " delimiter '#{@delimiter}' GZIP ESCAPE #{@redshift_copy_base_options} #{@redshift_copy_options};"
121
+ sql += " CREDENTIALS 'aws_access_key_id=#{credentials[:access_key_id]};aws_secret_access_key=#{credentials[:secret_access_key]}"
122
+ sql += ";token=#{credentials[:session_token]}" if credentials[:session_token]
123
+ sql += "' delimiter '#{@delimiter}' GZIP ESCAPE #{@redshift_copy_base_options} #{@redshift_copy_options};"
124
124
 
125
125
  $log.debug format_log("start copying. s3_uri=#{s3_uri}")
126
126
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-redshift-out
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -60,13 +60,13 @@ dependencies:
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.10'
62
62
  - !ruby/object:Gem::Dependency
63
- name: oj
63
+ name: yajl-ruby
64
64
  requirement: !ruby/object:Gem::Requirement
65
65
  none: false
66
66
  requirements:
67
67
  - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: '2.11'
69
+ version: '1.2'
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  requirements:
75
75
  - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: '2.11'
77
+ version: '1.2'
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: pg
80
80
  requirement: !ruby/object:Gem::Requirement