logstash-filter-elastic_integration 8.17.0-java → 9.0.0.prerelease01-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a573be36ffb3dcbedb2b5fcad10a996f48f5382502704bb3b34b011161e8ec1d
-  data.tar.gz: c01bc40b553158df6d5f4e2b87718646c7a287cbea44766a357e50d6870a9406
+  metadata.gz: '0489a4cef4db59e9827d5e18923051d17e631f751871c278e7430ff3b606f433'
+  data.tar.gz: ed2a4fd874e0f8bbfe2cb8e9f16f43ebe3efcdae7ab70c76efd6d1cc376feea2
 SHA512:
-  metadata.gz: e48d0384d2f2db3bb7eae70e3e5eadab39f49c80d557fd079fa2a56972cc4ccab80ae741545b581d94ec2f3577c6319c12ed8d7823f6eb326e1cee6efead1e2a
-  data.tar.gz: 24c87ed71cc21f629b75a46eb074fcab6ebe15b27d9f360a126dfd864ac617be57a7c7371f4717feb0602f66dd5c5dd754252bac783fdd3230384f4e92199dff
+  metadata.gz: 0b3d15e6128d02d13859e1cc4306f918b7f0084f3ebdbbfcd81dae5f697ef0226edb373f8147b20af447b1e1e642b3f3a7aa46611f5eb4ee03e241c52a139b62
+  data.tar.gz: 75808874aca215b4b3c40c17cb9f5965038b4b41901b218ab16c0a47b0b36f55b95a151afb1c302e57384a703651db7058d83cb548cb177c0109b623228b1b76

data/VERSION

@@ -1 +1 @@
-8.17.0
+9.0.0.prerelease01

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

@@ -8,4 +8,4 @@
 ########################################################################
 
 require 'jar_dependencies'
-require_jar('co/elastic', 'logstash-filter-elastic_integration', '8.17.0')
+require_jar('co/elastic', 'logstash-filter-elastic_integration', '9.0.0.prerelease01')

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

@@ -7,4 +7,4 @@
 # with the Elastic License 2.0.
 ########################################################################
 
-LogStash::Filters::ElasticIntegration::VERSION='8.17.0'
+LogStash::Filters::ElasticIntegration::VERSION='9.0.0.prerelease01'

data/lib/logstash/filters/elastic_integration.rb

@@ -105,7 +105,7 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   # is not encumbered by those dependencies.
   def initialize(*a, &b)
     ensure_complete_logstash!
-    ensure_java_major_version!(17)
+    ensure_java_major_version!(21)
 
     require_relative "elastic_integration/jar_dependencies"
     require_relative "elastic_integration/event_api_bridge"
@@ -135,6 +135,7 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
     initialize_event_processor!
 
     perform_preflight_check!
+    check_versions_alignment
   end # def register
 
   def filter(event)
@@ -345,8 +346,8 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
 
     if serverless?
       @elasticsearch_rest_client = _elasticsearch_rest_client(config) do |builder|
-                                    builder.configureElasticApi { |elasticApi| elasticApi.setApiVersion(ELASTIC_API_VERSION) }
-                                  end
+        builder.configureElasticApi { |elasticApi| elasticApi.setApiVersion(ELASTIC_API_VERSION) }
+      end
     end
   end
 
@@ -374,13 +375,24 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
   end
 
   def perform_preflight_check!
+    connected_es_version_info
     check_user_privileges!
     check_es_cluster_license!
   end
 
-  def check_user_privileges!
+  def preflight_check_instance
     java_import('co.elastic.logstash.filters.elasticintegration.PreflightCheck')
-    PreflightCheck.new(@elasticsearch_rest_client).checkUserPrivileges
+    @preflight_check ||= PreflightCheck.new(@elasticsearch_rest_client)
+  end
+
+  def connected_es_version_info
+    @connected_es_version_info ||= preflight_check_instance.getElasticsearchVersionInfo
+  rescue => e
+    raise_config_error!(e.message)
+  end
+
+  def check_user_privileges!
+    preflight_check_instance.checkUserPrivileges
   rescue => e
     security_error_message = "no handler found for uri [/_security/user/_has_privileges]"
     if e.message.include?(security_error_message)
@@ -403,17 +415,13 @@ 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
+    preflight_check_instance.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)
+    connected_es_version_info["build_flavor"] == 'serverless'
   end
 
   ##
@@ -454,4 +462,44 @@ class LogStash::Filters::ElasticIntegration < LogStash::Filters::Base
       ERR
     end
   end
+
+  ##
+  # compares the current plugin version with the Elasticsearch version connected to
+  # generates a warning or info message based on the situation where the plugin is ahead or behind of the connected Elasticsearch
+  def check_versions_alignment
+    plugin_major_version, plugin_minor_version = VERSION.split('.').map(&:to_i)
+    es_major_version, es_minor_version = connected_es_version_info["number"].split('.').first(2).map(&:to_i)
+
+    logger.info("This #{VERSION} version of plugin embedded Ingest node components from Elasticsearch #{plugin_major_version}.#{plugin_minor_version}")
+
+    es_full_version = connected_es_version_info["number"]
+
+    if es_major_version > plugin_major_version
+      logger.warn "This plugin v#{VERSION} is connected to a newer MAJOR " +
+                    "version of Elasticsearch v#{es_full_version}, and may " +
+                    "have trouble loading or running pipelines that use new " +
+                    "features; for the best experience, update this plugin " +
+                    "to at least v#{es_major_version}.#{es_minor_version}."
+    elsif es_major_version < plugin_major_version
+      logger.warn "This plugin v#{VERSION} is connected to an older MAJOR " +
+                    "version of Elasticsearch v#{es_full_version}, and may " +
+                    "have trouble loading or running pipelines that use " +
+                    "features that were deprecated before Elasticsearch " +
+                    "v#{plugin_major_version}.0; for the best experience, " +
+                    "align major/minor versions across the Elastic Stack."
+    elsif es_minor_version > plugin_minor_version
+      logger.warn "This plugin v#{VERSION} is connected to a newer MINOR " +
+                    "version of Elasticsearch v#{es_full_version}, and may " +
+                    "have trouble loading or running pipelines that use new " +
+                    "features; for the best experience, update this plugin to " +
+                    "at least v#{es_major_version}.#{es_minor_version}."
+    elsif es_minor_version < plugin_minor_version
+      logger.info "This plugin v#{VERSION} is connected to an older MINOR " +
+                    "version of Elasticsearch v#{es_full_version}; for the best experience, " +
+                    "align major/minor versions across the Elastic Stack."
+    else
+      logger.debug "This plugin v#{VERSION} is connected to the same MAJOR/MINOR " +
+                     "version of Elasticsearch v#{es_full_version}."
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-elastic_integration
 version: !ruby/object:Gem::Version
-  version: 8.17.0
+  version: 9.0.0.prerelease01
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ files:
 - 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-filter-elastic_integration/8.17.0/logstash-filter-elastic_integration-8.17.0.jar
+- vendor/jar-dependencies/co/elastic/logstash-filter-elastic_integration/9.0.0.prerelease01/logstash-filter-elastic_integration-9.0.0.prerelease01.jar
 homepage: https://www.elastic.co/logstash
 licenses:
 - ELv2
@@ -98,9 +98,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.26
 signing_key: