Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 12.0.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's also version bump logstash-output-elasticsearch.gemspec too.
Or are you going to absorb this into #1199?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking of releasing both in 12.0.1 as well as backporting to 11. I'll wait to merge this until i've got a clear path. Thanks.

- 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:
Expand Down
9 changes: 1 addition & 8 deletions lib/logstash/outputs/elasticsearch/http_client/pool.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down