logstash-input-s3-sns-sqs 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbba025cb4e274be8fd5af60c33fdc445486831c
-  data.tar.gz: 1aea14626b1290ca3837fea2cd8b35dee986b841
+  metadata.gz: 3b47498a9996e26b8c9c26fa4f0b8b4162276a15
+  data.tar.gz: 63f8aa74667466c11584aac319ef43028f386a49
 SHA512:
-  metadata.gz: a7ad292c17c49d1b9a0fa3c8ab9f454a026b38defdd73007dde13f6349f358a927da92bba46f8c082d269a1464431ba8d114d844c44a4383c8b43b1940026c0a
-  data.tar.gz: 5c969909a581f9aeb3d1704310a0556a27ed2936a73e3c0a5b2a9590801a63bbdf6fd16d5797ff79af3f87855b541614fc155acf3ae46da58ef19991073e6e5a
+  metadata.gz: 9b4ce293106f3dc37405c52d6b571aea478bb65f4deea3642da7e72e1cc49120962fca54e3ae84b4438d39224f42c5b41dd7d9da00103e07889866152eeb4f68
+  data.tar.gz: aa5d8b70deae51d4161d182dfd425cc8d2c49d5b595c78a5d8608426cd9bf6fe284c372e4aa28528f0e01235ec80cbee3412f42623576ab448bb7004c5beb4ca

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 1.1.8
+- Add config switch for delivery with or without SNS
 ## 1.1.6
 - Fix a nil exception in message parsing
 ## 1.1.5

data/lib/logstash/inputs/s3snssqs.rb

@@ -93,6 +93,8 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
   config :queue_owner_aws_account_id, :validate => :string, :required => false
   # Whether to delete files from S3 after processing.
   config :delete_on_success, :validate => :boolean, :default => false
+  # Whether the event is processed though an SNS to SQS. (S3>SNS>SQS = true |S3>SQS=false)
+  config :from_sns, :validate => :boolean, :default => true
 
   attr_reader :poller
   attr_reader :s3
@@ -129,14 +131,16 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
   def handle_message(message, queue)
     hash = JSON.parse message.body
     @logger.debug("handle_message", :hash => hash, :message => message)
+    #If send via sns there is an additional JSON layer
+    if @from_sns then
+      hash = JSON.parse(hash['Message'])
+    end
     # there may be test events sent from the s3 bucket which won't contain a Records array,
     # we will skip those events and remove them from queue
-    if hash['Message'].present?
-      message = JSON.parse(hash['Message'])
-      if message['Records'] then
+      if hash['Records'] then
 	      # typically there will be only 1 record per event, but since it is an array we will
         # treat it as if there could be more records
-        message['Records'].each do |record|
+        hash['Records'].each do |record|
           @logger.debug("We found a record", :record => record)
 	        # in case there are any events with Records that aren't s3 object-created events and can't therefore be
           # processed by this plugin, we will skip them and remove them from queue

data/logstash-input-s3-sns-sqs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-s3-sns-sqs'
-  s.version         = '1.1.7'
+  s.version         = '1.1.8'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Get logs from AWS s3 buckets as issued by an object-created event via sns -> 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3-sns-sqs
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Christian Herweg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement