From 50d7c113f880806936c9fc7856cefb403e87dfbe Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 27 Nov 2017 14:54:23 +0200
Subject: [PATCH] Expose use_json logging option

It enables JSON-formatted logging from oslo.log.

Change-Id: I57eaa1209e6942a9e76e7988761fea854c838dc5
---
 manifests/logging.pp                              | 6 ++++++
 releasenotes/notes/log-json-9c7061b9e42a3d20.yaml | 4 ++++
 spec/classes/heat_logging_spec.rb                 | 3 +++
 3 files changed, 13 insertions(+)
 create mode 100644 releasenotes/notes/log-json-9c7061b9e42a3d20.yaml

diff --git a/manifests/logging.pp b/manifests/logging.pp
index fb5f4aaf..cb7de0c0 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 heat::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/heat',
@@ -124,6 +129,7 @@ class heat::logging(
     log_date_format               => $log_date_format,
     log_dir                       => $log_dir_real,
     use_syslog                    => $use_syslog_real,
+    use_json                      => $use_json,
     syslog_log_facility           => $log_facility_real,
     use_stderr                    => $use_stderr_real,
     logging_context_format_string => $logging_context_format_string,
diff --git a/releasenotes/notes/log-json-9c7061b9e42a3d20.yaml b/releasenotes/notes/log-json-9c7061b9e42a3d20.yaml
new file mode 100644
index 00000000..41c04132
--- /dev/null
+++ b/releasenotes/notes/log-json-9c7061b9e42a3d20.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Expose use_json logging parameter, which enables JSON formatted logging.
diff --git a/spec/classes/heat_logging_spec.rb b/spec/classes/heat_logging_spec.rb
index 2483acc7..59e1df28 100644
--- a/spec/classes/heat_logging_spec.rb
+++ b/spec/classes/heat_logging_spec.rb
@@ -24,6 +24,7 @@ describe 'heat::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 'heat::logging' do
     it 'configures heat logging settings with default values' do
       is_expected.to contain_oslo__log('heat_config').with(
         :use_syslog => '<SERVICE DEFAULT>',
+        :use_json => '<SERVICE DEFAULT>',
         :use_stderr => '<SERVICE DEFAULT>',
         :log_dir    => '/var/log/heat',
         :debug      => '<SERVICE DEFAULT>',
@@ -68,6 +70,7 @@ describe 'heat::logging' do
     it 'configures heat logging settings with non-default values' do
       is_expected.to contain_oslo__log('heat_config').with(
         :use_syslog          => true,
+        :use_json            => true,
         :use_stderr          => false,
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',