Commit 47a22919 authored by Nick Thomas's avatar Nick Thomas

Support Elasticsearch v5.1 - v5.5

parent f493f885
...@@ -65,13 +65,13 @@ stages: ...@@ -65,13 +65,13 @@ stages:
services: services:
- postgres:9.2 - postgres:9.2
- redis:alpine - redis:alpine
- docker.elastic.co/elasticsearch/elasticsearch:5.3.2 - docker.elastic.co/elasticsearch/elasticsearch:5.5.2
.use-mysql: &use-mysql .use-mysql: &use-mysql
services: services:
- mysql:latest - mysql:latest
- redis:alpine - redis:alpine
- docker.elastic.co/elasticsearch/elasticsearch:5.3.2 - docker.elastic.co/elasticsearch/elasticsearch:5.5.2
.only-if-want-mysql: &only-if-want-mysql .only-if-want-mysql: &only-if-want-mysql
......
---
title: Support Elasticsearch v5.1 - v5.5
merge_request: 2751
author:
type: changed
...@@ -17,7 +17,7 @@ special searches: ...@@ -17,7 +17,7 @@ special searches:
| GitLab version | Elasticsearch version | | GitLab version | Elasticsearch version |
| -------------- | --------------------- | | -------------- | --------------------- |
| GitLab Enterprise Edition 8.4 - 8.17 | Elasticsearch 2.4 with [Delete By Query Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/plugins-delete-by-query.html) installed | | GitLab Enterprise Edition 8.4 - 8.17 | Elasticsearch 2.4 with [Delete By Query Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/plugins-delete-by-query.html) installed |
| GitLab Enterprise Edition 9.0+ | Elasticsearch 5.1 - 5.3 | | GitLab Enterprise Edition 9.0+ | Elasticsearch 5.1 - 5.5 |
## Installing Elasticsearch ## Installing Elasticsearch
......
module SystemCheck module SystemCheck
module App module App
class ElasticsearchCheck < SystemCheck::BaseCheck class ElasticsearchCheck < SystemCheck::BaseCheck
set_name 'Elasticsearch version 5.1 - 5.3?' set_name 'Elasticsearch version 5.1 - 5.5?'
set_skip_reason 'skipped (elasticsearch is disabled)' set_skip_reason 'skipped (elasticsearch is disabled)'
set_check_pass -> { "yes (#{self.current_version})" } set_check_pass -> { "yes (#{self.current_version})" }
set_check_fail -> { "no (#{self.current_version})" } set_check_fail -> { "no (#{self.current_version})" }
...@@ -18,7 +18,7 @@ module SystemCheck ...@@ -18,7 +18,7 @@ module SystemCheck
end end
def check? def check?
self.class.current_version.major == 5 && (1..3).cover?(self.class.current_version.minor) self.class.current_version.major == 5 && (1..5).cover?(self.class.current_version.minor)
end end
def show_error def show_error
......
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