logstash-output-awslogs 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f48258fe09e94a5d4cd1d0b80b63d80e2c6924
-  data.tar.gz: '019fc72122f4a6f43ef6953db6a18a8e62f35633'
+  metadata.gz: 20482395ce7059fb5ceb9939d94d8447fe351af6
+  data.tar.gz: 67538d248b15197a75495e6642544bfbe3a92f38
 SHA512:
-  metadata.gz: 14588c5507ce952bf9215e1890863bde3639483a39eaca1f1181d5ac0e87ea497c45e555f1ce4ffc1f711f35e243e67ae4ee2e28059f6bc4cea8f25928cea4cc
-  data.tar.gz: 12e2d400a0c16c721ad8bbe878cf66e0bec80a74497a21c87c79c8209a73babbaae7217cf94375dab576699e368f1570db1bd2d8dff802366e7b6474c4a98888
+  metadata.gz: e07490bfb631acb80141119de3a34abc789eb3c4fb23e5cc71f5c070dbac11f21b254d54516d18f6ccd60383b9f94e35d4688d0ba79b0c47d70d50e7d3b6fe83
+  data.tar.gz: 17ed32f2c494c398618054ce9ed2698848a717a9c1d444e3f82785110a172ea65e5889af1b0b80b79539bff258c57fc5952b67193ebc6ecb5eff01c65d398b8d

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,22 +55,43 @@ 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
+        rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
+          @logger.info("Logs throttling, wait 1 sec")
+          retry
         end
       end
-
       begin
         resp = @client.put_log_events(send_opts)
       rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
@@ -91,7 +112,10 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
         end
         retry
         # TODO: handle rejected events with debug message
-        @next_sequence_tokens.store(next_sequence_token_key, resp.next_sequence_token)
+      @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

data/logstash-output-awslogs.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-awslogs'
-  s.version       = '0.1.1'
+  s.version       = '0.1.6'
   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.1
+  version: 0.1.6
 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: []