logstash-output-amazon_es 7.0-java → 7.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9de92fe963692b0de4804d793d49bafd31934b00305d2f109e8c38d13a714a6a
-  data.tar.gz: eb1781b68632e93af7a404ad6b2e99a05539fea8781b0dd2c008fa326aaf884b
+  metadata.gz: 8c5f134b8fa5c15b4487b4db40169c975fe4980a86c15859e914c2f2834484c2
+  data.tar.gz: 7b603d2e39205e83e67925369f0b197970133a7602ebba7f6e7c1e5a4a4612e8
 SHA512:
-  metadata.gz: a18d7bd02e92f0d48f2a79e859238d614dcf03383d640b6ef4f0f89132e4fef6b6e3341db2d364d46dbc68690ed018c587f14cb0f71c8ebafd8c097c6a123557
-  data.tar.gz: 69c9cfc9fa58ec4c986a2131e4690b80a1d57fee42becdf317b05bbd70e85e57c3252f117f723ac56f899b71782561ed578a7440944af695e94558f59fd0c16f
+  metadata.gz: 642d6f09125457e3ff52b67b3c43684230ea351ee6b067332d49f1432e782fb30d5b5c6a81da62f0cdffd696bddaa71e1e749913f0a79084ca4dfd89bbf10488
+  data.tar.gz: b205a14fd96273c85d4c33422ce29a57b5142ef26822c9b582de76625669f2eafc4b8bdeec291b0ef75cb4046e88c0c7861753ecccc108266176e593535d985d

data/README.md

@@ -15,9 +15,11 @@ The following table shows the versions of logstash and logstash-output-amazon_es
 | 6.0.0  | <6.0.0  |
 | 6.4.0  | >6.0.0  |
 
-## Configuration for Amazon Elasticsearch Output Plugin
+logstash-output-amazon_es plugin versions 6.4.0 and newer are tested to be compatible with Elasticsearch 6.5 and greater. 
 
-To run the Logstash Output Amazon Elasticsearch plugin, simply add a configuration following the below documentation.
+## Configuration for Amazon Elasticsearch Service Output Plugin
+
+To run the Logstash Output Amazon Elasticsearch Service plugin, simply add a configuration following the below documentation.
 
 An example configuration:
 
@@ -46,17 +48,18 @@ output {
   * aws_access_key_id, :validate => :string - optional AWS access key
   * aws_secret_access_key, :validate => :string - optional AWS secret key
 
-	 The credential resolution logic can be described as follows:
+   The credential resolution logic can be described as follows:
 
-	 - User passed `aws_access_key_id` and `aws_secret_access_key` in `amazon_es` configuration
-	 - Environment variables - `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` (RECOMMENDED since they are recognized by all the AWS SDKs and CLI except for .NET), or `AWS_ACCESS_KEY` and `AWS_SECRET_KEY` (only recognized by Java SDK)
-	 - Credential profiles file at the default location (`~/.aws/credentials`) shared by all AWS SDKs and the AWS CLI
-	 - Instance profile credentials delivered through the Amazon EC2 metadata service
+   - User passed `aws_access_key_id` and `aws_secret_access_key` in `amazon_es` configuration
+   - Environment variables - `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` (RECOMMENDED since they are recognized by all the AWS SDKs and CLI except for .NET), or `AWS_ACCESS_KEY` and `AWS_SECRET_KEY` (only recognized by Java SDK)
+   - Credential profiles file at the default location (`~/.aws/credentials`) shared by all AWS SDKs and the AWS CLI
+   - Instance profile credentials delivered through the Amazon EC2 metadata service
 
 - template (path) - You can set the path to your own template here, if you so desire. If not set, the included template will be used.
 - template_name (string, default => "logstash") - defines how the template is named inside Elasticsearch
 - port (string, default 443) - Amazon Elasticsearch Service listens on port 443 for HTTPS (default) and port 80 for HTTP. Tweak this value for a custom proxy.
 - protocol (string, default https) - The protocol used to connect to the Amazon Elasticsearch Service
+- max_bulk_bytes - The max size for a bulk request in bytes. Default is 20MB. It is recommended not to change this value unless needed. For guidance on changing this value, please consult the table for network limits for your instance type: https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/aes-limits.html#network-limits
 
 After 6.4.0, users can't set batch size in this output plugin config. However, users can still set batch size in logstash.yml file.
 ## Developing

data/lib/logstash/outputs/amazon_es.rb

@@ -83,7 +83,7 @@ require "forwardable"
 # For requests compression, regardless of the Elasticsearch version, users have to enable `http_compression` 
 # setting in their Logstash config file.
 #
-class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
+class LogStash::Outputs::AmazonElasticSearch < LogStash::Outputs::Base
   declare_threadsafe!
 
   require "logstash/outputs/amazon_es/http_client"
@@ -92,10 +92,10 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   require "logstash/outputs/amazon_es/common"
 
   # Protocol agnostic (i.e. non-http, non-java specific) configs go here
-  include(LogStash::Outputs::ElasticSearch::CommonConfigs)
+  include(LogStash::Outputs::AmazonElasticSearch::CommonConfigs)
 
   # Protocol agnostic methods
-  include(LogStash::Outputs::ElasticSearch::Common)
+  include(LogStash::Outputs::AmazonElasticSearch::Common)
 
   config_name "amazon_es"
 
@@ -248,9 +248,12 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   # Custom Headers to send on each request to amazon_es nodes
   config :custom_headers, :validate => :hash, :default => {}
 
+  #Max bulk size in bytes
+  config :max_bulk_bytes, :validate => :number, :default => 20 * 1024 * 1024
+
   def build_client
     params["metric"] = metric
-    @client ||= ::LogStash::Outputs::ElasticSearch::HttpClientBuilder.build(@logger, @hosts, params)
+    @client ||= ::LogStash::Outputs::AmazonElasticSearch::HttpClientBuilder.build(@logger, @hosts, params)
   end
 
   def close

data/lib/logstash/outputs/amazon_es/common.rb

@@ -1,6 +1,6 @@
 require "logstash/outputs/amazon_es/template_manager"
 
-module LogStash; module Outputs; class ElasticSearch;
+module LogStash; module Outputs; class AmazonElasticSearch;
   module Common
     attr_reader :client, :hosts
 
@@ -274,7 +274,7 @@ module LogStash; module Outputs; class ElasticSearch;
         es_actions = actions.map {|action_type, params, event| [action_type, params, event.to_hash]}
         response = @client.bulk(es_actions)
         response
-      rescue ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::HostUnreachableError => e
+      rescue ::LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool::HostUnreachableError => e
         # If we can't even connect to the server let's just print out the URL (:hosts is actually a URL)
         # and let the user sort it out from there
         @logger.error(
@@ -290,7 +290,7 @@ module LogStash; module Outputs; class ElasticSearch;
         sleep_interval = sleep_for_interval(sleep_interval)
         @bulk_request_metrics.increment(:failures)
         retry unless @stopping.true?
-      rescue ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::NoConnectionAvailableError => e
+      rescue ::LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool::NoConnectionAvailableError => e
         @logger.error(
           "Attempted to send a bulk request to elasticsearch, but no there are no living connections in the connection pool. Perhaps Elasticsearch is unreachable or down?",
           :error_message => e.message,
@@ -301,7 +301,7 @@ module LogStash; module Outputs; class ElasticSearch;
         sleep_interval = next_sleep_interval(sleep_interval)
         @bulk_request_metrics.increment(:failures)
         retry unless @stopping.true?
-      rescue ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError => e
+      rescue ::LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool::BadResponseCodeError => e
         @bulk_request_metrics.increment(:failures)
         log_hash = {:code => e.response_code, :url => e.url.sanitized.to_s}
         log_hash[:body] = e.response_body if @logger.debug? # Generally this is too verbose

data/lib/logstash/outputs/amazon_es/common_configs.rb

@@ -1,6 +1,6 @@
 require 'forwardable' # Needed for logstash core SafeURI. We need to patch this in core: https://github.com/elastic/logstash/pull/5978
 
-module LogStash; module Outputs; class ElasticSearch
+module LogStash; module Outputs; class AmazonElasticSearch
   module CommonConfigs
     def self.included(mod)
       # The index to write events to. This can be dynamic using the `%{foo}` syntax.

data/lib/logstash/outputs/amazon_es/http_client.rb

@@ -7,24 +7,11 @@ require 'cgi'
 require 'zlib'
 require 'stringio'
 
-module LogStash; module Outputs; class ElasticSearch;
-  # This is a constant instead of a config option because
-  # there really isn't a good reason to configure it.
-  #
-  # The criteria used are:
-  # 1. We need a number that's less than 100MiB because ES
-  #    won't accept bulks larger than that.
-  # 2. It must be large enough to amortize the connection constant
-  #    across multiple requests.
-  # 3. It must be small enough that even if multiple threads hit this size
-  #    we won't use a lot of heap.
-  #
-  # We wound up agreeing that a number greater than 10 MiB and less than 100MiB
-  # made sense. We picked one on the lowish side to not use too much heap.
-  TARGET_BULK_BYTES = 20 * 1024 * 1024 # 20MiB
-
+module LogStash; module Outputs; class AmazonElasticSearch;
   class HttpClient
-    attr_reader :client, :options, :logger, :pool, :action_count, :recv_count
+    attr_reader :client, :options, :logger, :pool, :action_count, :recv_count, :max_bulk_bytes
+    
+  
     # This is here in case we use DEFAULT_OPTIONS in the future
     # DEFAULT_OPTIONS = {
     #   :setting => value
@@ -54,6 +41,7 @@ module LogStash; module Outputs; class ElasticSearch;
       @metric = options[:metric]
       @bulk_request_metrics = @metric.namespace(:bulk_requests)
       @bulk_response_metrics = @bulk_request_metrics.namespace(:responses)
+      @max_bulk_bytes = options[:max_bulk_bytes] 
 
       # Again, in case we use DEFAULT_OPTIONS in the future, uncomment this.
       # @options = DEFAULT_OPTIONS.merge(options)
@@ -121,7 +109,7 @@ module LogStash; module Outputs; class ElasticSearch;
                     action.map {|line| LogStash::Json.dump(line)}.join("\n") :
                     LogStash::Json.dump(action)
         as_json << "\n"
-        if (body_stream.size + as_json.bytesize) > TARGET_BULK_BYTES
+        if (body_stream.size + as_json.bytesize) > @max_bulk_bytes
           bulk_responses << bulk_send(body_stream) unless body_stream.size == 0
         end
         stream_writer.write(as_json)
@@ -152,7 +140,7 @@ module LogStash; module Outputs; class ElasticSearch;
 
       if response.code != 200
         url = ::LogStash::Util::SafeURI.new(response.final_url)
-        raise ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(
+        raise ::LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool::BadResponseCodeError.new(
           response.code, url, body_stream.to_s, response.body
         )
       end
@@ -292,7 +280,7 @@ module LogStash; module Outputs; class ElasticSearch;
 
       adapter_options[:aws_secret_access_key] = options[:aws_secret_access_key]
 
-      adapter_class = ::LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter
+      adapter_class = ::LogStash::Outputs::AmazonElasticSearch::HttpClient::ManticoreAdapter
       adapter = adapter_class.new(@logger, adapter_options)
     end
     
@@ -310,7 +298,7 @@ module LogStash; module Outputs; class ElasticSearch;
       }
       pool_options[:scheme] = self.scheme if self.scheme
 
-      pool_class = ::LogStash::Outputs::ElasticSearch::HttpClient::Pool
+      pool_class = ::LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool
       full_urls = @options[:hosts].map {|h| host_to_url(h) }
       pool = pool_class.new(@logger, adapter, full_urls, pool_options)
       pool.start

data/lib/logstash/outputs/amazon_es/http_client/manticore_adapter.rb

@@ -3,7 +3,7 @@ require 'cgi'
 require 'aws-sdk-core'
 require 'uri'
 
-module LogStash; module Outputs; class ElasticSearch; class HttpClient;
+module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
   DEFAULT_HEADERS = { "content-type" => "application/json" }
 
   CredentialConfig = Struct.new(
@@ -123,7 +123,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       # template installation. We might need a better story around this later
       # but for our current purposes this is correct
       if resp.code < 200 || resp.code > 299 && resp.code != 404
-        raise ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(resp.code, request_uri, body, resp.body)
+        raise ::LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool::BadResponseCodeError.new(resp.code, request_uri, body, resp.body)
       end
 
       resp

data/lib/logstash/outputs/amazon_es/http_client/pool.rb

@@ -1,4 +1,4 @@
-module LogStash; module Outputs; class ElasticSearch; class HttpClient;
+module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
   class Pool
     class NoConnectionAvailableError < Error; end
     class BadResponseCodeError < Error

data/lib/logstash/outputs/amazon_es/http_client_builder.rb

@@ -1,6 +1,6 @@
 require 'cgi'
 
-module LogStash; module Outputs; class ElasticSearch;
+module LogStash; module Outputs; class AmazonElasticSearch;
   module HttpClientBuilder
     def self.build(logger, hosts, params)
       client_settings = {
@@ -101,11 +101,13 @@ module LogStash; module Outputs; class ElasticSearch;
                                               :port => params["port"],
                                               :region => params["region"],
                                               :aws_access_key_id => params["aws_access_key_id"],
-                                              :aws_secret_access_key => params["aws_secret_access_key"]))
+                                              :aws_secret_access_key => params["aws_secret_access_key"],
+                                              :max_bulk_bytes => params["max_bulk_bytes"])
+                                              )
     end
 
     def self.create_http_client(options)
-      LogStash::Outputs::ElasticSearch::HttpClient.new(options)
+      LogStash::Outputs::AmazonElasticSearch::HttpClient.new(options)
     end
 
     def self.setup_ssl(logger, params)

data/lib/logstash/outputs/amazon_es/template_manager.rb

@@ -1,4 +1,4 @@
-module LogStash; module Outputs; class ElasticSearch
+module LogStash; module Outputs; class AmazonElasticSearch
   class TemplateManager
     # To be mixed into the amazon_es plugin base
     def self.install_template(plugin)

data/logstash-output-amazon_es.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-amazon_es'
-  s.version         = '7.0'
+  s.version         = '7.0.1'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Logstash Output to Amazon Elasticsearch Service"
   s.description     = "Output events to Amazon Elasticsearch Service with V4 signing"
@@ -26,9 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'aws-sdk', '>= 2.3.22', '~> 2'
 
-  s.add_development_dependency 'logstash-codec-plain', '~> 0'
-  s.add_development_dependency 'logstash-devutils', '~> 0'
+  s.add_development_dependency 'logstash-codec-plain'
+  s.add_development_dependency 'logstash-devutils', "~> 1.3", ">= 1.3.1"
   s.add_development_dependency 'flores', '~> 0'
-  # Still used in some specs, we should remove this ASAP
-  s.add_development_dependency 'elasticsearch', '~> 0'
 end

data/spec/es_spec_helper.rb

@@ -1,6 +1,5 @@
 require "logstash/devutils/rspec/spec_helper"
 require 'manticore'
-require 'elasticsearch'
 
 # by default exclude secure_integration tests unless requested
 # normal integration specs are already excluded by devutils' spec helper
@@ -13,10 +12,6 @@ module ESHelper
     "127.0.0.1"
   end
 
-  def get_client
-    Elasticsearch::Client.new(:hosts => [get_host_port])
-  end
-
   def self.es_version
     RSpec.configuration.filter[:es_version] || ENV['ES_VERSION']
   end

data/spec/unit/http_client_builder_spec.rb

@@ -3,9 +3,9 @@ require "logstash/outputs/amazon_es"
 require "logstash/outputs/amazon_es/http_client"
 require "logstash/outputs/amazon_es/http_client_builder"
 
-describe LogStash::Outputs::ElasticSearch::HttpClientBuilder do
+describe LogStash::Outputs::AmazonElasticSearch::HttpClientBuilder do
   describe "auth setup with url encodable passwords" do
-    let(:klass) { LogStash::Outputs::ElasticSearch::HttpClientBuilder }
+    let(:klass) { LogStash::Outputs::AmazonElasticSearch::HttpClientBuilder }
     let(:user) { "foo@bar"}
     let(:password) {"baz@blah" }
     let(:password_secured) do

data/spec/unit/outputs/elasticsearch/http_client/manticore_adapter_spec.rb

@@ -1,7 +1,7 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/amazon_es/http_client"
 
-describe LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter do
+describe LogStash::Outputs::AmazonElasticSearch::HttpClient::ManticoreAdapter do
   let(:logger) { Cabin::Channel.get }
   let(:options) { {:aws_access_key_id => 'AAAAAAAAAAAAAAAAAAAA',
                    :aws_secret_access_key => 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'} }
@@ -34,12 +34,12 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter do
       uri_with_path = uri.clone
       uri_with_path.path = "/"
 
-      expect(::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError).to receive(:new).
+      expect(::LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool::BadResponseCodeError).to receive(:new).
         with(resp.code, uri_with_path, nil, resp.body).and_call_original
 
       expect do
         subject.perform_request(uri, :get, "/")
-      end.to raise_error(::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError)
+      end.to raise_error(::LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool::BadResponseCodeError)
     end
   end
 

data/spec/unit/outputs/elasticsearch/http_client/pool_spec.rb

@@ -2,9 +2,9 @@ require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/amazon_es/http_client"
 require "json"
 
-describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
+describe LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool do
   let(:logger) { Cabin::Channel.get }
-  let(:adapter) { LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter.new(logger,
+  let(:adapter) { LogStash::Outputs::AmazonElasticSearch::HttpClient::ManticoreAdapter.new(logger,
                                                                                      {:aws_access_key_id => 'AAAAAAAAAAAAAAAAAAAA',
                                                                                               :aws_secret_access_key => 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'}) }
   let(:initial_urls) { [::LogStash::Util::SafeURI.new("http://localhost:9200")] }

data/spec/unit/outputs/elasticsearch/http_client_spec.rb

@@ -2,7 +2,7 @@ require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/amazon_es/http_client"
 require "java"
 
-describe LogStash::Outputs::ElasticSearch::HttpClient do
+describe LogStash::Outputs::AmazonElasticSearch::HttpClient do
   let(:ssl) { nil }
   let(:base_options) do
     opts = {
@@ -12,7 +12,8 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
       :protocol => "http",
       :port => 9200,
       :aws_access_key_id => "AAAAAAAAAAAAAAAAAAAA",
-      :aws_secret_access_key => "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+      :aws_secret_access_key => "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+      :max_bulk_bytes => 20 * 1024 * 1024
     }
 
     if !ssl.nil? # Shortcut to set this
@@ -29,6 +30,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
     let(:ipv6_hostname) { "[::1]" }
     let(:ipv4_hostname) { "127.0.0.1" }
     let(:port) { 9200 }
+    let(:max_bulk_bytes) { 20 * 1024 * 1024 }
     let(:protocol) {"http"}
     let(:aws_access_key_id) {"AAAAAAAAAAAAAAAAAAAA"}
     let(:aws_secret_access_key) {"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"}
@@ -163,7 +165,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
     ]}
 
     context "if a message is over TARGET_BULK_BYTES" do
-      let(:target_bulk_bytes) { LogStash::Outputs::ElasticSearch::TARGET_BULK_BYTES }
+      let(:target_bulk_bytes) { 20 * 1024 * 1024 }
       let(:message) { "a" * (target_bulk_bytes + 1) }
 
       it "should be handled properly" do
@@ -189,7 +191,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
       end
 
       context "if one exceeds TARGET_BULK_BYTES" do
-        let(:target_bulk_bytes) { LogStash::Outputs::ElasticSearch::TARGET_BULK_BYTES }
+        let(:target_bulk_bytes) { 20 * 1024 * 1024 }
         let(:message1) { "a" * (target_bulk_bytes + 1) }
         it "executes two bulk_send operations" do
           allow(subject).to receive(:join_bulk_responses)
@@ -201,7 +203,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
   end
 
   describe "sniffing" do
-    let(:client) { LogStash::Outputs::ElasticSearch::HttpClient.new(base_options.merge(client_opts)) }
+    let(:client) { LogStash::Outputs::AmazonElasticSearch::HttpClient.new(base_options.merge(client_opts)) }
 
     context "with sniffing enabled" do
       let(:client_opts) { {:sniffing => true, :sniffing_delay => 1 } }

data/spec/unit/outputs/elasticsearch/template_manager_spec.rb

@@ -3,7 +3,7 @@ require "logstash/outputs/amazon_es/http_client"
 require "java"
 require "json"
 
-describe LogStash::Outputs::ElasticSearch::TemplateManager do
+describe LogStash::Outputs::AmazonElasticSearch::TemplateManager do
 
   describe ".default_template_path" do
     context "amazon_es 1.x" do

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -2,7 +2,7 @@ require_relative "../../../spec/es_spec_helper"
 require "flores/random"
 require "logstash/outputs/amazon_es"
 
-describe LogStash::Outputs::ElasticSearch do
+describe LogStash::Outputs::AmazonElasticSearch do
   subject { described_class.new(options) }
   let(:options) { { "aws_access_key_id" => "AAAAAAAAAAAAAAAAAAAA",
                     "aws_secret_access_key" => "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"} }
@@ -222,7 +222,7 @@ describe LogStash::Outputs::ElasticSearch do
     context "429 errors" do
       let(:event) { ::LogStash::Event.new("foo" => "bar") }
       let(:error) do
-        ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(
+        ::LogStash::Outputs::AmazonElasticSearch::HttpClient::Pool::BadResponseCodeError.new(
           429, double("url").as_null_object, double("request body"), double("response body")
         )
       end

data/spec/unit/outputs/error_whitelist_spec.rb

@@ -14,7 +14,7 @@ describe "whitelisting error types in expected behavior" do
                     "aws_access_key_id" => "AAAAAAAAAAAAAAAAAAAA",
                     "aws_secret_access_key" => "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"} }
 
-  subject { LogStash::Outputs::ElasticSearch.new(settings) }
+  subject { LogStash::Outputs::AmazonElasticSearch.new(settings) }
 
   before :each do
     allow(subject.logger).to receive(:warn)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-amazon_es
 version: !ruby/object:Gem::Version
-  version: '7.0'
+  version: 7.0.1
 platform: java
 authors:
 - Amazon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-plain
@@ -115,7 +115,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -123,7 +123,10 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   name: logstash-devutils
   prerelease: false
   type: :development
@@ -131,28 +134,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: flores
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-  name: elasticsearch
+  name: flores
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement