Skip to content
Snippets Groups Projects
Unverified Commit 06f97909 authored by Vyr Cossont's avatar Vyr Cossont Committed by GitHub
Browse files

Check OpenSearch compatibility version instead of regular version (#22422)

Fixes #18535.
parent ce74991b
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,14 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
def message
if running_version.present?
Admin::SystemCheck::Message.new(:elasticsearch_version_check, I18n.t('admin.system_checks.elasticsearch_version_check.version_comparison', running_version: running_version, required_version: required_version))
Admin::SystemCheck::Message.new(
:elasticsearch_version_check,
I18n.t(
'admin.system_checks.elasticsearch_version_check.version_comparison',
running_version: running_version,
required_version: required_version
)
)
else
Admin::SystemCheck::Message.new(:elasticsearch_running_check)
end
......@@ -23,7 +30,8 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
def running_version
@running_version ||= begin
Chewy.client.info['version']['number']
Chewy.client.info['version']['minimum_wire_compatibility_version'] ||
Chewy.client.info['version']['number']
rescue Faraday::ConnectionFailed
nil
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment