summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-07-16 07:22:59 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-07-16 07:22:59 +0000
commit942ea3cef3fe0781be567abb27d9985d6ffb1ce7 (patch)
tree42bf5f34b86e82227710bbeaa896f5acea3dc7e4
parent5e0949bc918b82bd3f9d7fa0579e0f71d842c0b6 (diff)
parent42f34f419c8bfe094ab382127e10b3627fa1acff (diff)
downloadgitlab-ce-942ea3cef3fe0781be567abb27d9985d6ffb1ce7.tar.gz
Merge branch 'docs-update-ES-indexer-omnibus' into 'master'
Update ES indexer docs for Omnibus users Closes #63207 See merge request gitlab-org/gitlab-ce!29731
-rw-r--r--doc/integration/elasticsearch.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index fff06254da7..20caac4cb74 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -42,7 +42,11 @@ use the packages that are available for your OS.
In order to improve elasticsearch indexing performance, GitLab has made available a [new indexer written in Go](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer).
This will replace the included Ruby indexer in the future but should be considered beta software for now, so there may be some bugs.
-If you would like to use it, please follow the instructions below.
+The Elasticsearch Go indexer is included in Omnibus for GitLab 11.8 and newer.
+
+To use the new Elasticsearch indexer included in Omnibus, check the box "Use the new repository indexer (beta)" when [enabling the Elasticsearch integration](#enabling-elasticsearch).
+
+If you would like to use the Elasticsearch Go indexer with a source installation or an older version of GitLab, please follow the instructions below.
### Installation