From f52dde4c50a77f7b58c2484962dc06ee8bf5f3b4 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 4 Oct 2023 15:02:07 -0300
Subject: [PATCH] Add clickhouse logs to production

Add clickhouse.log file to production environment.

Changelog: added
---
 config/initializers/click_house.rb | 15 +++++----------
 doc/administration/logs/index.md   |  7 +++++++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/config/initializers/click_house.rb b/config/initializers/click_house.rb
index ecf1ccb97bf874..aa7b2a92769e08 100644
--- a/config/initializers/click_house.rb
+++ b/config/initializers/click_house.rb
@@ -17,16 +17,11 @@
     )
   end
 
-  if Rails.env.development? || Rails.env.test?
-    config.logger = ::ClickHouse::Logger.build
-    config.log_proc = ->(query) do
-      structured_log(query.to_sql)
-    end
-  else
-    config.logger = Logger.new('/dev/null')
-    config.log_proc = ->(query) do
-      structured_log(query.to_redacted_sql)
-    end
+  config.logger = ::ClickHouse::Logger.build
+  config.log_proc = ->(query) do
+    query_output =
+      Rails.env.production? ? query.to_redacted_sql : query.to_sql
+    structured_log(query_output)
   end
 
   config.json_parser = Gitlab::Json
diff --git a/doc/administration/logs/index.md b/doc/administration/logs/index.md
index e093c03a13e51e..e7277ab3186835 100644
--- a/doc/administration/logs/index.md
+++ b/doc/administration/logs/index.md
@@ -806,6 +806,13 @@ GraphQL queries are recorded in the file. For example:
 {"query_string":"query IntrospectionQuery{__schema {queryType { name },mutationType { name }}}...(etc)","variables":{"a":1,"b":2},"complexity":181,"depth":1,"duration_s":7}
 ```
 
+## `clickhouse.log` **(SAAS)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133371) in GitLab 16.5.
+
+The `clickhouse.log` file logs information related to
+Clickhouse database client within GitLab.
+
 ## `migrations.log`
 
 > Introduced in GitLab 12.3.
-- 
GitLab