Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
47a22919
Commit
47a22919
authored
Aug 23, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support Elasticsearch v5.1 - v5.5
parent
f493f885
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
.gitlab-ci.yml
.gitlab-ci.yml
+2
-2
changelogs/unreleased-ee/es-5-5.yml
changelogs/unreleased-ee/es-5-5.yml
+5
-0
doc/integration/elasticsearch.md
doc/integration/elasticsearch.md
+1
-1
lib/system_check/app/elasticsearch_check.rb
lib/system_check/app/elasticsearch_check.rb
+2
-2
No files found.
.gitlab-ci.yml
View file @
47a22919
...
...
@@ -65,13 +65,13 @@ stages:
services
:
-
postgres:9.2
-
redis:alpine
-
docker.elastic.co/elasticsearch/elasticsearch:5.
3
.2
-
docker.elastic.co/elasticsearch/elasticsearch:5.
5
.2
.use-mysql
:
&use-mysql
services
:
-
mysql:latest
-
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
...
...
changelogs/unreleased-ee/es-5-5.yml
0 → 100644
View file @
47a22919
---
title
:
Support Elasticsearch v5.1 - v5.5
merge_request
:
2751
author
:
type
:
changed
doc/integration/elasticsearch.md
View file @
47a22919
...
...
@@ -17,7 +17,7 @@ special searches:
| 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 9.0+ | Elasticsearch 5.1 - 5.
3
|
| GitLab Enterprise Edition 9.0+ | Elasticsearch 5.1 - 5.
5
|
## Installing Elasticsearch
...
...
lib/system_check/app/elasticsearch_check.rb
View file @
47a22919
module
SystemCheck
module
App
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_check_pass
->
{
"yes (
#{
self
.
current_version
}
)"
}
set_check_fail
->
{
"no (
#{
self
.
current_version
}
)"
}
...
...
@@ -18,7 +18,7 @@ module SystemCheck
end
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
def
show_error
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment