fluent-plugin-rds-pgsql-log 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5680fbec5f65cfcfb2d039fc2e50668cc5030291
-  data.tar.gz: 4bb1941a171f00fd30e2cc3d62f962af430be090
+  metadata.gz: 8ef1de71b76cd256ade578928b9799c8a728ba8c
+  data.tar.gz: b32866f201c50d4e94a0c608db3762516500e5f1
 SHA512:
-  metadata.gz: eba458bfc219c432586ef2b37f0d1617999d6cf7a432d8032ee112bd23a8c8d9572718ddcf4b03621fef216183f26e0d7693cfd4559ad8b48c1ad9b170a00c38
-  data.tar.gz: bc3ce7977567f86945ade706b23e600de507e7ac0df020f177bfd67cc137014ed5f83976ab0fe316d73c4fbdc0778bdbd98d51df56f03a5a1a1fb6191924e940
+  metadata.gz: 48d95204d022492d2a38a7070e2dfe1bb8bb9a960a90f5d7cab78efbddd147c0707ee391d863430cbf24a00f41cd67028646f9b119246989da14d050c4cb0117
+  data.tar.gz: 0f234c127f0ff778cc5914a837be2e77bbed9fbe661e4848ce585c30fa2146dd2acb65f8172e8e5fa7f0c0b61687a23ae971a9e803cd81e3ee46034d760bb541

data/README.md

@@ -78,3 +78,7 @@ SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt (If you using amazon linux)
 
 ### 0.3.0
 - use AWS SDK v3.x
+
+### 0.4.0
+- Use record time
+

data/fluent-plugin-rds-pgsql-log.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-rds-pgsql-log"
-  spec.version       = "0.3.2"
+  spec.version       = "0.4.0"
   spec.authors       = ["shinsaka"]
   spec.email         = ["shinx1265@gmail.com"]
   spec.summary       = "Amazon RDS for PostgreSQL log input plugin"

data/lib/fluent/plugin/in_rds_pgsql_log.rb

@@ -28,13 +28,6 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
     raise Fluent::ConfigError.new("pos_file is required") unless @pos_file
     raise Fluent::ConfigError.new("refresh_interval is required") unless @refresh_interval
     raise Fluent::ConfigError.new("tag is required") unless @tag
-  end
-
-  def start
-    super
-
-    # pos file touch
-    File.open(@pos_file, File::RDWR|File::CREAT).close
 
     begin
       options = {
@@ -48,6 +41,13 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
     rescue => e
       log.warn "RDS Client error occurred: #{e.message}"
     end
+  end
+
+  def start
+    super
+
+    # pos file touch
+    File.open(@pos_file, File::RDWR|File::CREAT).close
 
     timer_execute(:poll_logs, @refresh_interval, repeat: true, &method(:input))
   end
@@ -190,7 +190,7 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
           record["message"] << "\n" + raw_record unless record.nil?
         else
           # emit before record
-          router.emit(@tag, Fluent::Engine.now, record) unless record.nil?
+          router.emit(@tag, Time.parse(record["time"]), record) unless record.nil?
 
           # set a record
           record = {
@@ -206,7 +206,7 @@ class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
         end
       end
       # emit last record
-      router.emit(@tag, Fluent::Engine.now, record) unless record.nil?
+      router.emit(@tag, Time.parse(record["time"]), record) unless record.nil?
     rescue => e
       log.warn e.message
     end

data/test/plugin/test_in_rds_pgsql.rb

@@ -10,7 +10,7 @@ class RdsPgsqlLogInputTest < Test::Unit::TestCase
     secret_access_key: 'dummy_secret_access_key',
     region: 'ap-northeast-1',
     db_instance_identifier: 'test-postgres-id',
-    refresh_interval: 30,
+    refresh_interval: 2,
     pos_file: 'pgsql-log-pos.dat',
   }
 
@@ -46,6 +46,40 @@ class RdsPgsqlLogInputTest < Test::Unit::TestCase
     assert_equal 'ap-northeast-1', d.instance.region
     assert_equal 'test-postgres-id', d.instance.db_instance_identifier
     assert_equal 'pgsql-log-pos.dat', d.instance.pos_file
-    assert_equal 30, d.instance.refresh_interval
+    assert_equal 2, d.instance.refresh_interval
+  end
+
+  def test_get_log_files
+    use_iam_role
+    d = create_driver
+
+    aws_client_stub = Aws::RDS::Client.new(stub_responses: {
+      describe_db_log_files: {
+        describe_db_log_files: [
+          {
+            log_file_name: 'db.log',
+            last_written: 123,
+            size: 123
+          }
+        ],
+        marker: 'marker'
+      },
+      download_db_log_file_portion: {
+        log_file_data: "2019-01-26 22:10:20 UTC::@:[129155]:LOG:some db log",
+        marker: 'marker',
+        additional_data_pending: false
+      }
+    })
+
+    d.instance.instance_variable_set(:@rds, aws_client_stub)
+
+    d.run(timeout: 3, expect_emits: 1)
+
+    events = d.events
+    assert_equal(events[0][1].iso8601, "2019-01-26T22:10:20Z")
+    assert_equal(events[0][2]["pid"], '129155')
+    assert_equal(events[0][2]["message_level"], 'LOG')
+    assert_equal(events[0][2]["message"], 'some db log')
+    assert_equal(events[0][2]["log_file_name"], 'db.log')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-pgsql-log
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd