logstash-filter-elastic_integration 0.1.3-java → 0.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21430d0dc0a98cf6eadc3506b166ef28713b76057ab45596f7719dc42b0a1db6
-  data.tar.gz: a90a57659855a7974e6bc59febbe79c33956bbd17c510d00d03598c296e441fb
+  metadata.gz: 9db076bb6985c6d16b373849fda75131b07b47be67a1fdf60df0a09241c09547
+  data.tar.gz: 8da7403123c739e0ca0a69c1b2e3886edbd8f4e92fcce09f06b1f3f416e42903
 SHA512:
-  metadata.gz: 87d72010a17fe6e4ef6424c0eec2de9abb71674dac5ae4084a1192de117ae2a5bcf7b02adde7dc0b5401befc5b2ecabb4bcbe0e59c78b9093e20839bd8ec1cbd
-  data.tar.gz: 1d62d9527b95f4a51a32617781a8655461ad399e6c59ab5d5bc58afc1bf62aa86ba98aaa1811379aeff1b8b3a03fe01e9f6eef0d817f071ca418fffed6c3df18
+  metadata.gz: 1fdf95f7a102886ae6a7d063a3522077d60e1f7474060d6cf451e7206256e4a1f29737d663f5e734309c334f59a93b863ad016cb7424986a117c41dc3a3ff7c2
+  data.tar.gz: 3412852bd919051ec1e73486b960ea99da4fde1d75d0d2de036a162efba477d6088b8ee27d9260253658c3b0bd52ccf4fc7103fdc53291a6e3033526d4520601

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/lib/logstash/filters/elastic_integration/jar_dependencies.rb

@@ -8,4 +8,4 @@
 ########################################################################
 
 require 'jar_dependencies'
-require_jar('co.elastic.logstash.plugins.filter.elasticintegration', 'logstash-filter-elastic_integration', '0.1.3')
+require_jar('co/elastic', 'logstash-filter-elastic_integration', '0.1.5')

data/lib/logstash/filters/elastic_integration/version.rb

@@ -0,0 +1,10 @@
+# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
+
+########################################################################
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V.
+# under one or more contributor license agreements. Licensed under the
+# Elastic License 2.0; you may not use this file except in compliance
+# with the Elastic License 2.0.
+########################################################################
+
+LogStash::Filters::ElasticIntegration::VERSION='0.1.5'

data/lib/logstash/filters/elastic_integration.rb

@@ -20,6 +20,9 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   HTTPS_PROTOCOL = "https".freeze
   ELASTIC_API_VERSION = "2023-10-31".freeze
 
+  require_relative "elastic_integration/version"
+  USER_AGENT_HEADER_VALUE = "Logstash/v#{LOGSTASH_VERSION} (ElasticIntegration/v#{VERSION})"
+
   # Sets the host(s) of the remote instance. If given an array it will load balance
   # requests across the hosts specified in the `hosts` parameter. Hosts can be any of
   # the forms:
@@ -337,24 +340,27 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   end
 
   def initialize_elasticsearch_rest_client!
-    java_import('co.elastic.logstash.filters.elasticintegration.ElasticsearchRestClientBuilder')
-    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
-
     config = extract_immutable_config
-    @elasticsearch_rest_client = ElasticsearchRestClientBuilder.fromPluginConfiguration(config)
-                                                               .map(&:build)
-                                                               .orElseThrow() # todo: ruby/java bridge better exception
+    @elasticsearch_rest_client = _elasticsearch_rest_client(config)
 
     if serverless?
-      @elasticsearch_rest_client = ElasticsearchRestClientBuilder.fromPluginConfiguration(config)
-                                                                 .map do |builder|
-                                                                    builder.configureElasticApi { |elasticApi| elasticApi.setApiVersion(ELASTIC_API_VERSION) }
-                                                                  end
-                                                                 .map(&:build)
-                                                                 .orElseThrow()
+      @elasticsearch_rest_client = _elasticsearch_rest_client(config) do |builder|
+                                    builder.configureElasticApi { |elasticApi| elasticApi.setApiVersion(ELASTIC_API_VERSION) }
+                                  end
     end
   end
 
+  def _elasticsearch_rest_client(config, &builder_interceptor)
+    java_import('co.elastic.logstash.filters.elasticintegration.ElasticsearchRestClientBuilder')
+    java_import('java.util.function.Function')
+
+    ElasticsearchRestClientBuilder.fromPluginConfiguration(config)
+                                  .map { |builder| builder.setUserAgentHeaderValue(USER_AGENT_HEADER_VALUE) }
+                                  .map(&(builder_interceptor || Function::identity.method(:apply)))
+                                  .map(&:build)
+                                  .orElseThrow() # todo: ruby/java bridge better exception
+  end
+
   def initialize_event_processor!
     java_import('co.elastic.logstash.filters.elasticintegration.EventProcessorBuilder')
     java_import('co.elastic.logstash.filters.elasticintegration.geoip.GeoIpProcessorFactory')
@@ -368,13 +374,12 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   end
 
   def perform_preflight_check!
-    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
-
     check_user_privileges!
     check_es_cluster_license!
   end
 
   def check_user_privileges!
+    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
     PreflightCheck.new(@elasticsearch_rest_client).checkUserPrivileges
   rescue => e
     security_error_message = "no handler found for uri [/_security/user/_has_privileges]"
@@ -398,12 +403,14 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   end
 
   def check_es_cluster_license!
+    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
     PreflightCheck.new(@elasticsearch_rest_client).checkLicense
   rescue => e
     raise_config_error!(e.message)
   end
 
   def serverless?
+    java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
     PreflightCheck.new(@elasticsearch_rest_client).isServerless
   rescue => e
     raise_config_error!(e.message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-elastic_integration
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -73,8 +73,9 @@ files:
 - lib/logstash/filters/elastic_integration/event_api_bridge.rb
 - lib/logstash/filters/elastic_integration/geoip_database_provider_bridge.rb
 - lib/logstash/filters/elastic_integration/jar_dependencies.rb
+- lib/logstash/filters/elastic_integration/version.rb
 - logstash-filter-elastic_integration.gemspec
-- vendor/jar-dependencies/co/elastic/logstash/plugins/filter/elasticintegration/logstash-filter-elastic_integration/0.1.3/logstash-filter-elastic_integration-0.1.3.jar
+- vendor/jar-dependencies/co/elastic/logstash-filter-elastic_integration/0.1.5/logstash-filter-elastic_integration-0.1.5.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - ELv2