Skip to content
Snippets Groups Projects
Commit 6732f59f authored by Robert Marshall's avatar Robert Marshall
Browse files

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

Add gitlab_kas['log_level'] customization

See merge request gitlab-org/omnibus-gitlab!5921
parents 4dbee11e 9e6fc1e0
No related branches found
No related tags found
2 merge requests!67heptapod#675: making 0.31 the new stable,!66GitLab 14.9
...@@ -1832,6 +1832,9 @@ ...@@ -1832,6 +1832,9 @@
##! Metrics configuration for GitLab KAS ##! Metrics configuration for GitLab KAS
# gitlab_kas['metrics_usage_reporting_period'] = 60 # gitlab_kas['metrics_usage_reporting_period'] = 60
##! Log configuration for GitLab KAS
# gitlab_kas['log_level'] = 'info'
##! Environment variables for GitLab KAS ##! Environment variables for GitLab KAS
# gitlab_kas['env'] = { # gitlab_kas['env'] = {
# 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/", # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/",
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
default['gitlab-kas']['metrics_usage_reporting_period'] = 60 default['gitlab-kas']['metrics_usage_reporting_period'] = 60
default['gitlab-kas']['sentry_dsn'] = nil default['gitlab-kas']['sentry_dsn'] = nil
default['gitlab-kas']['sentry_environment'] = 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']['dir'] = '/var/opt/gitlab/gitlab-kas'
default['gitlab-kas']['log_directory'] = '/var/log/gitlab/gitlab-kas' default['gitlab-kas']['log_directory'] = '/var/log/gitlab/gitlab-kas'
default['gitlab-kas']['env_directory'] = '/opt/gitlab/etc/gitlab-kas/env' default['gitlab-kas']['env_directory'] = '/opt/gitlab/etc/gitlab-kas/env'
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
environment: <%= @sentry_environment %> environment: <%= @sentry_environment %>
<%- end %> <%- end %>
<%- end %> <%- end %>
logging:
level: <%= @log_level %>
redis: redis:
network: <%= @redis_network %> network: <%= @redis_network %>
tls: tls:
......
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
} }
), ),
observability: { observability: {
logging: {
level: 'info',
},
usage_reporting_period: '60s' usage_reporting_period: '60s'
}, },
private_api: { private_api: {
...@@ -95,7 +98,8 @@ ...@@ -95,7 +98,8 @@
listen_websocket: false, listen_websocket: false,
metrics_usage_reporting_period: '120', metrics_usage_reporting_period: '120',
sentry_dsn: 'https://my_key:my_secret@sentry.io/test_project', sentry_dsn: 'https://my_key:my_secret@sentry.io/test_project',
sentry_environment: 'production' sentry_environment: 'production',
log_level: 'debug',
} }
) )
end end
...@@ -119,6 +123,9 @@ ...@@ -119,6 +123,9 @@
} }
), ),
observability: { observability: {
logging: {
level: 'debug'
},
usage_reporting_period: '120s', usage_reporting_period: '120s',
sentry: { sentry: {
dsn: 'https://my_key:my_secret@sentry.io/test_project', dsn: 'https://my_key:my_secret@sentry.io/test_project',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment