logstash-integration-kafka 10.9.0-java → 11.3.2-java

data/spec/unit/outputs/kafka_spec.rb

@@ -22,6 +22,14 @@ describe "outputs/kafka" do
       expect(kafka.topic_id).to eql 'test'
       expect(kafka.key_serializer).to eql 'org.apache.kafka.common.serialization.StringSerializer'
     end
+
+    it 'should fallback `client_dns_lookup` to `use_all_dns_ips` when the deprecated `default` is specified' do
+      simple_kafka_config["client_dns_lookup"] = 'default'
+      kafka = LogStash::Outputs::Kafka.new(simple_kafka_config)
+      kafka.register
+
+      expect(kafka.client_dns_lookup).to eq('use_all_dns_ips')
+    end
   end
 
   context 'when outputting messages' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-kafka
 version: !ruby/object:Gem::Version
-  version: 10.9.0
+  version: 11.3.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: 8.3.0
   name: logstash-core
   prerelease: false
   type: :runtime
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: 8.3.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -245,8 +245,8 @@ files:
 - lib/logstash-integration-kafka_jars.rb
 - lib/logstash/inputs/kafka.rb
 - lib/logstash/outputs/kafka.rb
-- lib/logstash/plugin_mixins/common.rb
-- lib/logstash/plugin_mixins/kafka_support.rb
+- lib/logstash/plugin_mixins/kafka/avro_schema_registry.rb
+- lib/logstash/plugin_mixins/kafka/common.rb
 - logstash-integration-kafka.gemspec
 - spec/check_docs_spec.rb
 - spec/fixtures/jaas.config
@@ -257,20 +257,15 @@ files:
 - spec/unit/inputs/avro_schema_fixture_payment.asvc
 - spec/unit/inputs/kafka_spec.rb
 - spec/unit/outputs/kafka_spec.rb
-- vendor/jar-dependencies/com/github/luben/zstd-jni/1.4.4-7/zstd-jni-1.4.4-7.jar
-- vendor/jar-dependencies/io/confluent/common-config/5.5.1/common-config-5.5.1.jar
-- vendor/jar-dependencies/io/confluent/common-utils/5.5.1/common-utils-5.5.1.jar
-- vendor/jar-dependencies/io/confluent/kafka-avro-serializer/5.5.1/kafka-avro-serializer-5.5.1.jar
-- vendor/jar-dependencies/io/confluent/kafka-schema-registry-client/5.5.1/kafka-schema-registry-client-5.5.1.jar
-- vendor/jar-dependencies/io/confluent/kafka-schema-serializer/5.5.1/kafka-schema-serializer-5.5.1.jar
-- vendor/jar-dependencies/javax/ws/rs/javax.ws.rs-api/2.1.1/javax.ws.rs-api-2.1.1.jar
-- vendor/jar-dependencies/org/apache/avro/avro/1.9.2/avro-1.9.2.jar
-- vendor/jar-dependencies/org/apache/kafka/kafka-clients/2.5.1/kafka-clients-2.5.1.jar
-- vendor/jar-dependencies/org/apache/kafka/kafka_2.12/2.5.1/kafka_2.12-2.5.1.jar
-- vendor/jar-dependencies/org/glassfish/jersey/core/jersey-common/2.33/jersey-common-2.33.jar
-- vendor/jar-dependencies/org/lz4/lz4-java/1.7.1/lz4-java-1.7.1.jar
-- vendor/jar-dependencies/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar
-- vendor/jar-dependencies/org/xerial/snappy/snappy-java/1.1.7.3/snappy-java-1.1.7.3.jar
+- vendor/jar-dependencies/com/github/luben/zstd-jni/1.5.5-4/zstd-jni-1.5.5-4.jar
+- vendor/jar-dependencies/io/confluent/kafka-avro-serializer/7.4.0/kafka-avro-serializer-7.4.0.jar
+- vendor/jar-dependencies/io/confluent/kafka-schema-registry-client/7.4.0/kafka-schema-registry-client-7.4.0.jar
+- vendor/jar-dependencies/io/confluent/kafka-schema-serializer/7.4.0/kafka-schema-serializer-7.4.0.jar
+- vendor/jar-dependencies/org/apache/avro/avro/1.11.3/avro-1.11.3.jar
+- vendor/jar-dependencies/org/apache/kafka/kafka-clients/3.4.1/kafka-clients-3.4.1.jar
+- vendor/jar-dependencies/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar
+- vendor/jar-dependencies/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar
+- vendor/jar-dependencies/org/xerial/snappy/snappy-java/1.1.10.5/snappy-java-1.1.10.5.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache-2.0
@@ -294,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Integration with Kafka - input and output plugins

data/lib/logstash/plugin_mixins/common.rb

@@ -1,107 +0,0 @@
-module LogStash
-  module PluginMixins
-    module KafkaAvroSchemaRegistry
-
-      def self.included(base)
-        base.extend(self)
-        base.setup_schema_registry_config
-      end
-
-      def setup_schema_registry_config
-        # Option to set key to access Schema Registry.
-        config :schema_registry_key, :validate => :string
-
-        # Option to set secret to access Schema Registry.
-        config :schema_registry_secret, :validate => :password
-
-        # Option to set the endpoint of the Schema Registry.
-        # This option permit the usage of Avro Kafka deserializer which retrieve the schema of the Avro message from an
-        # instance of schema registry. If this option has value `value_deserializer_class` nor `topics_pattern` could be valued
-        config :schema_registry_url, :validate => :uri
-
-        # Option to set the proxy of the Schema Registry.
-        # This option permits to define a proxy to be used to reach the schema registry service instance.
-        config :schema_registry_proxy, :validate => :uri
-
-        # Option to skip validating the schema registry during registration. This can be useful when using
-        # certificate based auth
-        config :schema_registry_validation, :validate => ['auto', 'skip'], :default => 'auto'
-      end
-
-      def check_schema_registry_parameters
-        if @schema_registry_url
-          check_for_schema_registry_conflicts
-          @schema_registry_proxy_host, @schema_registry_proxy_port  = split_proxy_into_host_and_port(schema_registry_proxy)
-          check_for_key_and_secret
-          check_for_schema_registry_connectivity_and_subjects if schema_registry_validation?
-        end
-      end
-
-      def schema_registry_validation?
-        return false if schema_registry_validation.to_s == 'skip'
-        return false if using_kerberos? # pre-validation doesn't support kerberos
-        
-        true
-      end
-
-      def using_kerberos?
-        security_protocol == "SASL_PLAINTEXT" || security_protocol == "SASL_SSL"
-      end
-
-      private
-      def check_for_schema_registry_conflicts
-        if @value_deserializer_class != LogStash::Inputs::Kafka::DEFAULT_DESERIALIZER_CLASS
-          raise LogStash::ConfigurationError, 'Option schema_registry_url prohibit the customization of value_deserializer_class'
-        end
-        if @topics_pattern && !@topics_pattern.empty?
-         raise LogStash::ConfigurationError, 'Option schema_registry_url prohibit the customization of topics_pattern'
-        end
-      end
-
-      private
-      def check_for_schema_registry_connectivity_and_subjects
-        options = {}
-        if schema_registry_proxy && !schema_registry_proxy.empty?
-          options[:proxy] = schema_registry_proxy.to_s
-        end
-        if schema_registry_key and !schema_registry_key.empty?
-          options[:auth] = {:user => schema_registry_key, :password => schema_registry_secret.value}
-        end
-        client = Manticore::Client.new(options)
-        begin
-          response = client.get(@schema_registry_url.uri.to_s + '/subjects').body
-        rescue Manticore::ManticoreException => e
-          raise LogStash::ConfigurationError.new("Schema registry service doesn't respond, error: #{e.message}")
-        end
-        registered_subjects = JSON.parse response
-        expected_subjects = @topics.map { |t| "#{t}-value"}
-        if (expected_subjects & registered_subjects).size != expected_subjects.size
-          undefined_topic_subjects = expected_subjects - registered_subjects
-          raise LogStash::ConfigurationError, "The schema registry does not contain definitions for required topic subjects: #{undefined_topic_subjects}"
-        end
-      end
-
-      def split_proxy_into_host_and_port(proxy_uri)
-        return nil unless proxy_uri && !proxy_uri.empty?
-
-        port = proxy_uri.port
-
-        host_spec = ""
-        host_spec << proxy_uri.scheme || "http"
-        host_spec << "://"
-        host_spec << "#{proxy_uri.userinfo}@" if proxy_uri.userinfo
-        host_spec << proxy_uri.host
-
-        [host_spec, port]
-      end
-
-      def check_for_key_and_secret
-        if schema_registry_key and !schema_registry_key.empty?
-          if !schema_registry_secret or schema_registry_secret.value.empty?
-            raise LogStash::ConfigurationError, "Setting `schema_registry_secret` is required when `schema_registry_key` is provided."
-          end
-        end
-      end
-    end
-  end
-end

data/lib/logstash/plugin_mixins/kafka_support.rb

@@ -1,29 +0,0 @@
-module LogStash module PluginMixins module KafkaSupport
-
-  def set_trustore_keystore_config(props)
-    props.put("ssl.truststore.type", ssl_truststore_type) unless ssl_truststore_type.nil?
-    props.put("ssl.truststore.location", ssl_truststore_location) unless ssl_truststore_location.nil?
-    props.put("ssl.truststore.password", ssl_truststore_password.value) unless ssl_truststore_password.nil?
-
-    # Client auth stuff
-    props.put("ssl.keystore.type", ssl_keystore_type) unless ssl_keystore_type.nil?
-    props.put("ssl.key.password", ssl_key_password.value) unless ssl_key_password.nil?
-    props.put("ssl.keystore.location", ssl_keystore_location) unless ssl_keystore_location.nil?
-    props.put("ssl.keystore.password", ssl_keystore_password.value) unless ssl_keystore_password.nil?
-    props.put("ssl.endpoint.identification.algorithm", ssl_endpoint_identification_algorithm) unless ssl_endpoint_identification_algorithm.nil?
-  end
-
-  def set_sasl_config(props)
-    java.lang.System.setProperty("java.security.auth.login.config", jaas_path) unless jaas_path.nil?
-    java.lang.System.setProperty("java.security.krb5.conf", kerberos_config) unless kerberos_config.nil?
-
-    props.put("sasl.mechanism", sasl_mechanism)
-    if sasl_mechanism == "GSSAPI" && sasl_kerberos_service_name.nil?
-      raise LogStash::ConfigurationError, "sasl_kerberos_service_name must be specified when SASL mechanism is GSSAPI"
-    end
-
-    props.put("sasl.kerberos.service.name", sasl_kerberos_service_name) unless sasl_kerberos_service_name.nil?
-    props.put("sasl.jaas.config", sasl_jaas_config) unless sasl_jaas_config.nil?
-  end
-
-end end end