diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 10:07:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 10:07:47 +0000 |
| commit | d670c3006e6e44901bce0d53cc4768d1d80ffa92 (patch) | |
| tree | 8f65743c232e5b76850c4cc264ba15e1185815ff /doc/administration | |
| parent | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (diff) | |
| download | gitlab-ce-d670c3006e6e44901bce0d53cc4768d1d80ffa92.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/database_load_balancing.md | 2 | ||||
| -rw-r--r-- | doc/administration/troubleshooting/kubernetes_cheat_sheet.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/database_load_balancing.md b/doc/administration/database_load_balancing.md index 9c1ed9b3477..e9f989c96ea 100644 --- a/doc/administration/database_load_balancing.md +++ b/doc/administration/database_load_balancing.md @@ -113,7 +113,7 @@ Some background jobs can use database replicas to read application state. This allows to offload the primary database. Load balancing is disabled by default in Sidekiq. When enabled, we can define -[the data consistency](../development/sidekiq_style_guide.md#job-data-consistency) +[the data consistency](../development/sidekiq_style_guide.md#job-data-consistency-strategies) requirements for a specific job. To enable it, define the `ENABLE_LOAD_BALANCING_FOR_SIDEKIQ` variable to the environment, as shown below. diff --git a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md index b43825092b7..bb0287df596 100644 --- a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md +++ b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md @@ -147,7 +147,7 @@ and they will assist you with any issues you are having. You can also use `gitlab-rake`, instead of `/usr/local/bin/gitlab-rake`. -- Troubleshooting **Infrastructure > Kubernetes** integration: +- Troubleshooting **Infrastructure > Kubernetes clusters** integration: - Check the output of `kubectl get events -w --all-namespaces`. - Check the logs of pods within `gitlab-managed-apps` namespace. |