openstack/puppet-gnocchi
Code Issues Proposed changes

Expose use_json logging option

Browse Source 
It enables JSON-formatted logging from oslo.log.

Change-Id: Ic7713712d8f224e690435ead6dabe40bd31d8ae3
This commit is contained in:
Juan Antonio Osorio Robles
2017-11-27 14:35:08 +02:00
parent 579a17a4f4
commit 439646467e
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/logging.pp
View File

@@ -12,6 +12,10 @@
# (Optional) Use syslog for logging. # (Optional) Use syslog for logging.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*use_json*]
# (Optional) Use json for logging.
# Defaults to $::os_service_default
#
# [*use_stderr*] # [*use_stderr*]
# (optional) Use stderr for logging # (optional) Use stderr for logging
# Defaults to $::os_service_default # Defaults to $::os_service_default
@@ -90,6 +94,7 @@
# #
class gnocchi::logging( class gnocchi::logging(
$use_syslog = $::os_service_default, $use_syslog = $::os_service_default,
$use_json = $::os_service_default,
$use_stderr = $::os_service_default, $use_stderr = $::os_service_default,
$log_facility = $::os_service_default, $log_facility = $::os_service_default,
$log_dir = '/var/log/gnocchi', $log_dir = '/var/log/gnocchi',
@@ -169,6 +174,7 @@ class gnocchi::logging(
oslo::log { 'gnocchi_config': oslo::log { 'gnocchi_config':
debug => $debug_real, debug => $debug_real,
use_syslog => $use_syslog_real, use_syslog => $use_syslog_real,
use_json => $use_json,
use_stderr => $use_stderr_real, use_stderr => $use_stderr_real,
log_dir => $log_dir_real, log_dir => $log_dir_real,
syslog_log_facility => $log_facility_real, syslog_log_facility => $log_facility_real,

4
releasenotes/notes/log-json-514a919eec6e2b8e.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
features:
- |
Expose use_json logging parameter, which enables JSON formatted logging.

3
spec/classes/gnocchi_logging_spec.rb
View File

@@ -10,6 +10,7 @@ describe 'gnocchi::logging' do
let :log_params do let :log_params do
{ {
:use_syslog => true, :use_syslog => true,
:use_json => true,
:use_stderr => false, :use_stderr => false,
:log_facility => 'LOG_FOO', :log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
@@ -34,6 +35,7 @@ describe 'gnocchi::logging' do
it 'configures gnocchi logging settings with default values' do it 'configures gnocchi logging settings with default values' do
is_expected.to contain_oslo__log('gnocchi_config').with( is_expected.to contain_oslo__log('gnocchi_config').with(
:use_syslog => '<SERVICE DEFAULT>', :use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>', :use_stderr => '<SERVICE DEFAULT>',
:syslog_log_facility => '<SERVICE DEFAULT>', :syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/gnocchi', :log_dir => '/var/log/gnocchi',
@@ -46,6 +48,7 @@ describe 'gnocchi::logging' do
it 'configures gnocchi logging settings with non-default values' do it 'configures gnocchi logging settings with non-default values' do
is_expected.to contain_oslo__log('gnocchi_config').with( is_expected.to contain_oslo__log('gnocchi_config').with(
:use_syslog => true, :use_syslog => true,
:use_json => true,
:use_stderr => false, :use_stderr => false,
:syslog_log_facility => 'LOG_FOO', :syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',