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

It enables JSON-formatted logging from oslo.log.

Change-Id: If8c4b6f19b35c282ff2ae9aeaed30896ea5886b0
---
 manifests/logging.pp                          |  6 ++++++
 .../notes/log-json-713a4569878135f4.yaml      |  4 ++++
 spec/classes/designate_logging_spec.rb        | 19 +++++++++++--------
 3 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/log-json-713a4569878135f4.yaml

diff --git a/manifests/logging.pp b/manifests/logging.pp
index 5baaf6c7..6da58b54 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 designate::logging(
   $use_syslog                    = $::os_service_default,
+  $use_json                      = $::os_service_default,
   $use_stderr                    = $::os_service_default,
   $log_facility                  = $::os_service_default,
   $log_dir                       = $::designate::params::log_dir,
@@ -121,6 +126,7 @@ class designate::logging(
   oslo::log { 'designate_config':
     debug                         => $debug_real,
     use_syslog                    => $use_syslog_real,
+    use_json                      => $use_json,
     use_stderr                    => $use_stderr_real,
     log_dir                       => $log_dir_real,
     syslog_log_facility           => $log_facility_real,
diff --git a/releasenotes/notes/log-json-713a4569878135f4.yaml b/releasenotes/notes/log-json-713a4569878135f4.yaml
new file mode 100644
index 00000000..41c04132
--- /dev/null
+++ b/releasenotes/notes/log-json-713a4569878135f4.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Expose use_json logging parameter, which enables JSON formatted logging.
diff --git a/spec/classes/designate_logging_spec.rb b/spec/classes/designate_logging_spec.rb
index e5dd712f..4fbf54c2 100644
--- a/spec/classes/designate_logging_spec.rb
+++ b/spec/classes/designate_logging_spec.rb
@@ -24,6 +24,7 @@ describe 'designate::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',
@@ -56,11 +57,12 @@ describe 'designate::logging' do
   shared_examples 'basic default logging settings' do
     it 'configures designate logging settings with default values' do
       is_expected.to contain_oslo__log('designate_config').with(
-        :use_syslog   => '<SERVICE DEFAULT>',
-        :use_stderr   => '<SERVICE DEFAULT>',
+        :use_syslog          => '<SERVICE DEFAULT>',
+        :use_json            => '<SERVICE DEFAULT>',
+        :use_stderr          => '<SERVICE DEFAULT>',
         :syslog_log_facility => '<SERVICE DEFAULT>',
-        :log_dir      => '/var/log/designate',
-        :debug        => '<SERVICE DEFAULT>',
+        :log_dir             => '/var/log/designate',
+        :debug               => '<SERVICE DEFAULT>',
       )
     end
   end
@@ -68,11 +70,12 @@ describe 'designate::logging' do
   shared_examples 'basic non-default logging settings' do
     it 'configures designate logging settings with non-default values' do
       is_expected.to contain_oslo__log('designate_config').with(
-        :use_syslog   => true,
-        :use_stderr   => false,
+        :use_syslog          => true,
+        :use_json            => true,
+        :use_stderr          => false,
         :syslog_log_facility => 'LOG_FOO',
-        :log_dir      => '/var/log',
-        :debug        => true,
+        :log_dir             => '/var/log',
+        :debug               => true,
       )
     end
   end