diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-03 15:09:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-03 15:09:39 +0300 |
commit | f145ef4be75f3711c52a680b86d96568e9acf385 (patch) | |
tree | 5e90358a166062305cf41f73e541cf4744b76c4d /doc | |
parent | 544eaa90817fa8595826fbd44f37452c76b56378 (diff) |
Add latest changes from gitlab-org/gitlab@masterCSTarun
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md | 36 | ||||
-rw-r--r-- | doc/development/shell_scripting_guide/index.md | 2 | ||||
-rw-r--r-- | doc/development/sidekiq_style_guide.md | 2 |
3 files changed, 38 insertions, 2 deletions
diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md index 29dd23db90b..8bdb5a7176d 100644 --- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md +++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md @@ -1015,3 +1015,39 @@ This will also refresh the cached usage ping displayed in the admin area ```ruby Gitlab::UsageData.to_json(force_refresh: true) ``` + +## Elasticsearch + +### Configuration attributes + +Open the rails console (`gitlab rails c`) and run the following command to see all the available attributes: + +```ruby +ApplicationSetting.last.attributes +``` + +Among other attributes, in the output you will notice that all the settings available in the [Elasticsearch Integration page](../../integration/elasticsearch.md), like: `elasticsearch_indexing`, `elasticsearch_url`, `elasticsearch_replicas`, `elasticsearch_pause_indexing`, etc. + +#### Setting attributes + +You can then set anyone of Elasticsearch integration settings by issuing a command similar to: + +```ruby +ApplicationSetting.last.update_attributes(elasticsearch_url: '<your ES URL and port>') + +#or + +ApplicationSetting.last.update_attributes(elasticsearch_indexing: false) +``` + +#### Getting attributes + +You can then check if the settings have been set in the [Elasticsearch Integration page](../../integration/elasticsearch.md) or in the rails console by issuing: + +```ruby +Gitlab::CurrentSettings.elasticsearch_url + +#or + +Gitlab::CurrentSettings.elasticsearch_indexing +``` diff --git a/doc/development/shell_scripting_guide/index.md b/doc/development/shell_scripting_guide/index.md index 1f40a4d3200..6591a2013e9 100644 --- a/doc/development/shell_scripting_guide/index.md +++ b/doc/development/shell_scripting_guide/index.md @@ -92,7 +92,7 @@ use this job: ```yaml shfmt: - image: mvdan/shfmt:v3.1.0-alpine + image: mvdan/shfmt:v3.2.0-alpine stage: test before_script: - shfmt -version diff --git a/doc/development/sidekiq_style_guide.md b/doc/development/sidekiq_style_guide.md index 8e50c7647a3..2d9cb40d143 100644 --- a/doc/development/sidekiq_style_guide.md +++ b/doc/development/sidekiq_style_guide.md @@ -472,7 +472,7 @@ A job cannot be both high urgency and have external dependencies. Workers that are constrained by CPU or memory resource limitations should be annotated with the `worker_resource_boundary` method. -Most workers tend to spend most of their time blocked, wait on network responses +Most workers tend to spend most of their time blocked, waiting on network responses from other services such as Redis, PostgreSQL, and Gitaly. Since Sidekiq is a multi-threaded environment, these jobs can be scheduled with high concurrency. |