diff --git a/config/initializers/click_house.rb b/config/initializers/click_house.rb index ecf1ccb97bf874e19a7394b1a9a3a74ca3b9d41c..aa7b2a92769e080f5c4aaafb5007783145ea7200 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 e093c03a13e51e628d4fc1ce0fff76df6ed96503..e7277ab318683560f43672ac6070f4fd1ffd036b 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.