From e761a3cbce80e791cb14f240be9c931ae118e2f3 Mon Sep 17 00:00:00 2001 From: Cas Donoghue Date: Wed, 15 Jan 2025 08:11:46 -0800 Subject: [PATCH] Remove irrelevant warning (#1202) * 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. * Add changelog entry for log removal * 11.22.11 release prep Update version in preparation for a release. --- CHANGELOG.md | 3 +++ lib/logstash/outputs/elasticsearch/http_client/pool.rb | 9 +-------- logstash-output-elasticsearch.gemspec | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19c27494..c9d9ae6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 11.22.11 + - Remove irrelevant log warning about elastic stack version [#1202](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1202) + ## 11.22.10 - Add `x-elastic-product-origin` header to Elasticsearch requests [#1195](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1195) 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", diff --git a/logstash-output-elasticsearch.gemspec b/logstash-output-elasticsearch.gemspec index d2e88631..e8d5f858 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 = '11.22.10' + s.version = '11.22.11' 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"