Commit 3c2287cc authored by Valery Sizov's avatar Valery Sizov

Update ES requirement

parent 2e2d9400
......@@ -31,7 +31,7 @@ is installed or on a separate server.
These are the minimum requirements needed for Elasticsearch to work:
- GitLab 8.4+
- Elasticsearch 2.4+ (with [Delete By Query Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/plugins-delete-by-query.html) installed)
- Elasticsearch 2.4.x (with [Delete By Query Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/plugins-delete-by-query.html) installed)
## Install Elasticsearch
......
......@@ -1007,15 +1007,14 @@ namespace :gitlab do
client = Elasticsearch::Client.new(host: ApplicationSetting.current.elasticsearch_host,
port: ApplicationSetting.current.elasticsearch_port)
print "Elasticsearch version >= 2.4? ... "
print "Elasticsearch version 2.4.x? ... "
version = client.info["version"]["number"]
version = Gitlab::VersionInfo.parse(client.info["version"]["number"])
# The version is greater or equal to 2.4.0
if Gitlab::VersionInfo.parse(version) >= Gitlab::VersionInfo.new(2, 4, 0)
if version.major == 2 && version.minor == 4
puts "yes (#{version})".color(:green)
else
puts "no".color(:red)
puts "no, you have #{version}".color(:red)
end
print "Elasticsearch has plugin delete-by-query installed? ... "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment