logstash-input-rds 0.15.1 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb70e7846d2d058443303145af8bb0e6583637f4096394bf38ad3e8eea4c33f9
-  data.tar.gz: 05ea61658c93554bf2287610d61438267755746559c1abf18ea4ccd18075bdc7
+  metadata.gz: 21b636c4ee0b10aa4ba8604582f679bdbea13fbcdb76f2797f955a149aa8f679
+  data.tar.gz: 261eabddfcc67888ae3481343fb7b328f22e2ce524a1e69c2f288ca09927c2e7
 SHA512:
-  metadata.gz: 3a9c245206d2336cdbe39c2faa564a585457b20505de24c51137bbab802255ef1f676e01cb6f1e6bcb1da47f3dfcf2fbf5b12b5e46666f2830ac3de39ef7f80b
-  data.tar.gz: be67935675086b83fd4654bf5fec812296cb5e56d8f9eccbb3e2fef123e5995a6c61161a6e10b3f4e9f30ca537f17ef8b56d8bea81c7a7e0da8cce2d4bda57c3
+  metadata.gz: 97bc0193ca76a26fdecc8ba24c7f1b765cce2634907e14d473f493cfdde86ba6708054619b5a62ad217d59999a650f3b37014f08717aaff7ec195ba7ffb41a9e
+  data.tar.gz: c3850b786f6b44e1a3cbf797bb78983eee76c80976884d3169e9702abde6007d381e85776d1158c192e0940bc020a90aceff5467893f35a9dd12a7e241988001

data/lib/logstash/inputs/rds.rb

@@ -24,21 +24,19 @@ class LogStash::Inputs::Rds < LogStash::Inputs::Base
     require "aws-sdk"
     @logger.info "Registering RDS input", :region => @region, :instance => @instance_name, :log_file => @log_file_name
     @database = Aws::RDS::DBInstance.new @instance_name, aws_options_hash
-    @sincedate = filename2datetime "1999-01-01-01" # FIXME sincedb
+    @sincedb = SinceDB::File.new File.join(ENV["HOME"], ".sincedb_" + Digest::MD5.hexdigest("#{@instance_name}+#{@log_file_name}"))
   end
 
   def run(queue)
     @thread = Thread.current
     Stud.interval(@polling_frequency) do
-      @logger.debug "finding files starting #{@sincedate} (#{@sincedate.to_i * 1000})"
-
+      @logger.debug "finding #{@log_file_name} for #{@instance_name} starting #{@sincedb.read} (#{@sincedb.read.to_i * 1000})"
       logfiles = @database.log_files({
         filename_contains: @log_file_name,
-        file_last_written: @sincedate.to_i * 1000,
+        file_last_written: @sincedb.read.to_i * 1000,
       })
       logfiles.each do |logfile|
-        @sincedate = filename2datetime logfile.name
-
+        @logger.debug "downloading #{logfile.name} for #{@instance_name}"
         more = true
         marker = "0"
         while more do
@@ -54,6 +52,7 @@ class LogStash::Inputs::Rds < LogStash::Inputs::Base
           more = response[:additional_data_pending]
           marker = response[:marker]
         end
+        @sincedb.write (filename2datetime logfile.name)
       end
     end
   end
@@ -63,8 +62,29 @@ class LogStash::Inputs::Rds < LogStash::Inputs::Base
   end
 
   def filename2datetime(name)
-    fragments = name.match /(\d{4})-(\d{2})-(\d{2})-(\d{2})$/
-    Time.parse "#{fragments[1]}-#{fragments[2]}-#{fragments[3]} #{fragments[4]}"
+    parts = name.match /(\d{4})-(\d{2})-(\d{2})-(\d{2})$/
+    Time.utc parts[1], parts[2], parts[3], parts[4]
   end
-end
 
+  private
+  module SinceDB
+    class File
+      def initialize(file)
+        @db = file
+      end
+
+      def read
+        if ::File.exists?(@db)
+          content = ::File.read(@db).chomp.strip
+          return content.empty? ? Time.new : Time.parse(content)
+        else
+          return Time.new("1999-01-01")
+        end
+      end
+
+      def write(time)
+        ::File.open(@db, 'w') { |file| file.write time.to_s }
+      end
+    end
+  end
+end

data/logstash-input-rds.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-rds'
-  s.version       = '0.15.1'
+  s.version       = '0.15.3'
   s.summary       = 'Ingest RDS log files to Logstash'
 
   s.authors       = ['Andrew Schleifer']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-rds
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.3
 platform: ruby
 authors:
 - Andrew Schleifer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement