diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 10b0ed22000aa570e07f708bc7f3d62434d1320d_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..9e6fc1e06869aa6d3954267a12faaf16a4e02cd6_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -1821,6 +1821,9 @@ ##! Metrics configuration for GitLab KAS # gitlab_kas['metrics_usage_reporting_period'] = 60 +##! Log configuration for GitLab KAS +# gitlab_kas['log_level'] = 'info' + ##! Environment variables for GitLab KAS # gitlab_kas['env'] = { # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/", diff --git a/files/gitlab-cookbooks/gitlab-kas/attributes/default.rb b/files/gitlab-cookbooks/gitlab-kas/attributes/default.rb index 10b0ed22000aa570e07f708bc7f3d62434d1320d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIta2FzL2F0dHJpYnV0ZXMvZGVmYXVsdC5yYg==..9e6fc1e06869aa6d3954267a12faaf16a4e02cd6_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIta2FzL2F0dHJpYnV0ZXMvZGVmYXVsdC5yYg== 100644 --- a/files/gitlab-cookbooks/gitlab-kas/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab-kas/attributes/default.rb @@ -30,6 +30,7 @@ default['gitlab-kas']['metrics_usage_reporting_period'] = 60 default['gitlab-kas']['sentry_dsn'] = nil default['gitlab-kas']['sentry_environment'] = nil +default['gitlab-kas']['log_level'] = 'info' default['gitlab-kas']['dir'] = '/var/opt/gitlab/gitlab-kas' default['gitlab-kas']['log_directory'] = '/var/log/gitlab/gitlab-kas' default['gitlab-kas']['env_directory'] = '/opt/gitlab/etc/gitlab-kas/env' diff --git a/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb b/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb index 10b0ed22000aa570e07f708bc7f3d62434d1320d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIta2FzL3RlbXBsYXRlcy9kZWZhdWx0L2dpdGxhYi1rYXMtY29uZmlnLnltbC5lcmI=..9e6fc1e06869aa6d3954267a12faaf16a4e02cd6_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIta2FzL3RlbXBsYXRlcy9kZWZhdWx0L2dpdGxhYi1rYXMtY29uZmlnLnltbC5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb +++ b/files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb @@ -35,6 +35,8 @@ environment: <%= @sentry_environment %> <%- end %> <%- end %> + logging: + level: <%= @log_level %> redis: network: <%= @redis_network %> tls: diff --git a/spec/chef/recipes/gitlab-kas_spec.rb b/spec/chef/recipes/gitlab-kas_spec.rb index 10b0ed22000aa570e07f708bc7f3d62434d1320d_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLWthc19zcGVjLnJi..9e6fc1e06869aa6d3954267a12faaf16a4e02cd6_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLWthc19zcGVjLnJi 100644 --- a/spec/chef/recipes/gitlab-kas_spec.rb +++ b/spec/chef/recipes/gitlab-kas_spec.rb @@ -57,6 +57,9 @@ } ), observability: { + logging: { + level: 'info', + }, usage_reporting_period: '60s' }, private_api: { @@ -95,7 +98,8 @@ listen_websocket: false, metrics_usage_reporting_period: '120', sentry_dsn: 'https://my_key:my_secret@sentry.io/test_project', - sentry_environment: 'production' + sentry_environment: 'production', + log_level: 'debug', } ) end @@ -119,6 +123,9 @@ } ), observability: { + logging: { + level: 'debug' + }, usage_reporting_period: '120s', sentry: { dsn: 'https://my_key:my_secret@sentry.io/test_project',