Merge branch 'sh-rename-githost-to-gitjson' into 'master'

Rename githost.log -> git_json.log

See merge request gitlab-org/gitlab-ce!31634

6 files changed, 14 insertions, 8 deletions

diff --git a/changelogs/unreleased/sh-rename-githost-to-gitjson.yml b/changelogs/unreleased/sh-rename-githost-to-gitjson.yml
new file mode 100644
index 00000000000..24fcd1e9781
--- /dev/null
+++ b/changelogs/unreleased/sh-rename-githost-to-gitjson.yml
@@ -0,0 +1,5 @@
+---
+title: Rename githost.log -> git_json.log
+merge_request: 31634
+author:
+type: changed
diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index 31876dd178a..47abbc512e0 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -151,14 +151,15 @@ etc. For example:
 {"severity":"ERROR","time":"2018-11-23T15:42:11.647Z","exception":"Kubeclient::HttpError","error_code":null,"service":"Clusters::Applications::InstallService","app_id":2,"project_ids":[19],"group_ids":[],"message":"SSL_connect returned=1 errno=0 state=error: certificate verify failed (unable to get local issuer certificate)"}
 ```
 
-## `githost.log`
+## `git_json.log`
 
-This file lives in `/var/log/gitlab/gitlab-rails/githost.log` for
-Omnibus GitLab packages or in `/home/git/gitlab/log/githost.log` for
+This file lives in `/var/log/gitlab/gitlab-rails/git_json.log` for
+Omnibus GitLab packages or in `/home/git/gitlab/log/git_json.log` for
 installations from source.
 
 NOTE: **Note:**
-After 12.2, this file will be stored in JSON format.
+After 12.2, this file was renamed from `githost.log` to
+`git_json.log` and stored in JSON format.
 
 GitLab has to interact with Git repositories but in some rare cases
 something can go wrong and in this case you will know what exactly
diff --git a/doc/development/architecture.md b/doc/development/architecture.md
index 091edb6ac40..87405bc2fec 100644
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
@@ -568,7 +568,7 @@ Usage: /etc/init.d/postgresql {start|stop|restart|reload|force-reload|status} [v
 
 gitlabhq (includes Unicorn and Sidekiq logs)
 
-- `/home/git/gitlab/log/` contains `application.log`, `production.log`, `sidekiq.log`, `unicorn.stdout.log`, `githost.log` and `unicorn.stderr.log` normally.
+- `/home/git/gitlab/log/` contains `application.log`, `production.log`, `sidekiq.log`, `unicorn.stdout.log`, `git_json.log` and `unicorn.stderr.log` normally.
 
 gitlab-shell
 
diff --git a/doc/user/admin_area/index.md b/doc/user/admin_area/index.md
index f5e6bff67c5..9bc0f64b68d 100644
--- a/doc/user/admin_area/index.md
+++ b/doc/user/admin_area/index.md
@@ -272,7 +272,7 @@ The **Logs** page provides access to the following log files:
 | Log file                | Contents |
 | :---------------------- | :------- |
 | `application.log`       | GitLab user activity |
-| `githost.log`           | Failed GitLab interaction with Git repositories |
+| `git_json.log`          | Failed GitLab interaction with Git repositories |
 | `production.log`        | Requests received from Unicorn, and the actions taken to serve those requests |
 | `sidekiq.log`           | Background jobs |
 | `repocheck.log`         | Repository activity |
diff --git a/lib/gitlab/git_logger.rb b/lib/gitlab/git_logger.rb
index ded5349be01..545451f0dc9 100644
--- a/lib/gitlab/git_logger.rb
+++ b/lib/gitlab/git_logger.rb
@@ -3,7 +3,7 @@
 module Gitlab
   class GitLogger < JsonLogger
     def self.file_name_noext
-      'githost'
+      'git_json'
     end
   end
 end
diff --git a/spec/features/admin/admin_browses_logs_spec.rb b/spec/features/admin/admin_browses_logs_spec.rb
index 5a2df89aeb7..2b97362c8e9 100644
--- a/spec/features/admin/admin_browses_logs_spec.rb
+++ b/spec/features/admin/admin_browses_logs_spec.rb
@@ -11,7 +11,7 @@ describe 'Admin browses logs' do
     visit admin_logs_path
 
     expect(page).to have_link 'application.log'
-    expect(page).to have_link 'githost.log'
+    expect(page).to have_link 'git_json.log'
     expect(page).to have_link 'test.log'
     expect(page).to have_link 'sidekiq.log'
     expect(page).to have_link 'repocheck.log'