From 92f9ca94f79d33e3eeea82df0299a2045318bdc5 Mon Sep 17 00:00:00 2001 From: donoghuc Date: Wed, 8 Jan 2025 10:29:08 -0800 Subject: [PATCH 1/3] Remove irrelevant warning This commit removes an old warning which is no longer relevant to any supported stack version. It is noisy and there is no action for the user to take. --- lib/logstash/outputs/elasticsearch/http_client/pool.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/logstash/outputs/elasticsearch/http_client/pool.rb b/lib/logstash/outputs/elasticsearch/http_client/pool.rb index fb3194cc..68715066 100644 --- a/lib/logstash/outputs/elasticsearch/http_client/pool.rb +++ b/lib/logstash/outputs/elasticsearch/http_client/pool.rb @@ -515,20 +515,13 @@ def set_last_es_version(version, url) major = major_version(version) if @maximum_seen_major_version.nil? @logger.info("Elasticsearch version determined (#{version})", es_version: major) - set_maximum_seen_major_version(major) + @maximum_seen_major_version = major elsif major > @maximum_seen_major_version warn_on_higher_major_version(major, url) @maximum_seen_major_version = major end end - def set_maximum_seen_major_version(major) - if major >= 6 - @logger.warn("Detected a 6.x and above cluster: the `type` event field won't be used to determine the document _type", es_version: major) - end - @maximum_seen_major_version = major - end - def warn_on_higher_major_version(major, url) @logger.warn("Detected a node with a higher major version than previously observed, " + "this could be the result of an Elasticsearch cluster upgrade", From 518c76ed1a0c3b5f0f88b54100ce75a3c5839577 Mon Sep 17 00:00:00 2001 From: donoghuc Date: Wed, 8 Jan 2025 10:32:26 -0800 Subject: [PATCH 2/3] Add changelog entry for log removal --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdcdff6d..06d1cb1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 12.0.1 + - Remove irrelevant log warning about elastic stack version [#1200](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1200) + ## 12.0.0 - SSL settings that were marked deprecated in version `11.14.0` are now marked obsolete, and will prevent the plugin from starting. - These settings are: From 9f56cba9cfa0c79333d7d66d305e3c4267a7cc62 Mon Sep 17 00:00:00 2001 From: donoghuc Date: Mon, 13 Jan 2025 14:33:51 -0800 Subject: [PATCH 3/3] 12.0.1 release prep Update version in preparation for a release. --- logstash-output-elasticsearch.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash-output-elasticsearch.gemspec b/logstash-output-elasticsearch.gemspec index 8c6ef259..090b1064 100644 --- a/logstash-output-elasticsearch.gemspec +++ b/logstash-output-elasticsearch.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'logstash-output-elasticsearch' - s.version = '12.0.0' + s.version = '12.0.1' s.licenses = ['apache-2.0'] s.summary = "Stores logs in Elasticsearch" s.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 gemname. This gem is not a stand-alone program"