logstash-output-awslogs 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35a2986de71192feddeed31243d6df14b3529466c3d9322247f5636b5d281a37
-  data.tar.gz: 54bfbc0840676ec0c6d61d7c55cb6f657af2132d1e7bdee988361db0ebc33758
+  metadata.gz: b0e70a243f0906f2799aab77d0dbf1f29b7e07c6bea94485c37aa681dccf8b8f
+  data.tar.gz: 0f1621ab83b6955c5844857a82e58ec03581dbc0782c345d63cb4a9665dbd09f
 SHA512:
-  metadata.gz: ee764d98dbcb421e69765f516374c574204674a56f3e348f62b3656135ba8509ae3ff10a1550ed60152bb4579e3a959d2474ab6701069f36f9ad5d3385b68fe4
-  data.tar.gz: 48b68fbe90554fc9807d9fa3bea6b1504b721729d512df9e2f392fdd70b53ad9c78a69531a62e7fcda9700ae9b7d1e0d34f054d2e0bd8d89005b568c88885679
+  metadata.gz: c9dbad4911570e8f125209a616f91ec835b2b7b339041068d7521db71c220058a11da0853b0108df0201d8c59656383f427ca450f4610f584d0298b548f1ed5d
+  data.tar.gz: 47fd4a9f146e9c42051b3744164f64d6cbfd3c651e4c7128926f9e48035a097ac9824d171c668edd03b357b65b8fbfee4d3a0c7305328ece96129135dafc33a5

data/CHANGELOG.md

@@ -1,2 +1,5 @@
 ## 0.1.0
   - Plugin created with the logstash plugin generator
+
+## 1.1.1
+  - First fully working version.

data/CONTRIBUTORS

@@ -3,6 +3,7 @@ reports, or in general have helped logstash along its way.
 
 Contributors:
 *  - Ricky Cook (rickycook)
+*  - Anton Klyba (anarhyst266)
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
-gemspec
+gemspec
+gem 'rubocop', group: 'development'

data/lib/logstash/outputs/awslogs.rb

@@ -4,10 +4,10 @@ require 'logstash/outputs/base'
 require 'logstash/namespace'
 require 'logstash/plugin_mixins/aws_config'
 require 'aws-sdk-cloudwatchlogs'
+require 'json'
 
 Aws.eager_autoload!
 
-# An awslogs output that does nothing.
 class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
   include LogStash::PluginMixins::AwsConfig::V2
 
@@ -18,19 +18,16 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
   config :log_stream_name, validate: :string, required: true
 
   public
-
   def register
     @client = Aws::CloudWatchLogs::Client.new(aws_options_hash)
     @next_sequence_tokens = {}
   end # def register
 
   public
-
-  def multi_receive_encoded(events_and_encoded)
+  def multi_receive(events)
     to_send = {}
-    sequence_tokens = {}
 
-    events_and_encoded.each do |event, encoded|
+    events.each do |event|
       event_log_stream_name = event.sprintf(log_stream_name)
       event_log_group_name = event.sprintf(log_group_name)
 
@@ -38,17 +35,10 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       unless to_send.keys.include? next_sequence_token_key
         to_send.store(next_sequence_token_key, [])
       end
-      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
+      to_send[next_sequence_token_key].push(
+        timestamp: (event.timestamp.time.to_f * 1000).to_int,
+        message: event.to_hash.sort.to_h.to_json
+      )
     end
 
 
@@ -57,6 +47,8 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       event_log_stream_name = event_log_names[1]
       next_sequence_token_key = [event_log_group_name, event_log_stream_name]
 
+      log_events.sort_by!{ |event| event[:timestamp] }
+
       ident_opts = {
         log_group_name: event_log_group_name,
         log_stream_name: event_log_stream_name
@@ -64,32 +56,31 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       send_opts = ident_opts.merge(
         log_events: log_events
       )
-
       if @next_sequence_tokens.keys.include? next_sequence_token_key
         send_opts[:sequence_token] = @next_sequence_tokens[next_sequence_token_key]
+      end
+      begin
+        resp = @client.put_log_events(send_opts)
+        @next_sequence_tokens.store(next_sequence_token_key, resp.next_sequence_token)
+      rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException
+        @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
+          @logger.info("Log group #{send_opts[:log_group_name]} already exists")
+        end
         begin
-          resp = @client.put_log_events(send_opts)
-          @next_sequence_tokens.store(next_sequence_token_key, resp.next_sequence_token)
-        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")
-          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")
-          end
-          retry
-        rescue  Aws::CloudWatchLogs::Errors::InvalidSequenceTokenException => e
-          send_opts[:sequence_token] = e.expected_sequence_token
-          retry
-        rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
-          @logger.info('Logs throttling, retry')
-          retry
+          @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
+          @logger.info("Log stream #{send_opts[:log_stream_name]} already exists")
         end
+        retry
+      rescue  Aws::CloudWatchLogs::Errors::InvalidSequenceTokenException => e
+        send_opts[:sequence_token] = e.expected_sequence_token
+        retry
+      rescue Aws::CloudWatchLogs::Errors::ThrottlingException
+        @logger.info('Logs throttling, retry')
+        retry
       end
     end
   end # def multi_receive_encodeds

data/logstash-output-awslogs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-awslogs'
-  s.version       = '1.1.0'
+  s.version       = '1.1.1'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Writes events to AWS CloudWatch logs.'
   s.homepage      = 'https://github.com/Anarhyst266/logstash-output-awslogs'
@@ -21,5 +21,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-codec-plain"
   s.add_runtime_dependency "aws-sdk-cloudwatchlogs", '~> 1'
   s.add_runtime_dependency "logstash-integration-aws"
+  s.add_runtime_dependency "json"
   s.add_development_dependency "logstash-devutils"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-awslogs
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Anton Klyba
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement