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

It enables JSON-formatted logging from oslo.log.

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

diff --git a/manifests/logging.pp b/manifests/logging.pp
index 8fa2e21..239782f 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -13,6 +13,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
@@ -89,6 +93,7 @@
 #
 class vitrage::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/vitrage',
@@ -123,6 +128,7 @@ class vitrage::logging(
   oslo::log { 'vitrage_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-56713a3350875e18.yaml b/releasenotes/notes/log-json-56713a3350875e18.yaml
new file mode 100644
index 0000000..41c0413
--- /dev/null
+++ b/releasenotes/notes/log-json-56713a3350875e18.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Expose use_json logging parameter, which enables JSON formatted logging.
diff --git a/spec/classes/vitrage_logging_spec.rb b/spec/classes/vitrage_logging_spec.rb
index 41a75fa..b69f7df 100644
--- a/spec/classes/vitrage_logging_spec.rb
+++ b/spec/classes/vitrage_logging_spec.rb
@@ -24,6 +24,7 @@ describe 'vitrage::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 'vitrage::logging' do
     it 'configures vitrage logging settings with default values' do
       is_expected.to contain_oslo__log('vitrage_config').with(
         :use_syslog          => '<SERVICE DEFAULT>',
+        :use_json            => '<SERVICE DEFAULT>',
         :use_stderr          => '<SERVICE DEFAULT>',
         :syslog_log_facility => '<SERVICE DEFAULT>',
         :log_dir             => '/var/log/vitrage',
@@ -69,6 +71,7 @@ describe 'vitrage::logging' do
     it 'configures vitrage logging settings with non-default values' do
       is_expected.to contain_oslo__log('vitrage_config').with(
         :use_syslog          => true,
+        :use_json            => true,
         :use_stderr          => false,
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',