diff --git a/manifests/logging.pp b/manifests/logging.pp index eb7ccfaed..7d53d7a48 100644 --- a/manifests/logging.pp +++ b/manifests/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 @@ -87,6 +91,7 @@ # class nova::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/nova', @@ -122,6 +127,7 @@ class nova::logging( debug => $debug_real, use_stderr => $use_stderr_real, use_syslog => $use_syslog_real, + use_json => $use_json, log_dir => $log_dir_real, syslog_log_facility => $log_facility_real, logging_context_format_string => $logging_context_format_string, diff --git a/releasenotes/notes/log-json-97ad59aa72f31a67.yaml b/releasenotes/notes/log-json-97ad59aa72f31a67.yaml new file mode 100644 index 000000000..41c04132a --- /dev/null +++ b/releasenotes/notes/log-json-97ad59aa72f31a67.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Expose use_json logging parameter, which enables JSON formatted logging. diff --git a/spec/classes/nova_logging_spec.rb b/spec/classes/nova_logging_spec.rb index 068b7f003..62f51d9c3 100644 --- a/spec/classes/nova_logging_spec.rb +++ b/spec/classes/nova_logging_spec.rb @@ -24,6 +24,7 @@ describe 'nova::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', @@ -57,6 +58,7 @@ describe 'nova::logging' do it 'configures nova logging settings with default values' do is_expected.to contain_oslo__log('nova_config').with( :use_syslog => '', + :use_json => '', :use_stderr => '', :log_dir => '/var/log/nova', :debug => '', @@ -68,6 +70,7 @@ describe 'nova::logging' do it 'configures nova logging settings with non-default values' do is_expected.to contain_oslo__log('nova_config').with( :use_syslog => true, + :use_json => true, :use_stderr => false, :syslog_log_facility => 'LOG_FOO', :log_dir => '/var/log',