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
3c2287cc
Commit
3c2287cc
authored
Nov 21, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ES requirement
parent
2e2d9400
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
doc/integration/elasticsearch.md
doc/integration/elasticsearch.md
+1
-1
lib/tasks/gitlab/check.rake
lib/tasks/gitlab/check.rake
+4
-5
No files found.
doc/integration/elasticsearch.md
View file @
3c2287cc
...
...
@@ -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
...
...
lib/tasks/gitlab/check.rake
View file @
3c2287cc
...
...
@@ -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? ... "
...
...
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