diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 18:09:39 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 18:09:39 +0000 |
commit | 00fa950a34b1c94617110b150b8b2517d5241249 (patch) | |
tree | 8f2d8683879079da8f520f7867ebd49b8beaadef /doc/administration | |
parent | c36152ff8c41fad2f413f253eb7ac5c927e47c56 (diff) | |
download | gitlab-ce-00fa950a34b1c94617110b150b8b2517d5241249.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/gitaly/index.md | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md index 1bd027ac0c9..4630b6d8259 100644 --- a/doc/administration/gitaly/index.md +++ b/doc/administration/gitaly/index.md @@ -163,17 +163,21 @@ Git operations in GitLab will result in an API error. unicorn['enable'] = false sidekiq['enable'] = false gitlab_workhorse['enable'] = false + grafana['enable'] = false + + # If you run a seperate monitoring node you can disable these services + alertmanager['enable'] = false + prometheus['enable'] = false + + # If you don't run a seperate monitoring node you can + # Enable Prometheus access & disable these extra services + # This makes Prometheus listen on all interfaces. You must use firewalls to restrict access to this address/port. + # prometheus['listen_address'] = '0.0.0.0:9090' + # prometheus['monitor_kubernetes'] = false # If you don't want to run monitoring services uncomment the following (not recommended) - # alertmanager['enable'] = false # gitlab_exporter['enable'] = false - # grafana['enable'] = false # node_exporter['enable'] = false - # prometheus['enable'] = false - - # Enable prometheus monitoring - comment out if you disable monitoring services above. - # This makes Prometheus listen on all interfaces. You must use firewalls to restrict access to this address/port. - prometheus['listen_address'] = '0.0.0.0:9090' # Prevent database connections during 'gitlab-ctl reconfigure' gitlab_rails['rake_cache_clear'] = false @@ -861,7 +865,7 @@ default level is `WARN`. You can run a gRPC trace with: ```shell -GRPC_TRACE=all GRPC_VERBOSITY=DEBUG sudo gitlab-rake gitlab:gitaly:check +sudo GRPC_TRACE=all GRPC_VERBOSITY=DEBUG gitlab-rake gitlab:gitaly:check ``` ### Observing `gitaly-ruby` traffic |