logstash-output-awslogs 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99e6b6d40e097febb27b8025eba26a2d9213e251
-  data.tar.gz: 524e1b29c57f34d41b08b1985260081b31639bec
+  metadata.gz: ca546d819e0b7380e5c3e223f734b73b539b7ec7
+  data.tar.gz: 33415c58330218021b79dfb305a265d034e5e20f
 SHA512:
-  metadata.gz: 0a2fc689d1a136b8f77371217414e033abf69fca691d99ce453fe30080ec0d57516d9765dbf2e0de64f856cf55f697819d7b00b35d56435afef6f728fb8163a1
-  data.tar.gz: 385ea7c63731ebe57a4810429094a576dc0d0328c031c82e183c170791065eaeb3e7d5367f1beabac3c06101ec0082640a2872d45f41166b57b93fcf0e586b97
+  metadata.gz: fc483aea49fee409283373d3db6a8bb7af82269324eee605a9bf8d14c17947aeec4c9b653305ca724a8238912576a8337ce7c8c9e76fb0c28eb664b4c823b9a6
+  data.tar.gz: e47bf343fa1eae53da1316475e5f8e85299b8360a6932a1d5db019e26509e67df471783af7a089959842ba093c839e07901a95ef6abcd7335ef61b407366bc15

data/lib/logstash/outputs/awslogs.rb

@@ -36,7 +36,7 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       end
       to_send[next_sequence_token_key].push({
         timestamp: (event.timestamp.time.to_f * 1000).to_int,
-        message: encoded,
+        message: event.get("message"),
       })
     end
     to_send.each do |event_log_names, log_events|
@@ -55,25 +55,65 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       if @next_sequence_tokens.keys.include? next_sequence_token_key
         send_opts[:sequence_token] = @next_sequence_tokens[next_sequence_token_key]
       else
-        resp = @client.describe_log_streams({
-          log_group_name: event_log_group_name,
-          log_stream_name_prefix: event_log_stream_name,
-        })
-        if resp.log_streams.length < 1
-          @client.create_log_stream(ident_opts)
-        else
-          resp.log_streams.each do |log_stream_data|
-            if log_stream_data.log_stream_name == event_log_stream_name
-              send_opts[:sequence_token] = log_stream_data.upload_sequence_token
-              break
+        begin
+          resp = @client.describe_log_streams({
+            log_group_name: event_log_group_name,
+            log_stream_name_prefix: event_log_stream_name,
+          })
+          if resp.log_streams.length < 1
+            @client.create_log_stream(ident_opts)
+          else
+            resp.log_streams.each do |log_stream_data|
+              if log_stream_data.log_stream_name == event_log_stream_name
+                send_opts[:sequence_token] = log_stream_data.upload_sequence_token
+                break
+              end
             end
           end
+        rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
+          @logger.info("Will create log group/stream and retry")
+          begin
+            @client.create_log_group(:log_group_name => send_opts[:log_group_name])
+          rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
+            @logger.info("Log group #{send_opts[:log_group_name]} already exists")
+          rescue Exception => e
+            @logger.error(e)
+          end
+          begin
+            @client.create_log_stream(:log_group_name => send_opts[:log_group_name], :log_stream_name => send_opts[:log_stream_name])
+          rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
+            @logger.info("Log stream #{send_opts[:log_stream_name]} already exists")
+          rescue Exception => e
+            @logger.error(e)
+          end
+          retry
         end
       end
-
-      resp = @client.put_log_events(send_opts)
-      # TODO: handle rejected events with debug message
+      begin
+        resp = @client.put_log_events(send_opts)
+      rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
+        @logger.info("Will create log group/stream and retry")
+        begin
+          @client.create_log_group(:log_group_name => send_opts[:log_group_name])
+        rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
+          @logger.info("Log group #{send_opts[:log_group_name]} already exists")
+        rescue Exception => e
+          @logger.error(e)
+        end
+        begin
+          @client.create_log_stream(:log_group_name => send_opts[:log_group_name], :log_stream_name => send_opts[:log_stream_name])
+        rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
+          @logger.info("Log stream #{send_opts[:log_stream_name]} already exists")
+        rescue Exception => e
+          @logger.error(e)
+        end
+        retry
+        # TODO: handle rejected events with debug message
       @next_sequence_tokens.store(next_sequence_token_key, resp.next_sequence_token)
+      rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
+        @logger.info("Logs throttling, wait 1 sec")
+        retry
+      end
     end
   end # def multi_receive_encoded
 end # class LogStash::Outputs::Awslogs

data/logstash-output-awslogs.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-awslogs'
-  s.version       = '0.1.0'
+  s.version       = '0.1.5'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Writes events to AWS CloudWatch logs.'
   s.homepage      = 'https://github.com/rickycook/logstash-output-awslogs'
-  s.authors       = ['Ricky Cook']
-  s.email         = 'logstash-output-awslogs@auto.thatpanda.com'
+  s.authors       = ['Anton Klyba']
+  s.email         = 'anarhyst266+gems@gmail.com'
   s.require_paths = ['lib']
 
   # Files

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-awslogs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
-- Ricky Cook
+- Anton Klyba
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email: logstash-output-awslogs@auto.thatpanda.com
+email: anarhyst266+gems@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []