From 7cb857b21dba987b204f3a84fd0f71fb11237c81 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 27 Nov 2017 14:49:18 +0200 Subject: [PATCH] Expose use_json logging option It enables JSON-formatted logging from oslo.log. Change-Id: I110e7593d38307cc520f5d5fb5d0cdb382082393 --- manifests/inspector/logging.pp | 6 ++++++ manifests/logging.pp | 6 ++++++ releasenotes/notes/log-json-d9478055054bf6f9.yaml | 4 ++++ spec/classes/ironic_inspector_logging_spec.rb | 3 +++ spec/classes/ironic_logging_spec.rb | 3 +++ 5 files changed, 22 insertions(+) create mode 100644 releasenotes/notes/log-json-d9478055054bf6f9.yaml diff --git a/manifests/inspector/logging.pp b/manifests/inspector/logging.pp index 69b663e3..74148e85 100644 --- a/manifests/inspector/logging.pp +++ b/manifests/inspector/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 ironic::inspector::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/ironic-inspector', @@ -112,6 +117,7 @@ class ironic::inspector::logging( debug => $debug_real, use_stderr => $use_stderr, use_syslog => $use_syslog, + use_json => $use_json, log_dir => $log_dir, syslog_log_facility => $log_facility, logging_context_format_string => $logging_context_format_string, diff --git a/manifests/logging.pp b/manifests/logging.pp index 8a28eea0..d2621ff8 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 ironic::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/ironic', @@ -122,6 +127,7 @@ class ironic::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-d9478055054bf6f9.yaml b/releasenotes/notes/log-json-d9478055054bf6f9.yaml new file mode 100644 index 00000000..41c04132 --- /dev/null +++ b/releasenotes/notes/log-json-d9478055054bf6f9.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Expose use_json logging parameter, which enables JSON formatted logging. diff --git a/spec/classes/ironic_inspector_logging_spec.rb b/spec/classes/ironic_inspector_logging_spec.rb index 5b324a35..f4741405 100644 --- a/spec/classes/ironic_inspector_logging_spec.rb +++ b/spec/classes/ironic_inspector_logging_spec.rb @@ -24,6 +24,7 @@ describe 'ironic::inspector::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 'ironic::inspector::logging' do it 'configures ironic-inspector logging settings with default values' do is_expected.to contain_oslo__log('ironic_inspector_config').with( :use_syslog => '', + :use_json => '', :use_stderr => '', :syslog_log_facility => '', :log_dir => '/var/log/ironic-inspector', @@ -69,6 +71,7 @@ describe 'ironic::inspector::logging' do it 'configures ironic-inspector logging settings with non-default values' do is_expected.to contain_oslo__log('ironic_inspector_config').with( :use_syslog => true, + :use_json => true, :use_stderr => false, :syslog_log_facility => 'LOG_FOO', :log_dir => '/var/log', diff --git a/spec/classes/ironic_logging_spec.rb b/spec/classes/ironic_logging_spec.rb index 86044052..28ba64ff 100644 --- a/spec/classes/ironic_logging_spec.rb +++ b/spec/classes/ironic_logging_spec.rb @@ -24,6 +24,7 @@ describe 'ironic::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', @@ -69,6 +70,7 @@ describe 'ironic::logging' do it 'configures ironic logging settings with default values' do is_expected.to contain_oslo__log('ironic_config').with( :use_syslog => '', + :use_json => '', :use_stderr => '', :syslog_log_facility => '', :log_dir => '/var/log/ironic', @@ -81,6 +83,7 @@ describe 'ironic::logging' do it 'configures ironic logging settings with non-default values' do is_expected.to contain_oslo__log('ironic_config').with( :use_syslog => true, + :use_json => true, :use_stderr => false, :syslog_log_facility => 'LOG_FOO', :log_dir => '/var/log',