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
da4a9b70
Commit
da4a9b70
authored
Oct 20, 2020
by
Dylan Griffith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Document support for ES 6.x is deprecated
parent
ca70733e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
changelogs/unreleased/deprecate-support-for-es6.yml
changelogs/unreleased/deprecate-support-for-es6.yml
+5
-0
doc/integration/elasticsearch.md
doc/integration/elasticsearch.md
+2
-1
ee/lib/system_check/app/elasticsearch_check.rb
ee/lib/system_check/app/elasticsearch_check.rb
+1
-1
No files found.
changelogs/unreleased/deprecate-support-for-es6.yml
0 → 100644
View file @
da4a9b70
---
title
:
Deprecate support for Elasticsearch 6.x
merge_request
:
45619
author
:
type
:
deprecated
doc/integration/elasticsearch.md
View file @
da4a9b70
...
...
@@ -23,7 +23,8 @@ and the advantage of the following special searches:
| GitLab version | Elasticsearch version |
|---------------------------------------------|-------------------------------|
| GitLab Enterprise Edition 12.7 or greater | Elasticsearch 6.x through 7.x |
| GitLab Enterprise Edition 13.6 or greater | Elasticsearch 7.x (6.x deprecated to be removed in 13.8) |
| GitLab Enterprise Edition 12.7 through 13.5 | Elasticsearch 6.x through 7.x |
| GitLab Enterprise Edition 11.5 through 12.6 | Elasticsearch 5.6 through 6.x |
| GitLab Enterprise Edition 9.0 through 11.4 | Elasticsearch 5.1 through 5.5 |
| GitLab Enterprise Edition 8.4 through 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 |
...
...
ee/lib/system_check/app/elasticsearch_check.rb
View file @
da4a9b70
...
...
@@ -3,7 +3,7 @@
module
SystemCheck
module
App
class
ElasticsearchCheck
<
SystemCheck
::
BaseCheck
set_name
'Elasticsearch version
6.x - 7.x
?'
set_name
'Elasticsearch version
7.x (6.x deprecated to be removed in 13.8)
?'
set_skip_reason
'skipped (elasticsearch is disabled)'
set_check_pass
->
{
"yes (
#{
self
.
current_version
}
)"
}
set_check_fail
->
{
"no (
#{
self
.
current_version
}
)"
}
...
...
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