openstack/tripleo-heat-templates
Code Issues Proposed changes

Add option for enabling rsyslog reopenOnTruncate

Browse Source 
reopenOnTruncate ensures rsyslog immediately recognizes when a logrotation happens on a file. When not on, rsyslog will wait for a log file to fill to its original capacity before consuming any additional logs.

Setting this here will ensure that every service configured to work with rsyslog will have this parameter. Default to off because this is an experimental feature

(cherry picked from commit a76bd1a69b)
Change-Id: Iba6a0da80cb75a93537a014dba8e77032101e570
This commit is contained in:
Paul Leimer 2021-05-06 16:24:00 -04:00
parent 68ed34bfe7
commit 4704961718
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/logging/rsyslog-container-puppet.yaml
View File

@ -37,6 +37,10 @@ parameters:
default: {} default: {}
description: Parameters specific to the role description: Parameters specific to the role
type: json type: json
RsyslogReopenOnTruncate:
default: false
description: Rsyslog imfile reopenOnTruncate parameter
type: boolean
RsyslogElasticsearchSetting: RsyslogElasticsearchSetting:
default: {} default: {}
description: Configuration for rsyslog-elasticsearch plugin description: Configuration for rsyslog-elasticsearch plugin
@ -73,7 +77,6 @@ conditions:
- equals: [{get_param: RsyslogElasticsearchTlsCACert}, ''] - equals: [{get_param: RsyslogElasticsearchTlsCACert}, '']
- equals: [{get_param: RsyslogElasticsearchTlsClientCert}, ''] - equals: [{get_param: RsyslogElasticsearchTlsClientCert}, '']
- equals: [{get_param: RsyslogElasticsearchTlsClientKey}, ''] - equals: [{get_param: RsyslogElasticsearchTlsClientKey}, '']
outputs: outputs:
role_data: role_data:
description: Role data for the rsyslog role. description: Role data for the rsyslog role.
@ -182,7 +185,6 @@ outputs:
outname: region outname: region
value: {get_param: KeystoneRegion} value: {get_param: KeystoneRegion}
format: jsonf format: jsonf
tripleo::profile::base::logging::rsyslog::elasticsearch: tripleo::profile::base::logging::rsyslog::elasticsearch:
map_merge: map_merge:
- {get_param: RsyslogElasticsearchSetting} - {get_param: RsyslogElasticsearchSetting}
@ -190,6 +192,10 @@ outputs:
searchIndex: rsyslog-node-index searchIndex: rsyslog-node-index
dynSearchIndex: "on" dynSearchIndex: "on"
errorfile: '/var/log/rsyslog/omelasticsearch.log' errorfile: '/var/log/rsyslog/omelasticsearch.log'
- if:
- {get_param: RsyslogReopenOnTruncate}
- tripleo::profile::base::logging::rsyslog::reopen_on_truncate: "on"
- {}
- if: - if:
- use_tls - use_tls
- tripleo::profile::base::logging::rsyslog::elasticsearch_tls_ca_cert: {get_param: RsyslogElasticsearchTlsCACert} - tripleo::profile::base::logging::rsyslog::elasticsearch_tls_ca_cert: {get_param: RsyslogElasticsearchTlsCACert}