logstash-output-opensearch 1.0.0-java → 1.3.0-java

data/spec/unit/outputs/opensearch_spec.rb

@@ -12,6 +12,7 @@ require "base64"
 require "flores/random"
 require 'concurrent/atomic/count_down_latch'
 require "logstash/outputs/opensearch"
+require 'logstash/plugin_mixins/ecs_compatibility_support/spec_helper'
 
 describe LogStash::Outputs::OpenSearch do
   subject(:opensearch_output_instance) { described_class.new(options) }
@@ -325,7 +326,7 @@ describe LogStash::Outputs::OpenSearch do
   end
 
   context '413 errors' do
-    let(:payload_size) { LogStash::Outputs::OpenSearch::TARGET_BULK_BYTES + 1024 }
+    let(:payload_size) { subject.client.target_bulk_bytes + 1024 }
     let(:event) { ::LogStash::Event.new("message" => ("a" * payload_size ) ) }
 
     let(:logger_stub) { double("logger").as_null_object }
@@ -357,7 +358,7 @@ describe LogStash::Outputs::OpenSearch do
 
       expect(logger_stub).to have_received(:warn)
                                  .with(a_string_matching(/413 Payload Too Large/),
-                                       hash_including(:action_count => 1, :content_length => a_value > 20_000_000))
+                                       hash_including(:action_count => 1, :content_length => a_value > subject.client.target_bulk_bytes))
     end
   end
 
@@ -784,6 +785,21 @@ describe LogStash::Outputs::OpenSearch do
     end
   end
 
+  describe 'ecs_compatibility support', :ecs_compatibility_support do
+    [:disabled, :v1, :v8].each do |ecs_compatibility|
+      context "when `ecs_compatibility => #{ecs_compatibility}`" do
+        let(:options) { Hash.new }
+        subject(:output) { described_class.new(options.merge("ecs_compatibility" => "#{ecs_compatibility}")) }
+        context 'when registered' do
+          before(:each) { output.register }
+          it 'has the correct effective ECS compatibility setting' do
+            expect(output.ecs_compatibility).to eq(ecs_compatibility)
+          end
+        end
+      end
+    end
+  end
+  
   @private
 
   def stub_manticore_client!(manticore_double = nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-opensearch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: java
 authors:
 - Elastic
@@ -13,7 +13,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRMwEQYDVQQDDApvcGVu
   c2VhcmNoMRYwFAYKCZImiZPyLGQBGRYGYW1hem9uMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTIxMDgwMjIxMDQwM1oXDTIyMDgwMjIxMDQwM1owQjETMBEGA1UEAwwK
+  Y29tMB4XDTIyMDgxNzE3NTIzNFoXDTIzMDgxNzE3NTIzNFowQjETMBEGA1UEAwwK
   b3BlbnNlYXJjaDEWMBQGCgmSJomT8ixkARkWBmFtYXpvbjETMBEGCgmSJomT8ixk
   ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1z3/jcitjV
   umXwRFn+JSBBd36qZB54Dtucf6+E2fmNPzBRhgYN5XJy/+clQJ9NIJV7C8H52P3V
@@ -24,14 +24,14 @@ cert_chain:
   zfR37/NQFkECAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
   BBYEFJJ2myhLXK742btavNbG0IWrMNBIMCAGA1UdEQQZMBeBFW9wZW5zZWFyY2hA
   YW1hem9uLmNvbTAgBgNVHRIEGTAXgRVvcGVuc2VhcmNoQGFtYXpvbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBAE7gBP5ecTtKb04qmEsnbJ6+yn0LUSmxPabFBnB6h1+T
-  XW8BvBw9MpE//5fQf4HSia3m9XjRpl4WxBcJiyfLER64tk/c1JLhV2+rq3CCV/be
-  DFSP6gY93kK7jwauajGQvyHzORaW1TBM6diIRYCMLY7Isf+PTHl0xhZZBSVm8wl6
-  IstV+mTP2KC1l7hSzUDb4rrOSnpRB7AEczcDdkjwzHKIlw8rcL+PLLnFTOgqKyq3
-  yXikuH6LEVykA8pgOcB9gKsB2/zMd2ZlSj2monM8Qw9EfB14ZSDTYS8VYuwWCeF0
-  eFmXXk0ufQFKl1Yll7quHkmQ0PzKkvXTpONBT6qPkXE=
+  KoZIhvcNAQEFBQADggEBAH5pWLYwKWFh1OjdCReGz/VEAiF4jXXputoN5Z8ga+1Z
+  lg8/diJf0PlP2B46PdmxH/TVc/o+qglNO2cHVEp8xZfEd83dfioOBeK90URQUpC5
+  UZmO0LZusg46SQKwKa2ukpIy2fNi3PeHRiV+W2Zv69GoWppyLun+fMez7wVoah2r
+  r5ROUYuAvFUvga1Vm+49pKiPM5n+MAYP5t/vWhgymY3SYQ1TfewkvKAFiFXikOR+
+  r+j7FLyKuk5DzIxiCp8QN5dU71BbGUmsHf/C5UV76WLPOFX/szeaHhPwpjR3sK7r
+  5zLgCV1KP7cgDdCYMlmZGeSViU8NV+Yy8/ghrzGpqVw=
   -----END CERTIFICATE-----
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -56,23 +56,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.17
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
   name: stud
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.17
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -107,6 +107,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.11.632
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  name: aws-sdk
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.11.632
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  name: json
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -163,6 +203,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  name: opensearch-ruby
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 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 gem. This gem
   is not a stand-alone program
@@ -173,6 +227,7 @@ extra_rdoc_files: []
 files:
 - ADMINS.md
 - CODE_OF_CONDUCT.md
+- COMPATIBILITY.md
 - CONTRIBUTING.md
 - DEVELOPER_GUIDE.md
 - Gemfile
@@ -183,17 +238,19 @@ files:
 - RELEASING.md
 - SECURITY.md
 - lib/logstash/outputs/opensearch.rb
-- lib/logstash/outputs/opensearch/distribution_checker.rb
 - lib/logstash/outputs/opensearch/http_client.rb
 - lib/logstash/outputs/opensearch/http_client/manticore_adapter.rb
 - lib/logstash/outputs/opensearch/http_client/pool.rb
 - lib/logstash/outputs/opensearch/http_client_builder.rb
 - lib/logstash/outputs/opensearch/template_manager.rb
 - lib/logstash/outputs/opensearch/templates/ecs-disabled/1x.json
+- lib/logstash/outputs/opensearch/templates/ecs-disabled/2x.json
 - lib/logstash/outputs/opensearch/templates/ecs-disabled/7x.json
+- lib/logstash/outputs/opensearch/templates/ecs-v8/1x.json
+- lib/logstash/outputs/opensearch/templates/ecs-v8/2x.json
+- lib/logstash/outputs/opensearch/templates/ecs-v8/7x.json
 - lib/logstash/plugin_mixins/opensearch/api_configs.rb
 - lib/logstash/plugin_mixins/opensearch/common.rb
-- lib/logstash/plugin_mixins/opensearch/noop_distribution_checker.rb
 - logstash-output-opensearch.gemspec
 - spec/fixtures/_nodes/nodes.json
 - spec/fixtures/htpasswd
@@ -249,8 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: Stores logs in OpenSearch

data/lib/logstash/outputs/opensearch/distribution_checker.rb

@@ -1,44 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-#  The OpenSearch Contributors require contributions made to
-#  this file be licensed under the Apache-2.0 license or a
-#  compatible open source license.
-#
-#  Modifications Copyright OpenSearch Contributors. See
-#  GitHub history for details.
-#
-module LogStash; module Outputs; class OpenSearch
-  class DistributionChecker
-
-    def initialize(logger)
-      @logger = logger
-    end
-
-    # Checks whether connecting cluster is one of supported distribution or not
-    # @param pool
-    # @param url [LogStash::Util::SafeURI] OpenSearch node URL
-    # @param major_version OpenSearch major version number
-    # @return [Boolean] true if supported
-    def is_supported?(pool, url, major_version)
-      distribution = get_distribution(pool, url)
-      case distribution
-      when 'opensearch'
-        return true
-      when 'oss'
-        if major_version == 7
-          return true
-        end
-      end
-      log_not_supported(url, major_version, distribution)
-      false
-    end
-
-    def get_distribution(pool, url)
-      pool.get_distribution(url)
-    end
-
-    def log_not_supported(url, major_version, distribution)
-      @logger.error("Could not connect to cluster", url: url.sanitized.to_s, distribution: distribution, major_version: major_version)
-    end
-  end
-end; end; end

data/lib/logstash/plugin_mixins/opensearch/noop_distribution_checker.rb

@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-#  The OpenSearch Contributors require contributions made to
-#  this file be licensed under the Apache-2.0 license or a
-#  compatible open source license.
-#
-#  Modifications Copyright OpenSearch Contributors. See
-#  GitHub history for details.
-
-module LogStash; module PluginMixins; module OpenSearch
-  class NoopDistributionChecker
-    INSTANCE = self.new
-
-    def is_supported?(pool, url, major_version)
-      true
-    end
-  end
-end; end; end