From 385bd43951e64a12d5af2bc29c9a6d16f6791d50 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Tue, 28 Nov 2017 09:48:57 +0800
Subject: [PATCH] Expose use_json logging option

It enables JSON-formatted logging from oslo.log.

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

diff --git a/manifests/logging.pp b/manifests/logging.pp
index 6a9f411..057b3fd 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
@@ -95,6 +99,7 @@
 
 class watcher::logging(
   $use_syslog                    = $::os_service_default,
+  $use_json                      = $::os_service_default,
   $use_stderr                    = $::os_service_default,
   $syslog_log_facility           = $::os_service_default,
   $log_dir                       = '/var/log/watcher',
@@ -118,6 +123,7 @@ class watcher::logging(
   oslo::log { 'watcher_config':
     use_stderr                    => $use_stderr,
     use_syslog                    => $use_syslog,
+    use_json                      => $use_json,
     log_dir                       => $log_dir,
     log_file                      => $log_file,
     debug                         => $debug,
diff --git a/releasenotes/notes/log-json-a87130f234e8771d.yaml b/releasenotes/notes/log-json-a87130f234e8771d.yaml
new file mode 100644
index 0000000..41c0413
--- /dev/null
+++ b/releasenotes/notes/log-json-a87130f234e8771d.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Expose use_json logging parameter, which enables JSON formatted logging.
diff --git a/spec/classes/watcher_logging_spec.rb b/spec/classes/watcher_logging_spec.rb
index dc506e1..09c6c08 100644
--- a/spec/classes/watcher_logging_spec.rb
+++ b/spec/classes/watcher_logging_spec.rb
@@ -24,6 +24,7 @@ describe 'watcher::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,
      :syslog_log_facility => 'LOG_FOO',
      :log_dir => '/var/log',
@@ -58,6 +59,7 @@ describe 'watcher::logging' do
     it 'configures watcher logging settings with default values' do
       is_expected.to contain_oslo__log('watcher_config').with(
         :use_syslog          => '<SERVICE DEFAULT>',
+        :use_json            => '<SERVICE DEFAULT>',
         :use_stderr          => '<SERVICE DEFAULT>',
         :syslog_log_facility => '<SERVICE DEFAULT>',
         :log_dir             => '/var/log/watcher',
@@ -71,6 +73,7 @@ describe 'watcher::logging' do
     it 'configures watcher logging settings with non-default values' do
       is_expected.to contain_oslo__log('watcher_config').with(
         :use_syslog          => true,
+        :use_json            => true,
         :use_stderr          => false,
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',