logstash-output-awslogs 0.1.20 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a17afa9328ef3d785b0ff6cbd00b60db09fa3f64f8dec15c93b587b00ff8bad7
-  data.tar.gz: e343fe4e97dfe5ea2dbd7c4949be7e8d5b59a6880249c7a21fa8f3409aadfbc7
+  metadata.gz: af5368bbf48b36f76d7efd64b8e45ded1ab26ab9f78c3a1ea49dcd624a7d7b8c
+  data.tar.gz: 4c24673badededf455e7fb09f3751e61fb30e8ad057855f345f4f3475803dfba
 SHA512:
-  metadata.gz: 64487c9cb52c41e5ca319f1fac727ebda10c30118d6ba6009db4b3f33d1ace0965e669c5d7080d978d5a63f1682ebdec04362def17749b6d3c4549f3af58dd89
-  data.tar.gz: f377fb99c2c526528d64298ce7841f9b84d8c6df1a30b4f8b7534dd65861b57e944f8ff66f9bb56f9e9198cc015ee988f7183581862816146cc73f343801e8c1
+  metadata.gz: 4656350c7598bbf7834fff235c6b9a1cfcb8ebb526a24bf6660b8044fe3e5f958b452707dc37114f735b9ebcebd0ea51364deecb20d7b69a35a4ae102b889d84
+  data.tar.gz: 8fd394e3b07729b16daaa3bafaa9626c2c184c5644b68587141a805b73c5d31182ee0a4b138a2e419e192c6e992bb8d5fd6094e80822baf1ed3a59a969ba6971

data/lib/logstash/outputs/awslogs.rb

@@ -30,7 +30,7 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
     to_send = {}
     sequence_tokens = {}
 
-    events_and_encoded.each do |event, _encoded|
+    events_and_encoded.each do |event, encoded|
       event_log_stream_name = event.sprintf(log_stream_name)
       event_log_group_name = event.sprintf(log_group_name)
 
@@ -38,31 +38,48 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       unless to_send.keys.include? next_sequence_token_key
         to_send.store(next_sequence_token_key, [])
       end
-      to_send[next_sequence_token_key].push(
-        timestamp: (event.timestamp.time.to_f * 1000).to_int,
-        message: event.get('message')
-      )
+      if event.get('message') && !event.get('message').empty?
+        to_send[next_sequence_token_key].push(
+          timestamp: (event.timestamp.time.to_f * 1000).to_int,
+          message: event.get('message')
+        )
+      else
+        to_send[next_sequence_token_key].push(
+            timestamp: (event.timestamp.time.to_f * 1000).to_int,
+            message: encoded
+        )
+      end
     end
 
+    group_names = []
     to_send.each do |event_log_names, _events|
       event_log_group_name = event_log_names[0]
-      next if sequence_tokens.keys.include? event_log_group_name
+      event_log_stream_name = event_log_names[1]
+      next_sequence_token_key = [event_log_group_name, event_log_stream_name]
+      next if @next_sequence_tokens.keys.include? next_sequence_token_key
+      unless group_names.include? event_log_group_name
+        group_names.push(event_log_group_name)
+      end
+    end
 
-      sequence_tokens.store(event_log_group_name, {})
+    group_names.each do |log_group_name|
+      unless sequence_tokens.keys.include? log_group_name
+        sequence_tokens.store(log_group_name, {})
+      end
       begin
-        @client.describe_log_streams({log_group_name: event_log_group_name}).each do |response|
+        @client.describe_log_streams({log_group_name: log_group_name}).each do |response|
           response.log_streams.each do |log_stream_data|
             unless log_stream_data.upload_sequence_token&.empty?
-              sequence_tokens[event_log_group_name][log_stream_data.log_stream_name.to_s] = log_stream_data.upload_sequence_token.to_s
+              sequence_tokens[log_group_name][log_stream_data.log_stream_name.to_s] = log_stream_data.upload_sequence_token.to_s
             end
           end
         end
       rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
-        @logger.info('Will create log group/stream and retry')
+        @logger.info("Will create log group #{log_group_name} and retry")
         begin
-          @client.create_log_group({log_group_name: event_log_group_name})
+          @client.create_log_group({log_group_name: log_group_name})
         rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
-          @logger.info("Log group #{event_log_group_name} already exists")
+          @logger.info("Log group #{log_group_name} already exists")
         end
         retry
       rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e

data/logstash-output-awslogs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-awslogs'
-  s.version       = '0.1.20'
+  s.version       = '0.1.25'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Writes events to AWS CloudWatch logs.'
   s.homepage      = 'https://github.com/rickycook/logstash-output-awslogs'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-awslogs
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.25
 platform: ruby
 authors:
 - Anton Klyba
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement