logstash-codec-cloudtrail 2.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dd5ee1ee50bae2acb404d395dae811de0e43b3d
-  data.tar.gz: 53d53e31d9b99d1d37d027fa06697486fc4e87c2
+  metadata.gz: 66fe39690b94a06d219ebb9336943182a78507ab
+  data.tar.gz: 6e1cf5f5329d07d0379c565c2effde64fb27c6f4
 SHA512:
-  metadata.gz: 41fda44fb5543f7e250d9e58a1416f8034dfe72d71652426b2aafd11dbfd37404897a586aa537cc77c5676813236b2f635229b7463e6812c99a7d67ffd958cba
-  data.tar.gz: 6689320a7960a28df89163e1bb975486dfe7a664f3828ae42e179281604da8389a599a33141cbbf3b77f99438ea7844db9921dd727fa9b59cde5da9ee10585fd
+  metadata.gz: 9ef7b0e5573712cc8de3c87e5fdc8ebe246014fc69f855f759880a8f94ca571e63ff87b203bac053169d1ac9273d4121b87bd2fc944d8b011671aeaa6b79e6ba
+  data.tar.gz: b5e77fcbaba1bf52bdfd1fa1802fe8e0fa0b7256d12d26169e6a938942986896eba37788182f405412a209fa7e0a6ca5384b66ddc5ba5586d78c18b35a0bcf77

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-# 2.0.4
+## 3.0.0
+  - Update to support Logstash 2.4 & 5.0 APIs
+  
+## 2.0.4
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
-# 2.0.3
+  
+## 2.0.3
   - New dependency requirements for logstash-core for the 5.0 release
+  
 ## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Codecs/job/logstash-plugin-codec-cloudtrail-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Codecs/job/logstash-plugin-codec-cloudtrail-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-codec-cloudtrail.svg)](https://travis-ci.org/logstash-plugins/logstash-codec-cloudtrail)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -56,7 +55,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
 - Install plugin
 ```sh
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
 bin/plugin install --no-verify
+
 ```
 - Run Logstash with your plugin
 ```sh
@@ -74,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
+bin/plugin install --no-verify
+
 ```
 - Start Logstash and proceed to test the plugin
 

data/lib/logstash/codecs/cloudtrail.rb

@@ -1,15 +1,24 @@
 # encoding: utf-8
 require "logstash/codecs/base"
-require "logstash/codecs/spool"
 require "logstash/json"
+require "logstash/util/charset"
 
 # This is the base class for logstash codecs.
-class LogStash::Codecs::CloudTrail < LogStash::Codecs::Spool
+class LogStash::Codecs::CloudTrail < LogStash::Codecs::Base
   config_name "cloudtrail"
 
+  config :charset, :validate => ::Encoding.name_list, :default => "UTF-8"
+
+  public
+  def register
+    @converter = LogStash::Util::Charset.new(@charset)
+    @converter.logger = @logger
+  end
+
   public
   def decode(data)
-    super(LogStash::Json.load(data.force_encoding("UTF-8"))['Records']) do |event|
+    decoded = LogStash::Json.load(@converter.convert(data))
+    decoded['Records'].each do |event|
       event['@timestamp'] = event.delete('eventTime')
       yield LogStash::Event.new(event)
     end

data/logstash-codec-cloudtrail.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-cloudtrail'
-  s.version         = '2.0.4'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Process AWS CloudTrail formatted messages"
-  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"
+  s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -20,9 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "codec" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
-
-  s.add_runtime_dependency 'logstash-codec-spool'
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
   s.add_development_dependency 'logstash-devutils'
 end

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-cloudtrail
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.99'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: logstash-codec-spool
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -52,7 +44,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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
+description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []