Merge branch 'add-grpc-level-config-for-kas' into 'master'

Support optional grpc log level config for KAS

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7518

Merged-by: Robert Marshall <[email protected]>
Approved-by: Gabriel Mazetto <[email protected]>
Approved-by: Robert Marshall <[email protected]>
Co-authored-by: Taka Nishida <[email protected]>

Author: Robert Marshall

files/gitlab-config-template/gitlab.rb.template

@@ -2152,6 +2152,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 
 ##! Log configuration for GitLab KAS
 # gitlab_kas['log_level'] = 'info'
+# gitlab_kas['grpc_log_level'] = 'error'
 
 ##! Environment variables for GitLab KAS
 # gitlab_kas['env'] = {

files/gitlab-cookbooks/gitlab-kas/attributes/default.rb

@@ -34,6 +34,7 @@
 default['gitlab_kas']['sentry_dsn'] = nil
 default['gitlab_kas']['sentry_environment'] = nil
 default['gitlab_kas']['log_level'] = 'info'
+default['gitlab_kas']['grpc_log_level'] = 'error'
 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'

files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb

@@ -41,6 +41,7 @@ observability:
   <%- end %>
   logging:
     level: <%= @log_level %>
+    grpc_level: <%= @grpc_log_level %>
 redis:
   network: <%= @redis_network %>
   tls:

spec/chef/cookbooks/gitlab-kas/recipes/gitlab-kas_spec.rb

@@ -72,6 +72,7 @@
             },
             logging: {
               level: 'info',
+              grpc_level: 'error'
             },
             usage_reporting_period: '60s'
           },
@@ -117,6 +118,7 @@
           sentry_dsn: 'https://my_key:[email protected]/test_project',
           sentry_environment: 'production',
           log_level: 'debug',
+          grpc_log_level: 'debug',
           env: {
             'OWN_PRIVATE_API_HOST' => 'fake-host.example.com'
           }
@@ -144,7 +146,8 @@
               network: 'tcp'
             },
             logging: {
-              level: 'debug'
+              level: 'debug',
+              grpc_level: 'debug'
             },
             usage_reporting_period: '120s',
             sentry: {