Skip to content

Commit 739380d

Browse files
ereadKate Grechishkina
andcommitted
Merge branch 'docs-update-gitlaly-configuration-structure' into 'master'
Change gitaly logging configuration structure See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7286 Merged-by: Evan Read <[email protected]> Co-authored-by: Kate Grechishkina <[email protected]>
2 parents cce7680 + dccfb95 commit 739380d

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

doc/settings/logs.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ registry['log_directory'] = "/var/log/gitlab/registry"
5151
Gitaly and Mattermost have different log directory configs:
5252

5353
```ruby
54-
gitaly['configuration']['logging']['dir'] = "/var/log/gitlab/registry"
54+
gitaly['configuration'] = {
55+
logging: {
56+
dir: "/var/log/gitlab/registry"
57+
}
58+
}
5559
mattermost['log_file_directory'] = "/var/log/gitlab/registry"
5660
```
5761

@@ -229,7 +233,11 @@ log format. Text formatting can be configured by setting the following
229233
in `/etc/gitlab/gitlab.rb` and then running `gitlab-ctl reconfigure` afterward:
230234

231235
```ruby
232-
gitaly['logging_format'] = ''
236+
gitaly['configuration'] = {
237+
logging: {
238+
format: ""
239+
}
240+
}
233241
gitlab_shell['log_format'] = 'text'
234242
gitlab_workhorse['log_format'] = 'text'
235243
registry['log_formatter'] = 'text'
@@ -268,7 +276,11 @@ Registry, GitLab Shell and Gitaly:
268276
```ruby
269277
registry['log_level'] = 'info'
270278
gitlab_shell['log_level'] = 'INFO'
271-
gitaly['logging_level'] = 'warn'
279+
gitaly['configuration'] = {
280+
logging: {
281+
level: "warn"
282+
}
283+
}
272284
```
273285

274286
1. Reconfigure GitLab:

0 commit comments

Comments
 (0)