Merge branch 'small-s-in-elasticsearch' into 'master'
Fix typo in docs about Elasticsearch See merge request gitlab-org/gitlab-ce!30162
This commit is contained in:
Evan Read
commit
276038c2f7
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix typo in docs about Elasticsearch
|
||||
merge_request: 30162
|
||||
author: Takuya Noguchi
|
||||
type: other
|
||||
|
|
@ -48,7 +48,7 @@ used by Omnibus and the GitLab source installation guide.
|
|||
Starting with GitLab 11.4, Gitaly is able to serve all Git requests without
|
||||
needed a shared NFS mount for Git repository data.
|
||||
Between 11.4 and 11.8 the exception was the
|
||||
[Elastic Search indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer).
|
||||
[Elasticsearch indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer).
|
||||
But since 11.8 the indexer uses Gitaly for data access as well. NFS can still
|
||||
be leveraged for redudancy on block level of the Git data. But only has to
|
||||
be mounted on the Gitaly server.
|
||||
|
|
|
|||
|
|
@ -93,8 +93,8 @@ graph TB
|
|||
Prometheus --> Alertmanager
|
||||
Migrations --> PostgreSQL
|
||||
Runner -- TCP 443 --> NGINX
|
||||
Unicorn -- TCP 9200 --> ElasticSearch
|
||||
Sidekiq -- TCP 9200 --> ElasticSearch
|
||||
Unicorn -- TCP 9200 --> Elasticsearch
|
||||
Sidekiq -- TCP 9200 --> Elasticsearch
|
||||
Sidekiq -- TCP 80, 443 --> Sentry
|
||||
Unicorn -- TCP 80, 443 --> Sentry
|
||||
Sidekiq -- UDP 6831 --> Jaeger
|
||||
|
|
@ -158,7 +158,7 @@ Component statuses are linked to configuration documentation for each component.
|
|||
| [LDAP Authentication](#ldap-authentication) | Authenticate users against centralized LDAP directory | [⤓][ldap-omnibus] | [⤓][ldap-charts] | [⤓][ldap-charts] | [❌](https://about.gitlab.com/pricing/#gitlab-com) | [⤓][gitlab-yml] | [⤓][ldap-gdk] | CE & EE |
|
||||
| [Outbound email (SMTP)](#outbound-email) | Send email messages to users | [⤓][outbound-email-omnibus] | [⤓][outbound-email-charts] | [⤓][outbound-email-charts] | [✅](../user/gitlab_com/index.md#mail-configuration) | [⤓][gitlab-yml] | [⤓][gitlab-yml] | CE & EE |
|
||||
| [Inbound email (SMTP)](#inbound-email) | Receive messages to update issues | [⤓][inbound-email-omnibus] | [⤓][inbound-email-charts] | [⤓][inbound-email-charts] | [✅](../user/gitlab_com/index.md#mail-configuration) | [⤓][gitlab-yml] | [⤓][gitlab-yml] | CE & EE |
|
||||
| [ElasticSearch](#elasticsearch) | Improved search within GitLab | [⤓][elasticsearch-omnibus] | [⤓][elasticsearch-charts] | [⤓][elasticsearch-charts] | [❌](https://gitlab.com/groups/gitlab-org/-/epics/153) | [⤓][elasticsearch-source] | [⤓][elasticsearch-gdk] | EE Only |
|
||||
| [Elasticsearch](#elasticsearch) | Improved search within GitLab | [⤓][elasticsearch-omnibus] | [⤓][elasticsearch-charts] | [⤓][elasticsearch-charts] | [❌](https://gitlab.com/groups/gitlab-org/-/epics/153) | [⤓][elasticsearch-source] | [⤓][elasticsearch-gdk] | EE Only |
|
||||
| [Sentry integration](#sentry) | Error tracking for deployed apps | [⤓][sentry-integration] | [⤓][sentry-integration] | [⤓][sentry-integration] | [⤓][sentry-integration] | [⤓][sentry-integration] | [⤓][sentry-integration] | CE & EE |
|
||||
| [Jaeger integration](#jaeger) | Distributed tracing for deployed apps | [⤓][jaeger-integration] | [⤓][jaeger-integration] | [⤓][jaeger-integration] | [⤓][jaeger-integration] | [⤓][jaeger-integration] | [⤓][jaeger-integration] | EE Only |
|
||||
| [GitLab Managed Apps](#gitlab-managed-apps) | Deploy [Helm](https://docs.helm.sh/), [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/), [Cert-Manager](https://docs.cert-manager.io/en/latest/), [Prometheus](https://prometheus.io/docs/introduction/overview/), a [Runner](https://docs.gitlab.com/runner/), [JupyterHub](http://jupyter.org/), [Knative](https://cloud.google.com/knative) to a cluster | [⤓][managed-k8s-apps] | [⤓][managed-k8s-apps] | [⤓][managed-k8s-apps] | [⤓][managed-k8s-apps] | [⤓][managed-k8s-apps] | [⤓][managed-k8s-apps] | CE & EE |
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
This area is to maintain a compendium of useful information when working with elasticsearch.
|
||||
|
||||
Information on how to enable ElasticSearch and perform the initial indexing is kept in ../integration/elasticsearch.md#enabling-elasticsearch
|
||||
Information on how to enable Elasticsearch and perform the initial indexing is kept in ../integration/elasticsearch.md#enabling-elasticsearch
|
||||
|
||||
## Deep Dive
|
||||
|
||||
In June 2019, Mario de la Ossa hosted a [Deep Dive] on GitLab's [ElasticSearch integration] to share his domain specific knowledge with anyone who may work in this part of the code base in the future. You can find the [recording on YouTube], and the slides on [Google Slides] and in [PDF]. Everything covered in this deep dive was accurate as of GitLab 12.0, and while specific details may have changed since then, it should still serve as a good introduction.
|
||||
In June 2019, Mario de la Ossa hosted a [Deep Dive] on GitLab's [Elasticsearch integration] to share his domain specific knowledge with anyone who may work in this part of the code base in the future. You can find the [recording on YouTube], and the slides on [Google Slides] and in [PDF]. Everything covered in this deep dive was accurate as of GitLab 12.0, and while specific details may have changed since then, it should still serve as a good introduction.
|
||||
|
||||
[Deep Dive]: https://gitlab.com/gitlab-org/create-stage/issues/1
|
||||
[ElasticSearch integration]: ../integration/elasticsearch.md
|
||||
[Elasticsearch integration]: ../integration/elasticsearch.md
|
||||
[recording on YouTube]: https://www.youtube.com/watch?v=vrvl-tN2EaA
|
||||
[Google Slides]: https://docs.google.com/presentation/d/1H-pCzI_LNrgrL5pJAIQgvLX8Ji0-jIKOg1QeJQzChug/edit
|
||||
[PDF]: https://gitlab.com/gitlab-org/create-stage/uploads/c5aa32b6b07476fa8b597004899ec538/Elasticsearch_Deep_Dive.pdf
|
||||
|
|
@ -57,7 +57,7 @@ Additionally, if you need large repos or multiple forks for testing, please cons
|
|||
|
||||
## How does it work?
|
||||
|
||||
The ElasticSearch integration depends on an external indexer. We ship a [ruby indexer](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/bin/elastic_repo_indexer) by default but are also working on an [indexer written in Go](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer). The user must trigger the initial indexing via a rake task, but after this is done GitLab itself will trigger reindexing when required via `after_` callbacks on create, update, and destroy that are inherited from [/ee/app/models/concerns/elastic/application_search.rb](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/app/models/concerns/elastic/application_search.rb).
|
||||
The Elasticsearch integration depends on an external indexer. We ship a [ruby indexer](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/bin/elastic_repo_indexer) by default but are also working on an [indexer written in Go](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer). The user must trigger the initial indexing via a rake task, but after this is done GitLab itself will trigger reindexing when required via `after_` callbacks on create, update, and destroy that are inherited from [/ee/app/models/concerns/elastic/application_search.rb](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/app/models/concerns/elastic/application_search.rb).
|
||||
|
||||
All indexing after the initial one is done via `ElasticIndexerWorker` (sidekiq jobs).
|
||||
|
||||
|
|
@ -186,6 +186,6 @@ cluster.routing.allocation.disk.watermark.low: 15gb
|
|||
cluster.routing.allocation.disk.watermark.high: 10gb
|
||||
```
|
||||
|
||||
Restart ElasticSearch, and the `read_only_allow_delete` will clear on it's own.
|
||||
Restart Elasticsearch, and the `read_only_allow_delete` will clear on it's own.
|
||||
|
||||
_from "Disk-based Shard Allocation | Elasticsearch Reference" [5.6](https://www.elastic.co/guide/en/elasticsearch/reference/5.6/disk-allocator.html#disk-allocator) and [6.x](https://www.elastic.co/guide/en/elasticsearch/reference/6.x/disk-allocator.html)_
|
||||
|
|
|
|||
|
|
@ -456,7 +456,7 @@ Here are some common pitfalls and how to overcome them:
|
|||
|
||||
See [Elasticsearch Index Scopes](elasticsearch.md#elasticsearch-index-scopes) for more information on searching for specific types of data.
|
||||
|
||||
- **I indexed all the repositories but then switched elastic search servers and now I can't find anything**
|
||||
- **I indexed all the repositories but then switched Elasticsearch servers and now I can't find anything**
|
||||
|
||||
You will need to re-run all the rake tasks to re-index the database, repositories, and wikis.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue