logstash-output-kinesis 2.1.1-java → 5.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 88bcb8a2d9e80e0e53f83e3ec386c90c3b8cd481c7253d34781db910acaccd72
-  data.tar.gz: ce807c2c68b8da9cd2831284c310d40631d18f501bb927f08997932b4c34fb88
+SHA1:
+  metadata.gz: c560333a0ab8f30a9e65cbea047f1a2c5e27fabe
+  data.tar.gz: cc10598380a7c831621151aea4c1b5ad74cbaa2b
 SHA512:
-  metadata.gz: 0c048c219d60d1a2ed177551d8dc3e614b14d027b6913ffc1c4d8c13aff596df6d56b8a5ae911467ffa0c1158e346772e61b9a0d41059c02a18bd2d9e2107994
-  data.tar.gz: b8a0dcfde3a3e5aec8187637e2045de542a2184859939f7bc201c08898fc9999fa6d641665955994e6d45610c57a3be48f1c4f2b8530a95c6cd4975153fdecc1
+  metadata.gz: c8e04c30bfc2d355b4534b108629aae2b6879ae58cc6eaafc5cddc4b54d9bd9e0135fcfe2889b1c6a93bbec49953cea1c86b84a9686abd0c5e75e89c1e1fc219
+  data.tar.gz: 14044649e49beb980b93b91ef3d6f270dba8caa5cfd90287a2546d4308a8e48a90893e5931088b9923ffd2defb06826ba09e8c2af8becea3755e30ce5b55fb5f

data/.gitattributes

@@ -0,0 +1 @@
+vendor/jar-dependencies/runtime-jars/*.jar filter=lfs diff=lfs merge=lfs -text

data/.ruby-gemset

@@ -0,0 +1 @@
+logstash-output-kinesis

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.22
+jruby-9.1.7.0

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+jdk:
+  - oraclejdk8
 deploy:
   provider: rubygems
   api_key:

data/README.md

@@ -5,7 +5,10 @@
 
 This is a plugin for [Logstash](https://github.com/elasticsearch/logstash). It will send log records to a [Kinesis stream](https://aws.amazon.com/kinesis/), using the [Kinesis Producer Library (KPL)](https://docs.aws.amazon.com/kinesis/latest/dev/developing-producers-with-kpl.html).
 
-**This version is intended for use with Logstash 2.x. Please use a [1.5.x](https://github.com/samcday/logstash-output-kinesis/tree/1.5) version of this plugin for Logstash 1.5.x compatibility.**
+**This version is intended for use with Logstash 5.x.** For plugin versions compatible with older versions of Logstash:
+
+ * [Logstash 1.5.x](https://github.com/samcday/logstash-output-kinesis/tree/1.5)
+ * [Logstash 2.x](https://github.com/samcday/logstash-output-kinesis/tree/2.x)
 
 
 ## Configuration
@@ -180,10 +183,11 @@ This is being tracked in [amazon-kinesis-producer#17](https://github.com/awslabs
 
 ## Developing
 
-Ensure you have JRuby 1.7.x installed. [rvm](https://rvm.io/) is your friend :)
+Ensure you have JRuby 9.1.x installed. [rvm](https://rvm.io/) is your friend :)
 
 ```sh
-bundle install
+rvm use --install .
+gem install bundler && bundle install
 bundle exec rake
 ```
 
@@ -203,7 +207,7 @@ Are more than welcome. Raising an issue is great, raising a PR is better, raisin
 
 [travis]: https://travis-ci.org/samcday/logstash-output-kinesis
 [rubygems]: https://rubygems.org/gems/logstash-output-kinesis
-[kpldoc]: https://github.com/awslabs/amazon-kinesis-producer/blob/v0.10.1/java/amazon-kinesis-producer/src/main/java/com/amazonaws/services/kinesis/producer/KinesisProducerConfiguration.java#L38
+[kpldoc]: https://github.com/awslabs/amazon-kinesis-producer/blob/v0.12.5/java/amazon-kinesis-producer/src/main/java/com/amazonaws/services/kinesis/producer/KinesisProducerConfiguration.java#L38
 
 [badge-travis]: https://img.shields.io/travis/samcday/logstash-output-kinesis.svg?style=flat-square
 [badge-gem]: https://img.shields.io/gem/v/logstash-output-kinesis.svg?style=flat-square

data/build.gradle

@@ -6,7 +6,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.amazonaws:amazon-kinesis-producer:0.12.6'
+    compile 'com.amazonaws:amazon-kinesis-producer:0.12.5'
     compile 'com.amazonaws:aws-java-sdk-sts:1.11.128'
 }
 

data/lib/logstash-output-kinesis/version.rb

@@ -1,3 +1,3 @@
 module LogstashOutputKinesis
-  VERSION = "2.1.1"
+  VERSION = "5.0.0"
 end

data/lib/logstash/outputs/kinesis.rb

@@ -8,7 +8,7 @@ require "logstash-output-kinesis_jars"
 
 # Sends log events to a Kinesis stream. This output plugin uses the official Amazon KPL.
 # Most of the configuration options in this plugin are simply passed on to
-# link:https://github.com/awslabs/amazon-kinesis-producer/blob/v0.10.0/java/amazon-kinesis-producer/src/main/java/com/amazonaws/services/kinesis/producer/KinesisProducerConfiguration.java#L38[KinesisProducerConfiguration]
+# link:https://github.com/awslabs/amazon-kinesis-producer/blob/v0.12.5/java/amazon-kinesis-producer/src/main/java/com/amazonaws/services/kinesis/producer/KinesisProducerConfiguration.java#L38[KinesisProducerConfiguration]
 class LogStash::Outputs::Kinesis < LogStash::Outputs::Base
   config_name "kinesis"
 
@@ -44,13 +44,17 @@ class LogStash::Outputs::Kinesis < LogStash::Outputs::Base
   config :aggregation_enabled, :validate => :boolean, :default => true
   config :aggregation_max_count, :validate => :number, :default => 4294967295
   config :aggregation_max_size, :validate => :number, :default => 51200
+  config :cloudwatch_endpoint, :validate => :string, :default => nil
+  config :cloudwatch_port, :validate => :number, :default => 443
   config :collection_max_count, :validate => :number, :default => 500
   config :collection_max_size, :validate => :number, :default => 5242880
   config :connect_timeout, :validate => :number, :default => 6000
   config :credentials_refresh_delay, :validate => :number, :default => 5000
-  config :custom_endpoint, :validate => :string, :default => nil
+  config :enable_core_dumps, :validate => :boolean, :default => false
   config :fail_if_throttled, :validate => :boolean, :default => false
-  config :log_level, :validate => :string, :default => "info"
+  config :kinesis_endpoint, :validate => :string, :default => nil
+  config :kinesis_port, :validate => :number, :default => 443
+  config :log_level, :validate => ["info", "warning", "error"], :default => "info"
   config :max_connections, :validate => :number, :default => 4
   config :metrics_granularity, :validate => ["global", "stream", "shard"], :default => "shard"
   config :metrics_level, :validate => ["none", "summary", "detailed"], :default => "detailed"
@@ -58,7 +62,6 @@ class LogStash::Outputs::Kinesis < LogStash::Outputs::Base
   config :metrics_upload_delay, :validate => :number, :default => 60000
   config :min_connections, :validate => :number, :default => 1
   config :native_executable, :validate => :string, :default => nil
-  config :port, :validate => :number, :default => 443
   config :rate_limit, :validate => :number, :default => 150
   config :record_max_buffered_time, :validate => :number, :default => 100
   config :record_ttl, :validate => :number, :default => 30000
@@ -85,20 +88,20 @@ class LogStash::Outputs::Kinesis < LogStash::Outputs::Base
     return unless output?(event)
 
     if @randomized_partition_key
-      event["[@metadata][partition_key]"] = SecureRandom.uuid
+      event.set("[@metadata][partition_key]", SecureRandom.uuid)
     else
       # Haha - gawd. If I don't put an empty string in the array, then calling .join()
       # on it later will result in a US-ASCII string if the array is empty. Ruby is awesome.
       partition_key_parts = [""]
 
       @event_partition_keys.each do |partition_key_name|
-        if not event[partition_key_name].nil? and event[partition_key_name].length > 0
-          partition_key_parts << event[partition_key_name].to_s
+        if not event.get(partition_key_name).nil? and event.get(partition_key_name).length > 0
+          partition_key_parts << event.get(partition_key_name).to_s
           break
         end
       end
 
-      event["[@metadata][partition_key]"] = (partition_key_parts * "-").to_s[/.+/m] || "-"
+      event.set("[@metadata][partition_key]", (partition_key_parts * "-").to_s[/.+/m] || "-")
     end
 
     begin
@@ -123,14 +126,18 @@ class LogStash::Outputs::Kinesis < LogStash::Outputs::Base
     config.setAggregationEnabled(@aggregation_enabled)
     config.setAggregationMaxCount(@aggregation_max_count)
     config.setAggregationMaxSize(@aggregation_max_size)
+    config.setCloudwatchEndpoint(@cloudwatch_endpoint) if !@cloudwatch_endpoint.nil?
+    config.setCloudwatchPort(@cloudwatch_port)
     config.setCollectionMaxCount(@collection_max_count)
     config.setCollectionMaxSize(@collection_max_size)
     config.setConnectTimeout(@connect_timeout)
     config.setCredentialsProvider(credentials_provider)
     config.setCredentialsRefreshDelay(@credentials_refresh_delay)
-    config.setCustomEndpoint(@custom_endpoint) if !@custom_endpoint.nil?
+    config.setEnableCoreDumps(@enable_core_dumps)
     config.setFailIfThrottled(@fail_if_throttled)
     config.setLogLevel(@log_level)
+    config.setKinesisEndpoint(@kinesis_endpoint) if !@kinesis_endpoint.nil?
+    config.setKinesisPort(@kinesis_port)
     config.setMaxConnections(@max_connections)
     config.setMetricsCredentialsProvider(metrics_credentials_provider)
     config.setMetricsGranularity(@metrics_granularity)
@@ -139,7 +146,6 @@ class LogStash::Outputs::Kinesis < LogStash::Outputs::Base
     config.setMetricsUploadDelay(@metrics_upload_delay)
     config.setMinConnections(@min_connections)
     config.setNativeExecutable(@native_executable) if !@native_executable.nil?
-    config.setKinesisPort(@port)
     config.setRateLimit(@rate_limit)
     config.setRecordMaxBufferedTime(@record_max_buffered_time)
     config.setRecordTtl(@record_ttl)
@@ -189,7 +195,7 @@ class LogStash::Outputs::Kinesis < LogStash::Outputs::Base
   def send_record(event, payload)
     begin
       event_blob = ByteBuffer::wrap(payload.to_java_bytes)
-      @producer.addUserRecord(@stream_name, event["[@metadata][partition_key]"], event_blob)
+      @producer.addUserRecord(@stream_name, event.get("[@metadata][partition_key]"), event_blob)
     rescue => e
       @logger.warn("Error writing event to Kinesis", :exception => e)
     end

data/logstash-output-kinesis.gemspec

@@ -27,14 +27,9 @@ Gem::Specification.new do |s|
   s.platform = "java"
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0", "< 3.0.0"
-  s.add_runtime_dependency "logstash-codec-plain", "< 3.0.0"
-  s.add_runtime_dependency "logstash-codec-json", "< 3.0.0"
+  s.add_runtime_dependency "logstash-core", ">= 5.0.0", "< 6.0.0"
+  s.add_runtime_dependency "logstash-codec-plain", "< 6.0.0"
+  s.add_runtime_dependency "logstash-codec-json", "< 6.0.0"
   s.add_development_dependency "logstash-devutils"
   s.add_development_dependency "gem-release", "~>0.7.3"
-
-  # Temporary hack because Logstash devs are crazy.
-  # See: https://github.com/elastic/logstash/issues/4141
-  # We should be able to remove this once logstash-core >2.0.0 && >1.5.5 are released
-  s.add_development_dependency "concurrent-ruby", "0.9.1"
 end

metadata

@@ -1,108 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-kinesis
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 5.0.0
 platform: java
 authors:
 - Sam Day
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: 6.0.0
+  name: logstash-core
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: 6.0.0
+  name: logstash-codec-plain
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: 6.0.0
+  name: logstash-codec-json
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: logstash-devutils
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
-  type: :development
+  name: gem-release
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-description: This gem is a logstash plugin required to be installed on top of the
-  Logstash core pipeline using $LS_HOME/bin/plugin install logstash-output-kinesis.
-  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/plugin install logstash-output-kinesis. This gem is not a stand-alone program
 email: me@samcday.com.au
 executables: []
 extensions: []
@@ -110,8 +94,10 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gemrelease"
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
+- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -125,7 +111,7 @@ files:
 - logstash-output-kinesis.gemspec
 - spec/outputs/kinesis_spec.rb
 - spec/spec_helper.rb
-- vendor/jar-dependencies/runtime-jars/amazon-kinesis-producer-0.12.6.jar
+- vendor/jar-dependencies/runtime-jars/amazon-kinesis-producer-0.12.5.jar
 - vendor/jar-dependencies/runtime-jars/aws-java-sdk-core-1.11.128.jar
 - vendor/jar-dependencies/runtime-jars/aws-java-sdk-sts-1.11.128.jar
 - vendor/jar-dependencies/runtime-jars/commons-codec-1.9.jar
@@ -150,7 +136,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,12 +151,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.8
+signing_key:
 specification_version: 4
-summary: This output plugin sends records to Kinesis using the Kinesis Producer Library
-  (KPL)
+summary: This output plugin sends records to Kinesis using the Kinesis Producer Library (KPL)
 test_files:
 - spec/outputs/kinesis_spec.rb
 - spec/spec_helper.rb