fluent-plugin-rds-pgsql-log 0.4.0 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +3 -1
- data/Rakefile +1 -0
- data/fluent-plugin-rds-pgsql-log.gemspec +3 -2
- data/lib/fluent/plugin/in_rds_pgsql_log.rb +9 -3
- data/test/plugin/test_in_rds_pgsql.rb +2 -1
- metadata +19 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fe0c978c0df512f082cd523a4b5816a01e5b14cb
|
4
|
+
data.tar.gz: ebbb1604b7e59d4f9c20ab02bf155994b64e34e4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f791ec9fee312a1f1ff51708a72cd01fdf889389fe81c5842375b61b8ccedb5c3f981ac1cd30844ad3072eb4bef8437f73682e49327f88b0dba85535f8b78b4b
|
7
|
+
data.tar.gz: 5e8d3618e0d1f6e9b42f929136058bbd1e058a17efda2bfad2d6db00f3d14d333bdbdabe503ad431fbfcc43e604d8134ccfc511b0d85c8a0e360a747178cb731
|
data/.gitignore
CHANGED
data/Rakefile
CHANGED
@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
3
3
|
|
4
4
|
Gem::Specification.new do |spec|
|
5
5
|
spec.name = "fluent-plugin-rds-pgsql-log"
|
6
|
-
spec.version = "0.
|
6
|
+
spec.version = "0.5.0"
|
7
7
|
spec.authors = ["shinsaka"]
|
8
8
|
spec.email = ["shinx1265@gmail.com"]
|
9
9
|
spec.summary = "Amazon RDS for PostgreSQL log input plugin"
|
@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
|
|
17
17
|
spec.require_paths = ["lib"]
|
18
18
|
|
19
19
|
spec.add_dependency "fluentd", ">= 0.14.0", "< 2"
|
20
|
-
spec.add_dependency "aws-sdk", "~>
|
20
|
+
spec.add_dependency "aws-sdk-ec2", "~> 1"
|
21
|
+
spec.add_dependency "aws-sdk-rds", "~> 1"
|
21
22
|
|
22
23
|
spec.add_development_dependency "bundler", "~> 1.7"
|
23
24
|
spec.add_development_dependency "rake", "~> 12"
|
@@ -1,5 +1,6 @@
|
|
1
1
|
require 'fluent/input'
|
2
|
-
require 'aws-sdk'
|
2
|
+
require 'aws-sdk-ec2'
|
3
|
+
require 'aws-sdk-rds'
|
3
4
|
|
4
5
|
class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
|
5
6
|
Fluent::Plugin.register_input('rds_pgsql_log', self)
|
@@ -177,6 +178,11 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
|
|
177
178
|
return raw_records
|
178
179
|
end
|
179
180
|
|
181
|
+
def event_time_of_row(record)
|
182
|
+
time = Time.parse(record["time"])
|
183
|
+
return Fluent::EventTime.from_time(time)
|
184
|
+
end
|
185
|
+
|
180
186
|
def parse_and_emit(raw_records, log_file_name)
|
181
187
|
begin
|
182
188
|
log.debug "raw_records.count: #{raw_records.count}"
|
@@ -190,7 +196,7 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
|
|
190
196
|
record["message"] << "\n" + raw_record unless record.nil?
|
191
197
|
else
|
192
198
|
# emit before record
|
193
|
-
router.emit(@tag,
|
199
|
+
router.emit(@tag, event_time_of_row(record), record) unless record.nil?
|
194
200
|
|
195
201
|
# set a record
|
196
202
|
record = {
|
@@ -206,7 +212,7 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
|
|
206
212
|
end
|
207
213
|
end
|
208
214
|
# emit last record
|
209
|
-
router.emit(@tag,
|
215
|
+
router.emit(@tag, event_time_of_row(record), record) unless record.nil?
|
210
216
|
rescue => e
|
211
217
|
log.warn e.message
|
212
218
|
end
|
@@ -76,7 +76,8 @@ class RdsPgsqlLogInputTest < Test::Unit::TestCase
|
|
76
76
|
d.run(timeout: 3, expect_emits: 1)
|
77
77
|
|
78
78
|
events = d.events
|
79
|
-
|
79
|
+
assert_instance_of(Fluent::EventTime, events[0][1])
|
80
|
+
assert_equal(events[0][1].inspect, "2019-01-26 22:10:20.000000000 +0000")
|
80
81
|
assert_equal(events[0][2]["pid"], '129155')
|
81
82
|
assert_equal(events[0][2]["message_level"], 'LOG')
|
82
83
|
assert_equal(events[0][2]["message"], 'some db log')
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fluent-plugin-rds-pgsql-log
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.5.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- shinsaka
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-04-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fluentd
|
@@ -31,19 +31,33 @@ dependencies:
|
|
31
31
|
- !ruby/object:Gem::Version
|
32
32
|
version: '2'
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
|
-
name: aws-sdk
|
34
|
+
name: aws-sdk-ec2
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
36
36
|
requirements:
|
37
37
|
- - "~>"
|
38
38
|
- !ruby/object:Gem::Version
|
39
|
-
version: '
|
39
|
+
version: '1'
|
40
40
|
type: :runtime
|
41
41
|
prerelease: false
|
42
42
|
version_requirements: !ruby/object:Gem::Requirement
|
43
43
|
requirements:
|
44
44
|
- - "~>"
|
45
45
|
- !ruby/object:Gem::Version
|
46
|
-
version: '
|
46
|
+
version: '1'
|
47
|
+
- !ruby/object:Gem::Dependency
|
48
|
+
name: aws-sdk-rds
|
49
|
+
requirement: !ruby/object:Gem::Requirement
|
50
|
+
requirements:
|
51
|
+
- - "~>"
|
52
|
+
- !ruby/object:Gem::Version
|
53
|
+
version: '1'
|
54
|
+
type: :runtime
|
55
|
+
prerelease: false
|
56
|
+
version_requirements: !ruby/object:Gem::Requirement
|
57
|
+
requirements:
|
58
|
+
- - "~>"
|
59
|
+
- !ruby/object:Gem::Version
|
60
|
+
version: '1'
|
47
61
|
- !ruby/object:Gem::Dependency
|
48
62
|
name: bundler
|
49
63
|
requirement: !ruby/object:Gem::Requirement
|