Commit cbcfc996 authored by Evan Read's avatar Evan Read

Merge branch 'wc-praefect-gitaly-mixed' into 'master'

Docs: Add note on TCP requirement for existing Gitaly

See merge request gitlab-org/gitlab!60673
parents da85ceb0 a2e4c7d4
...@@ -874,6 +874,27 @@ Particular attention should be shown to: ...@@ -874,6 +874,27 @@ Particular attention should be shown to:
repository that viewed. If the project is created, and you can see the repository that viewed. If the project is created, and you can see the
README file, it works! README file, it works!
#### Use TCP for existing GitLab instances
When adding Gitaly Cluster to an existing Gitaly instance, the existing Gitaly storage
must use a TCP address. If `gitaly_address` is not specified, then a Unix socket is used,
which will prevent the communication with the cluster.
For example:
```ruby
git_data_dirs({
'default' => { 'gitaly_address' => 'tcp://old-gitaly.internal:8075' },
'cluster' => {
'gitaly_address' => 'tcp://<load_balancer_server_address>:2305',
'gitaly_token' => '<praefect_external_token>'
}
})
```
See [Mixed Configuration](configure_gitaly.md#mixed-configuration) for further information on
running multiple Gitaly storages.
### Grafana ### Grafana
Grafana is included with GitLab, and can be used to monitor your Praefect Grafana is included with GitLab, and can be used to monitor your Praefect
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment