logstash-filter-elastic_integration 8.16.0-java → 8.16.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386e478b65374b4ef5fc793762bea600f6f05898af007fc64a7a7253b166f254
-  data.tar.gz: b794a6b3bf69c89a3beec2f989e8c64148ed29561eff50dd811db952c50c4264
+  metadata.gz: 9f35223224df1e39071c86969881c8e06f9d6c024c227fc4e1f2f8a171bd4640
+  data.tar.gz: a0a629d13474d8d78eb063ecca3bbc905b4db0f88d32128932db43ab88150b41
 SHA512:
-  metadata.gz: fe601071ec2491bdb350d158afd3cea73c983831bbc637517bcd248db5866e2e9c761c8863557caa5443d27e09880a9077d15998e56b7f077ffc4e0ed2674272
-  data.tar.gz: a3621062e2210e8188ea7d3ed216aabe072466780e001f94e3c55d314ea96a14d319a0023c2483e1fb7675d1ee8fa9fe921052c4aa5b2b904293e2fff7df4325
+  metadata.gz: 563d95a8916e0310b6804a2fae2479fa45078f41d5865d2ea86428d2b9d751068150e40eae0c6db9de704f63bce11bb7f3b11006825ae2cfa4535218a87b2c83
+  data.tar.gz: d959f8fde8a7675e726922a126d6e0c40ca59e4bdd65e181b927a795a6bd4fc4df79a0fd15bb705c081d67ca1faf534b9c5141310b42c21a45905ccf6a6c6ce2

data/VERSION

@@ -1 +1 @@
-8.16.0
+8.16.1

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.16.0')
+require_jar('co/elastic', 'logstash-filter-elastic_integration', '8.16.1')

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

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

data/lib/logstash/filters/elastic_integration.rb

@@ -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.16.0
+  version: 8.16.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-01-28 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.16.0/logstash-filter-elastic_integration-8.16.0.jar
+- vendor/jar-dependencies/co/elastic/logstash-filter-elastic_integration/8.16.1/logstash-filter-elastic_integration-8.16.1.jar
 homepage: https://www.elastic.co/logstash
 licenses:
 - ELv2