diff --git a/manifests/api/logging.pp b/manifests/api/logging.pp index d8759035..72b59607 100644 --- a/manifests/api/logging.pp +++ b/manifests/api/logging.pp @@ -12,6 +12,10 @@ # (Optional) Use syslog for logging. # Defaults to $::os_service_default # +# [*use_json*] +# (Optional) Use json for logging. +# Defaults to $::os_service_default +# # [*use_stderr*] # (optional) Use stderr for logging # Defaults to $::os_service_default @@ -95,6 +99,7 @@ # class barbican::api::logging( $use_syslog = $::os_service_default, + $use_json = $::os_service_default, $use_stderr = $::os_service_default, $log_facility = $::os_service_default, $log_dir = '/var/log/barbican', @@ -118,6 +123,7 @@ class barbican::api::logging( oslo::log { 'barbican_config': debug => $debug, use_syslog => $use_syslog, + use_json => $use_json, use_stderr => $use_stderr, log_dir => $log_dir, log_file => $log_file, diff --git a/releasenotes/notes/log-json-108f050adf1a4a3e.yaml b/releasenotes/notes/log-json-108f050adf1a4a3e.yaml new file mode 100644 index 00000000..41c04132 --- /dev/null +++ b/releasenotes/notes/log-json-108f050adf1a4a3e.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Expose use_json logging parameter, which enables JSON formatted logging. diff --git a/spec/classes/barbican_api_logging_spec.rb b/spec/classes/barbican_api_logging_spec.rb index 78f3452f..27b2bdfd 100644 --- a/spec/classes/barbican_api_logging_spec.rb +++ b/spec/classes/barbican_api_logging_spec.rb @@ -43,6 +43,7 @@ describe 'barbican::api::logging' do :instance_uuid_format => '[instance: %(uuid)s] ', :log_date_format => '%Y-%m-%d %H:%M:%S', :use_syslog => true, + :use_json => true, :use_stderr => false, :log_facility => 'LOG_FOO', :log_dir => '/var/log', @@ -77,6 +78,7 @@ describe 'barbican::api::logging' do it 'configures barbican logging settings with default values' do is_expected.to contain_oslo__log('barbican_config').with( :use_syslog => '', + :use_json => '', :use_stderr => '', :syslog_log_facility => '', :log_dir => '/var/log/barbican', @@ -90,6 +92,7 @@ describe 'barbican::api::logging' do it 'configures barbican logging settings with non-default values' do is_expected.to contain_oslo__log('barbican_config').with( :use_syslog => true, + :use_json => true, :use_stderr => false, :syslog_log_facility => 'LOG_FOO', :log_dir => '/var/log',