logstash-output-amazon_es 7.0.1-java → 8.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c5f134b8fa5c15b4487b4db40169c975fe4980a86c15859e914c2f2834484c2
-  data.tar.gz: 7b603d2e39205e83e67925369f0b197970133a7602ebba7f6e7c1e5a4a4612e8
+  metadata.gz: b2ee2078a352ec70e02b1a7ea155920fa46321a5338988e51a16fb252f4fc3e5
+  data.tar.gz: 9ddbcfb3abedb40c41c27784c3c76ed8358ddda3ed57a15be569fec0a5ecbd03
 SHA512:
-  metadata.gz: 642d6f09125457e3ff52b67b3c43684230ea351ee6b067332d49f1432e782fb30d5b5c6a81da62f0cdffd696bddaa71e1e749913f0a79084ca4dfd89bbf10488
-  data.tar.gz: b205a14fd96273c85d4c33422ce29a57b5142ef26822c9b582de76625669f2eafc4b8bdeec291b0ef75cb4046e88c0c7861753ecccc108266176e593535d985d
+  metadata.gz: bf71c118ab4fbb00a2b317f380fb5e0e05fd8db866f3f01b63ec3cb1ad066dae2f78f77a9e9c4980c5c824879efdff711b0bd94e130ea32e81516a47fb3f8d36
+  data.tar.gz: f5543338eb6057ed5c29653fedd8e2710a14b610617b2e7ce94f2ca91d4770aadcaece33ffcc7152b8f3bb103eef26ff7f6eb5c3f3d65e9c1705670486e41043

data/Gemfile

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 source 'https://rubygems.org'
 
 gemspec

data/NOTICE.TXT

@@ -1,14 +1,14 @@
 Logstash-output-amazon_es Plugin
-Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+This product includes software from the Apache-2.0 licensed Elasticsearch project.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either expressed or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+It requires the following notice:
+
+  Elasticsearch
+  Copyright 2012-2015 Elasticsearch
+  Copyright 2020 Elastic and contributors
+
+  This product includes software developed by The Apache Software
+  Foundation (http://www.apache.org/).

data/README.md

@@ -1,6 +1,71 @@
-# Logstash Plugin
+# Logstash Output Plugin
 
-This is a plugin for [Logstash](https://github.com/elastic/logstash).
+
+This plugin is now in maintenance mode. We will supply bug fixes and security patches for v7.2.X, older versions are no longer supported. This change is because the OpenSearch Project created a new Logstash output plugin
+[logstash-output-opensearch](https://github.com/opensearch-project/logstash-output-opensearch) which ships events from
+Logstash to OpenSearch 1.x and Elasticsearch 7.x clusters, and also supports SigV4 signing. Having similar functionality
+plugins can be redundant, so we plan to eventually replace this logstash-output-amazon_es plugin with the logstash-output-opensearch
+plugin.
+
+To help you migrate to [logstash-output-opensearch](https://github.com/opensearch-project/logstash-output-opensearch) plugin, please
+find below a brief migration guide.
+
+## Migrating to logstash-output-opensearch plugin
+
+
+This guide provides instructions for existing users of logstash-output-amazon_es plugin to migrate to
+logstash-output-opensearch plugin.
+
+### Configuration Changes
+* The plugin name will change from `amazon_es` to `opensearch`.
+* If using HTTPS this must be explicitly configured because `opensearch` plugin does not default to it like `amazon_es` does:
+  * The protocol must be included in `hosts` as `https` (or option `ssl` added with value `true`)
+  * `port` must explicitly specified as `443`
+* A new parameter `auth_type` will be added to the Config to support SigV4 signing.
+* The `region` parameter will move under `auth_type`.
+* Credential parameters `aws_access_key_id` and `aws_secret_access_key` will move under `auth_type`.
+* The `type` value for `auth_type` for SigV4 signing will be set to `aws_iam`.
+
+For the Logstash configuration provided in [Configuration for Amazon Elasticsearch Service Output Plugin
+](#configuration-for-amazon-elasticsearch-service-output-plugin), here's a mapped example configuration for
+logstash-output-opensearch plugin:
+
+```
+output {
+   opensearch {
+          hosts => ["https://hostname:port"]
+          auth_type => {
+              type => 'aws_iam'
+              aws_access_key_id => 'ACCESS_KEY'
+              aws_secret_access_key => 'SECRET_KEY'
+              region => 'us-west-2'
+          }
+          index  => "logstash-logs-%{+YYYY.MM.dd}"
+   }
+}
+```
+
+### Installation of logstash-output-opensearch plugin
+This [Installation Guide](https://opensearch.org/docs/latest/clients/logstash/index/) has instructions on installing the
+logstash-output-opensearch plugin in two ways: Linux (ARM64/X64) OR Docker (ARM64/X64).
+
+To install the latest version of logstash-output-opensearch, use the normal Logstash plugin installation command:
+```shell
+bin/logstash-plugin install logstash-output-opensearch
+```
+
+# Using the logstash-output-amazon_es plugin
+
+
+The remainder of this document is for using or developing the logstash-output-amazon_es plugin.
+
+
+## Overview
+
+This is a plugin for [Logstash](https://github.com/elastic/logstash) which outputs
+to [Amazon OpenSearch Service](https://aws.amazon.com/opensearch-service/)
+(successor to Amazon Elasticsearch Service) using
+[SigV4 signing](https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html).
 
 ## License
 
@@ -8,14 +73,52 @@ This library is licensed under Apache License 2.0.
 
 ## Compatibility
 
-The following table shows the versions of logstash and logstash-output-amazon_es Plugin was built with.
+The following table shows the versions of logstash and logstash-output-amazon_es plugin was built with.
 
-|  logstash-output-amazon_es | Logstash |
-| ------------- | ------------- |
-| 6.0.0  | <6.0.0  |
-| 6.4.0  | >6.0.0  |
+| logstash-output-amazon_es | Logstash |
+|---------------------------|----------|
+| 6.0.0                     | < 6.0.0  |
+| 6.4.2                     | >= 6.0.0 |
+| 7.0.1                     | >= 7.0.0 |
+| 7.1.0                     | >= 7.0.0 |
+| 8.0.0                     | >= 7.0.0 |
 
-logstash-output-amazon_es plugin versions 6.4.0 and newer are tested to be compatible with Elasticsearch 6.5 and greater. 
+Also, logstash-output-amazon_es plugin versions 6.4.0 and newer are tested to be compatible with Elasticsearch 6.5 and greater.
+
+|  logstash-output-amazon_es | Elasticsearch |
+| ------------- |----------|
+| 6.4.0+  | 6.5+     |
+
+
+## Installation
+
+To install the latest version, use the normal Logstash plugin script.
+
+```sh
+bin/logstash-plugin install logstash-output-amazon_es
+```
+
+If you want to use old version of logstash-output-amazon_es, you can use the `--version`
+flag to specify the version. For example:
+
+```sh
+bin/logstash-plugin install --version 6.4.2 logstash-output-amazon_es
+```
+
+Starting in 8.0.0, the aws sdk version is bumped to v3. In order for all other AWS plugins to work together, please remove pre-installed plugins and install logstash-integration-aws plugin as follows. See also https://github.com/logstash-plugins/logstash-mixin-aws/issues/38
+```
+# Remove existing logstash aws plugins and install logstash-integration-aws to keep sdk dependency the same
+# https://github.com/logstash-plugins/logstash-mixin-aws/issues/38
+/usr/share/logstash/bin/logstash-plugin remove logstash-input-s3
+/usr/share/logstash/bin/logstash-plugin remove logstash-input-sqs
+/usr/share/logstash/bin/logstash-plugin remove logstash-output-s3
+/usr/share/logstash/bin/logstash-plugin remove logstash-output-sns
+/usr/share/logstash/bin/logstash-plugin remove logstash-output-sqs
+/usr/share/logstash/bin/logstash-plugin remove logstash-output-cloudwatch
+
+/usr/share/logstash/bin/logstash-plugin install --version 0.1.0.pre logstash-integration-aws
+bin/logstash-plugin install --version 8.0.0 logstash-output-amazon_es
+```
 
 ## Configuration for Amazon Elasticsearch Service Output Plugin
 
@@ -62,17 +165,36 @@ output {
 - 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.
+
+### Advanced Optional Parameters
+
+Starting logstash-output-amazon_es v7.1.0, we have introduced the following optional parameters to resolve specific use cases:
+
+- service_name (string, default => "es") - Users can define any service name to which the plugin will send a SigV4 signed request
+- skip_healthcheck (boolean, default => false) - Boolean to skip healthcheck API and set the major ES version to 7
+- skip_template_installation (boolean, default => false) -  Boolean to allow users to skip installing templates in usecases that don't require them
+
 ## Developing
 
-### 1. Plugin Development and Testing
+### 1. Prerequisites
+To get started, you can install JRuby with the Bundler gem using [RVM](https://rvm.io/rvm/install)
+
+```shell
+rvm install jruby-9.2.5.0
+```
+
+### 2. Plugin Development and Testing
 
 #### Code
 
-1. To get started, you'll need JRuby with the Bundler gem installed.
+1. Verify JRuby is already installed
 
-2. Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. [Example plugins](https://github.com/logstash-plugins?query=example) exist.
+   ```sh
+   jruby -v
+   ```
 
-3. Install dependencies:
+
+2. Install dependencies:
 
    ```sh
    bundle install
@@ -92,14 +214,14 @@ After 6.4.0, users can't set batch size in this output plugin config. However, u
    bundle exec rspec
    ```
 
-### 2. Running your unpublished plugin in Logstash
+### 3. Running your unpublished plugin in Logstash
 
-#### 2.1 Run in a local Logstash clone
+#### 3.1 Run in a local Logstash clone
 
 1. Edit Logstash `Gemfile` and add the local plugin path, for example:
 
    ```ruby
-   gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
+   gem "logstash-output-amazon_es", :path => "/your/local/logstash-output-amazon_es"
    ```
 
 2. Install the plugin:
@@ -115,12 +237,12 @@ After 6.4.0, users can't set batch size in this output plugin config. However, u
 3. Run Logstash with your plugin:
 
    ```sh
-   bin/logstash -e 'filter {awesome {}}'
+   bin/logstash -e 'output {amazon_es {}}'
    ```
 
 At this point any modifications to the plugin code will be applied to this local Logstash setup. After modifying the plugin, simply re-run Logstash.
 
-#### 2.2 Run in an installed Logstash
+#### 3.2 Run in an installed Logstash
 
 Before build your `Gemfile`, please make sure use JRuby. Here is how you can know your local Ruby version:
 
@@ -131,37 +253,25 @@ rvm list
 Please make sure you current using JRuby. Here is how you can change to JRuby
 
 ```sh
-rvm jruby
+rvm jruby-9.2.5.0
 ```
 
-You can use the same **2.1** method to run your plugin in an installed Logstash by editing its `Gemfile` and pointing the `:path` to your local plugin development directory. You can also build the gem and install it using:
+You can use the same **3.1** method to run your plugin in an installed Logstash by editing its `Gemfile` and pointing the `:path` to your local plugin development directory. You can also build the gem and install it using:
 
 1. Build your plugin gem:
 
    ```sh
-   gem build logstash-filter-awesome.gemspec
+   gem build logstash-output-amazon_es.gemspec
    ```
 
-2. Install the plugin from the Logstash home:
+2. Install the plugin from the Logstash home. Please be sure to check the version number against the actual Gem file. Run:
 
    ```sh
-   # Logstash 2.3 and higher
-   bin/logstash-plugin install --no-verify
-
-   # Prior to Logstash 2.3
-   bin/plugin install --no-verify
+   bin/logstash-plugin install /your/local/logstash-output-amazon_es/logstash-output-amazon_es-7.0.1-java.gem
    ```
 
 3. Start Logstash and test the plugin.
 
-## Old version support
-
-If you want to use old version of logstash-output-amazon_es, you can install with this:  
-```sh
-bin/logstash-plugin install logstash-output-amazon_es -v 2.0.0
-```
-
-
 
 ## Contributing
 

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

@@ -1,8 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require "logstash/outputs/amazon_es/template_manager"
 
 module LogStash; module Outputs; class AmazonElasticSearch;
   module Common
-    attr_reader :client, :hosts
+    attr_reader :client, :hosts, :skip_template_installation
 
     # These codes apply to documents, not at the request level
     DOC_DLQ_CODES = [400, 404]
@@ -115,8 +119,12 @@ module LogStash; module Outputs; class AmazonElasticSearch;
     end
 
     def install_template
-      TemplateManager.install_template(self)
-      @template_installed.make_true
+      if skip_template_installation == false
+       TemplateManager.install_template(self)
+       @template_installed.make_true
+      elsif skip_template_installation == true
+        @template_installed.make_true
+      end
     end
 
     def check_action_validity

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 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 AmazonElasticSearch

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require 'manticore'
 require 'cgi'
 require 'aws-sdk-core'
@@ -33,6 +37,7 @@ module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
       @port =  options[:port] || 9200
       @protocol =  options[:protocol] || 'http'
       @region =   options[:region] || 'us-east-1'
+      @service_name = options[:service_name] || 'es'
       aws_access_key_id =  options[:aws_access_key_id] || nil
       aws_secret_access_key = options[:aws_secret_access_key] || nil
       session_token = options[:session_token] || nil
@@ -46,10 +51,10 @@ module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
       if options[:proxy]
         options[:proxy] = manticore_proxy_hash(options[:proxy])
       end
-      
+
       @manticore = ::Manticore::Client.new(options)
     end
-    
+
     # Transform the proxy option to a hash. Manticore's support for non-hash
     # proxy options is broken. This was fixed in https://github.com/cheald/manticore/commit/34a00cee57a56148629ed0a47c329181e7319af5
     # but this is not yet released
@@ -84,12 +89,12 @@ module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
       params[:body] = body if body
 
       if url.user
-        params[:auth] = { 
+        params[:auth] = {
           :user => CGI.unescape(url.user),
           # We have to unescape the password here since manticore won't do it
           # for us unless its part of the URL
-          :password => CGI.unescape(url.password), 
-          :eager => true 
+          :password => CGI.unescape(url.password),
+          :eager => true
         }
       end
 
@@ -102,16 +107,18 @@ module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
       end
 
 
-      key = Seahorse::Client::Http::Request.new(options={:endpoint=>url, :http_method => method.to_s.upcase,
+      request = Seahorse::Client::Http::Request.new(options={:endpoint=>url, :http_method => method.to_s.upcase,
                                                        :headers => params[:headers],:body => params[:body]})
 
-      aws_signer = Aws::Signers::V4.new(@credentials, 'es', @region )
-
-
-      signed_key =  aws_signer.sign(key)
-      params[:headers] =  params[:headers].merge(signed_key.headers)
-
+      aws_signer = Aws::Sigv4::Signer.new(service: @service_name, region: @region, credentials_provider: @credentials)
 
+      signed_key = aws_signer.sign_request(
+        http_method: request.http_method,
+        url: url,
+        headers: params[:headers],
+        body: params[:body]
+      )
+      params[:headers] = params[:headers].merge(signed_key.headers)
 
       resp = @manticore.send(method.downcase, request_uri.to_s, params)
 
@@ -131,27 +138,27 @@ module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
 
     def format_url(url, path_and_query=nil)
       request_uri = url.clone
-      
+
       # We excise auth info from the URL in case manticore itself tries to stick
       # sensitive data in a thrown exception or log data
       request_uri.user = nil
       request_uri.password = nil
 
       return request_uri.to_s if path_and_query.nil?
-      
+
       parsed_path_and_query = java.net.URI.new(path_and_query)
-      
+
       query = request_uri.query
       parsed_query = parsed_path_and_query.query
-      
+
       new_query_parts = [request_uri.query, parsed_path_and_query.query].select do |part|
         part && !part.empty? # Skip empty nil and ""
       end
-      
+
       request_uri.query = new_query_parts.join("&") unless new_query_parts.empty?
-      
+
       request_uri.path = "#{request_uri.path}/#{parsed_path_and_query.path}".gsub(/\/{2,}/, "/")
-        
+
       request_uri
     end
 

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
   class Pool
     class NoConnectionAvailableError < Error; end
@@ -28,7 +32,7 @@ module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
       end
     end
 
-    attr_reader :logger, :adapter, :sniffing, :sniffer_delay, :resurrect_delay, :healthcheck_path, :sniffing_path, :bulk_path
+    attr_reader :logger, :adapter, :sniffing, :sniffer_delay, :resurrect_delay, :healthcheck_path, :sniffing_path, :bulk_path, :skip_healthcheck
 
     ROOT_URI_PATH = '/'.freeze
 
@@ -40,6 +44,7 @@ module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
       :resurrect_delay => 5,
       :sniffing => false,
       :sniffer_delay => 10,
+      :skip_healthcheck => false,
     }.freeze
 
     def initialize(logger, adapter, initial_urls=[], options={})
@@ -57,6 +62,7 @@ module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
         @resurrect_delay = merged[:resurrect_delay]
         @sniffing = merged[:sniffing]
         @sniffer_delay = merged[:sniffer_delay]
+        @skip_healthcheck = merged[:skip_healthcheck]
       end
 
       # Used for all concurrent operations in this class
@@ -238,25 +244,30 @@ module LogStash; module Outputs; class AmazonElasticSearch; class HttpClient;
 
     def healthcheck!
       # Try to keep locking granularity low such that we don't affect IO...
-      @state_mutex.synchronize { @url_info.select {|url,meta| meta[:state] != :alive } }.each do |url,meta|
+      @state_mutex.synchronize { @url_info.select { |url, meta| meta[:state] != :alive } }.each do |url, meta|
         begin
-          logger.info("Running health check to see if an Elasticsearch connection is working",
+          if skip_healthcheck == false
+            logger.info("Running health check to see if an Elasticsearch connection is working",
                         :healthcheck_url => url, :path => @healthcheck_path)
-          response = perform_request_to_url(url, :head, @healthcheck_path)
-          # If no exception was raised it must have succeeded!
-          logger.warn("Restored connection to ES instance", :url => url.sanitized.to_s)
-          # We reconnected to this node, check its ES version
-          es_version = get_es_version(url)
-          @state_mutex.synchronize do
-            meta[:version] = es_version
-            major = major_version(es_version)
-            if !@maximum_seen_major_version
-              @logger.info("ES Output version determined", :es_version => major)
-              set_new_major_version(major)
-            elsif major > @maximum_seen_major_version
-              @logger.warn("Detected a node with a higher major version than previously observed. This could be the result of an amazon_es cluster upgrade.", :previous_major => @maximum_seen_major_version, :new_major => major, :node_url => url)
-              set_new_major_version(major)
+            response = perform_request_to_url(url, :head, @healthcheck_path)
+            # If no exception was raised it must have succeeded!
+            logger.warn("Restored connection to ES instance", :url => url.sanitized.to_s)
+            # We reconnected to this node, check its ES version
+            es_version = get_es_version(url)
+            @state_mutex.synchronize do
+              meta[:version] = es_version
+              major = major_version(es_version)
+              if !@maximum_seen_major_version
+                @logger.info("ES Output version determined", :es_version => major)
+                set_new_major_version(major)
+              elsif major > @maximum_seen_major_version
+                @logger.warn("Detected a node with a higher major version than previously observed. This could be the result of an amazon_es cluster upgrade.", :previous_major => @maximum_seen_major_version, :new_major => major, :node_url => url)
+                set_new_major_version(major)
+              end
+              meta[:state] = :alive
             end
+          elsif skip_healthcheck == true
+            set_new_major_version(7)
             meta[:state] = :alive
           end
         rescue HostUnreachableError, BadResponseCodeError => e

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require "logstash/outputs/amazon_es"
 require "cabin"
 require "base64"
@@ -25,7 +29,7 @@ module LogStash; module Outputs; class AmazonElasticSearch;
     # * `:user` - String. The user to use for authentication.
     # * `:password` - String. The password to use for authentication.
     # * `:timeout` - Float. A duration value, in seconds, after which a socket
-    #    operation or request will be aborted if not yet successfull
+    #    operation or request will be aborted if not yet successful
     # * `:client_settings` - a hash; see below for keys.
     #
     # The `client_settings` key is a has that can contain other settings:
@@ -272,6 +276,8 @@ module LogStash; module Outputs; class AmazonElasticSearch;
 
       adapter_options[:region] = options[:region]
 
+      adapter_options[:service_name] = options[:service_name]
+
       adapter_options[:port] = options[:port]
 
       adapter_options[:protocol] = options[:protocol]
@@ -294,7 +300,8 @@ module LogStash; module Outputs; class AmazonElasticSearch;
         :healthcheck_path => options[:healthcheck_path],
         :resurrect_delay => options[:resurrect_delay],
         :url_normalizer => self.method(:host_to_url),
-        :metric => options[:metric]
+        :metric => options[:metric],
+        :skip_healthcheck => options[:skip_healthcheck],
       }
       pool_options[:scheme] = self.scheme if self.scheme
 

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require 'cgi'
 
 module LogStash; module Outputs; class AmazonElasticSearch;
@@ -100,9 +104,11 @@ module LogStash; module Outputs; class AmazonElasticSearch;
                                               :protocol => params["protocol"],
                                               :port => params["port"],
                                               :region => params["region"],
+                                              :service_name => params["service_name"],
                                               :aws_access_key_id => params["aws_access_key_id"],
                                               :aws_secret_access_key => params["aws_secret_access_key"],
-                                              :max_bulk_bytes => params["max_bulk_bytes"])
+                                              :max_bulk_bytes => params["max_bulk_bytes"],
+                                              :skip_healthcheck => params["skip_healthcheck"])
                                               )
     end
 

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 module LogStash; module Outputs; class AmazonElasticSearch
   class TemplateManager
     # To be mixed into the amazon_es plugin base

data/lib/logstash/outputs/amazon_es.rb

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 # encoding: utf-8
 require "logstash/namespace"
 require "logstash/environment"
@@ -121,11 +125,14 @@ class LogStash::Outputs::AmazonElasticSearch < LogStash::Outputs::Base
   # You can set the remote port as part of the host, or explicitly here as well
   config :port, :validate => :number, :default => 443
 
-  # Sets the protocol thats used to connect to elastisearch
+  # Sets the protocol thats used to connect to elasticsearch
   config :protocol, :validate => :string, :default => "https"
 
   #Signing specific details
   config :region, :validate => :string, :default => "us-east-1"
+
+  #Service name, default is `es`
+  config :service_name, :validate => :string, :default => "es"
   # Credential resolution logic works as follows:
   #
   # - User passed aws_access_key_id and aws_secret_access_key in aes configuration
@@ -251,6 +258,12 @@ class LogStash::Outputs::AmazonElasticSearch < LogStash::Outputs::Base
   #Max bulk size in bytes
   config :max_bulk_bytes, :validate => :number, :default => 20 * 1024 * 1024
 
+  #Option for user to skip Healthcheck API for a host when set to True
+  config :skip_healthcheck, :validate => :boolean, :default => false
+
+  #Allow user to skip installing template when set to True
+  config :skip_template_installation, :validate => :boolean, :default => false
+
   def build_client
     params["metric"] = metric
     @client ||= ::LogStash::Outputs::AmazonElasticSearch::HttpClientBuilder.build(@logger, @hosts, params)

data/logstash-output-amazon_es.gemspec

@@ -1,6 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-amazon_es'
-  s.version         = '7.0.1'
+  s.version         = '8.0.0'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Logstash Output to Amazon Elasticsearch Service"
   s.description     = "Output events to Amazon Elasticsearch Service with V4 signing"
@@ -24,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'stud', ['>= 0.0.17', '~> 0.0']
   s.add_runtime_dependency 'cabin', ['~> 0.6']
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
-  s.add_runtime_dependency 'aws-sdk', '>= 2.3.22', '~> 2'
+  s.add_runtime_dependency 'aws-sdk', '~> 3'
 
   s.add_development_dependency 'logstash-codec-plain'
   s.add_development_dependency 'logstash-devutils', "~> 1.3", ">= 1.3.1"

data/spec/es_spec_helper.rb

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require "logstash/devutils/rspec/spec_helper"
 require 'manticore'
 

data/spec/unit/http_client_builder_spec.rb

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/amazon_es"
 require "logstash/outputs/amazon_es/http_client"

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/amazon_es/http_client"
 

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/amazon_es/http_client"
 require "json"

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/amazon_es/http_client"
 require "java"

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

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/amazon_es/http_client"
 require "java"

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require_relative "../../../spec/es_spec_helper"
 require "flores/random"
 require "logstash/outputs/amazon_es"

data/spec/unit/outputs/error_whitelist_spec.rb

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# See NOTICE for attribution details.
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
 require "logstash/outputs/amazon_es"
 require_relative "../../../spec/es_spec_helper"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-amazon_es
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 8.0.0
 platform: java
 authors:
 - Amazon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -20,8 +20,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
   name: manticore
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -33,23 +33,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.17
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.17
   name: stud
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.17
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.17
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -57,8 +57,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
   name: cabin
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -74,8 +74,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
   name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,23 +87,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.22
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   name: aws-sdk
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.22
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -111,8 +105,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-plain
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -128,8 +122,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.1
   name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -145,8 +139,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: flores
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -205,8 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key:
 specification_version: 4
 summary: Logstash Output to Amazon Elasticsearch Service