logstash-input-sqs_s3 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54b8c56c9cae55cc5b9d96cb24ff5e64b42c1b1db07369e7b71eff26451e61c6
-  data.tar.gz: 9b76d647abed713b99c70abbd050e3483cd53637f93ea1ab4a6ef2345f572ea7
+  metadata.gz: 132970c713992e34ec1f7c19fd270a59d846fee32c8167cbe294310db76184b0
+  data.tar.gz: 1f0e21961947dd2d41aac5ebe7c55335588acb826798a4733628b118ea27aae1
 SHA512:
-  metadata.gz: 2bf22d5c80d5510dc959ba96d4d2e0a17cf40ae2db3bf316f0c9b9e774a6b7ca352a42e20633d2218f0fe61232b3f9b62fe21ec33077288bcb4b563a04fa1678
-  data.tar.gz: fabd98107fee4a217445ae34b15e78387bf3c3d8c4f0d33cec31a44bf3f30aae3a3123396d25b4749662ed8b0e7d2e1d233fea98797078d857d458edb4b2305f
+  metadata.gz: df2c3de1337b5c5641cec4349e8cf79013ecc21a8c5ac8c7988f78c961957de9f400233cc6b0c0dbd9d5011f09227f546a7d0bae9eef68025617288668db7b90
+  data.tar.gz: ba14d676693599a607de86fd10e36566882585c32fedf4e18d594262f79c793557621247a7f6a98d946f0a2f43287bbf03dad3d54638a8166bd84486e06a5761

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.6
+- Added skip-delete parameter and receipt handle
+
 ## 1.1.0
 - Logstash 5 compatibility
 

data/lib/logstash/inputs/sqs_s3.rb

@@ -89,6 +89,7 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
   MAX_MESSAGES_TO_FETCH = 10 # Between 1-10 in the AWS-SDK doc
   SENT_TIMESTAMP = "SentTimestamp"
   SQS_ATTRIBUTES = [SENT_TIMESTAMP]
+  SKIP_DELETE = false
 
   config_name "sqs_s3"
 
@@ -97,8 +98,11 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
   # Name of the SQS Queue to pull messages from. Note that this is just the name of the queue, not the URL or ARN.
   config :queue, :validate => :string, :required => true
 
-  # Name of the event field in which to store the SQS message ID
-  config :id_field, :validate => :string
+  # Name of the event field in which to store the SQS Receipt Handle
+  config :receipt_handle, :validate => :string
+
+  # Name of the event field in which to store the SQS Message Id
+  config :message_id, :validate => :string
 
   # Name of the event field in which to store the SQS message Sent Timestamp
   config :sent_timestamp_field, :validate => :string
@@ -106,12 +110,16 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
   # Max messages to fetch, default is 10
   config :max_messages_to_fetch, :validate => :number, :default => MAX_MESSAGES_TO_FETCH
 
+  #If set to true, does NOT delete the message after polling
+  config :skip_delete, :validate => :string, :default => SKIP_DELETE 
+
   attr_reader :poller
   attr_reader :s3
 
   def register
     require "aws-sdk"
     @logger.info("Registering SQS input", :queue => @queue)
+    @logger.info("Skip Delete", :skip_delete => @skip_delete)
     setup_queue
   end
 
@@ -132,7 +140,8 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
       :attribute_names => SQS_ATTRIBUTES,
       # we will use the queue's setting, a good value is 10 seconds
       # (to ensure fast logstash shutdown on the one hand and few api calls on the other hand)
-      :wait_time_seconds => nil
+      :wait_time_seconds => nil,
+      :skip_delete => @skip_delete
     }
   end
 
@@ -179,7 +188,8 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
 
                   event.set('[@metadata][s3_bucket_name]', record['s3']['bucket']['name'])
                   event.set('[@metadata][s3_object_key]', record['s3']['object']['key'])
-		  event.set(@id_field, message.message_id) if @id_field
+		  event.set(@receipt_handle, message.receipt_handle) if @receipt_handle
+		  event.set(@message_id, message.message_id) if @message_id
 		  event.set(@sent_timestamp_field, convert_epoch_to_timestamp(message.attributes[SENT_TIMESTAMP])) if @sent_timestamp_field
 
                   queue << event

data/logstash-input-sqs_s3.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-sqs_s3'
-  s.version         = '1.1.5'
+  s.version         = '1.1.6'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Get logs from AWS s3 buckets as issued by an object-created event via sqs."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program. Full credit goes to Heiko Finzel. Republishing this gem to support Logstash 5."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-sqs_s3
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Heiko Finzel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement