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
c586d248
Commit
c586d248
authored
Jan 15, 2020
by
Dylan Griffith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Docs and system checks for Elasticsearch version compatibility
parent
e0a75d85
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
doc/integration/elasticsearch.md
doc/integration/elasticsearch.md
+3
-2
ee/lib/system_check/app/elasticsearch_check.rb
ee/lib/system_check/app/elasticsearch_check.rb
+2
-2
ee/spec/lib/system_check/app/elasticsearch_check_spec.rb
ee/spec/lib/system_check/app/elasticsearch_check_spec.rb
+5
-4
No files found.
doc/integration/elasticsearch.md
View file @
c586d248
...
@@ -19,7 +19,8 @@ special searches:
...
@@ -19,7 +19,8 @@ special searches:
| -------------- | --------------------- |
| -------------- | --------------------- |
| 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 - 11.4 | Elasticsearch 5.1 - 5.5 |
| GitLab Enterprise Edition 9.0 - 11.4 | Elasticsearch 5.1 - 5.5 |
| GitLab Enterprise Edition 11.5+ | Elasticsearch 5.6 - 6.x |
| GitLab Enterprise Edition 11.5 - 12.6 | Elasticsearch 5.6 - 6.x |
| GitLab Enterprise Edition 12.7+ | Elasticsearch 6.x - 7.x |
## Installing Elasticsearch
## Installing Elasticsearch
...
...
ee/lib/system_check/app/elasticsearch_check.rb
View file @
c586d248
...
@@ -21,10 +21,10 @@ module SystemCheck
...
@@ -21,10 +21,10 @@ module SystemCheck
def
check?
def
check?
case
self
.
class
.
current_version
.
major
case
self
.
class
.
current_version
.
major
when
5
!
(
1
..
5
).
cover?
(
self
.
class
.
current_version
.
minor
)
when
6
when
6
true
true
when
7
true
else
else
false
false
end
end
...
...
ee/spec/lib/system_check/app/elasticsearch_check_spec.rb
View file @
c586d248
...
@@ -32,11 +32,12 @@ describe SystemCheck::App::ElasticsearchCheck do
...
@@ -32,11 +32,12 @@ describe SystemCheck::App::ElasticsearchCheck do
where
(
:version
,
:result
)
do
where
(
:version
,
:result
)
do
'2.3.0'
|
false
'2.3.0'
|
false
'5.3.1'
|
false
'5.3.1'
|
false
'5.6.0'
|
tru
e
'5.6.0'
|
fals
e
'5.6.6'
|
tru
e
'5.6.6'
|
fals
e
'6.0.0'
|
true
'6.0.0'
|
true
'6.3.4'
|
true
'6.4.2'
|
true
'7.1.0'
|
false
'7.1.0'
|
true
'7.5.1'
|
true
end
end
with_them
do
with_them
do
...
...
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