diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-05 14:35:04 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-05 14:35:04 +0000 |
| commit | 137aebc9b8964d7e413514d0c4f2de62bb525a52 (patch) | |
| tree | 2640728bf74e114583abef61d0a0378efbf4ed97 | |
| parent | b4cddfde913449170742024343c13980d904b72c (diff) | |
| parent | 031f0221a5d42ba2602abe94b7ba5baf38c5f1bc (diff) | |
| download | gitlab-ce-137aebc9b8964d7e413514d0c4f2de62bb525a52.tar.gz | |
Merge branch 'rz_es_update' into 'master'
Docs - Strongly discourage installing ES on the same server as GitLab
See merge request gitlab-org/gitlab-ce!30169
| -rw-r--r-- | doc/integration/elasticsearch.md | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md index 626bd259ed6..1c80fc543af 100644 --- a/doc/integration/elasticsearch.md +++ b/doc/integration/elasticsearch.md @@ -24,18 +24,21 @@ special searches: ## Installing Elasticsearch Elasticsearch is _not_ included in the Omnibus packages. You will have to -install it yourself whether you are using the Omnibus package or installed -GitLab from source. Providing detailed information on installing Elasticsearch -is out of the scope of this document. +[install it yourself](https://www.elastic.co/guide/en/elasticsearch/reference/current/install-elasticsearch.html "Elasticsearch installation documentation") +whether you are using the Omnibus package or installed GitLab from source. +Providing detailed information on installing Elasticsearch is out of the scope +of this document. + +NOTE: **Note:** +Elasticsearch should be installed on a separate server, whether you install +it yourself or by using the +[Amazon Elasticsearch](http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg.html) +service. Running Elasticsearch on the same server as GitLab is not recommended +and it will likely cause performance degradation on the GitLab installation. Once the data is added to the database or repository and [Elasticsearch is enabled in the admin area](#enabling-elasticsearch) the search index will be -updated automatically. Elasticsearch can be installed on the same machine as -GitLab or on a separate server, or you can use the [Amazon Elasticsearch](http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg.html) -service. - -You can follow the steps as described in the [official web site](https://www.elastic.co/guide/en/elasticsearch/reference/current/install-elasticsearch.html "Elasticsearch installation documentation") or -use the packages that are available for your OS. +updated automatically. ## Elasticsearch repository indexer (beta) |