Add support for additional log sources for rsyslog

This change introduces the new RsyslogExtraLoggingSources parameter
which allows users to transfer additional log files using rsyslog.

Change-Id: Ic6339945690339b6fb50dbfbb21026195d6a5421
This commit is contained in:
Takashi Kajinami 2021-03-19 14:15:13 +09:00
parent a170fc4c75
commit a1b967fafe

@ -58,6 +58,12 @@ parameters:
default: '' default: ''
description: Contains content of the private key corresponding to the cert RsyslogElasticsearchTlsClientCert. description: Contains content of the private key corresponding to the cert RsyslogElasticsearchTlsClientCert.
type: string type: string
RsyslogExtraLoggingSource:
type: json
default: []
description: Additional source log file(s) loaded by the rsyslog service
tags:
- role_specific
CloudName: CloudName:
default: overcloud.localdomain default: overcloud.localdomain
description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
@ -84,6 +90,8 @@ resources:
ContainersCommon: ContainersCommon:
type: ../containers-common.yaml type: ../containers-common.yaml
# Merging role-specific parameters (RoleParameters) with the default parameters.
# RoleParameters will have the precedence over the default parameters.
RoleParametersValue: RoleParametersValue:
type: OS::Heat::Value type: OS::Heat::Value
properties: properties:
@ -93,10 +101,13 @@ resources:
- map_replace: - map_replace:
- ContainerRsyslogImage: ContainerRsyslogImage - ContainerRsyslogImage: ContainerRsyslogImage
ContainerRsyslogConfigImage: ContainerRsyslogConfigImage ContainerRsyslogConfigImage: ContainerRsyslogConfigImage
extra_logging_sources: RsyslogExtraLoggingSources
- values: {get_param: [RoleParameters]} - values: {get_param: [RoleParameters]}
- values: - values:
ContainerRsyslogImage: {get_param: ContainerRsyslogImage} ContainerRsyslogImage: {get_param: ContainerRsyslogImage}
ContainerRsyslogConfigImage: {get_param: ContainerRsyslogConfigImage} ContainerRsyslogConfigImage: {get_param: ContainerRsyslogConfigImage}
RsyslogExtraLoggingSource: {get_param: RsyslogExtraLoggingSource}
conditions: conditions:
use_tls: use_tls:
not: not:
@ -263,6 +274,8 @@ outputs:
- tripleo::profile::base::logging::rsyslog::elasticsearch_tls_ca_cert: {get_param: RsyslogElasticsearchTlsCACert} - tripleo::profile::base::logging::rsyslog::elasticsearch_tls_ca_cert: {get_param: RsyslogElasticsearchTlsCACert}
tripleo::profile::base::logging::rsyslog::elasticsearch_tls_client_cert: {get_param: RsyslogElasticsearchTlsClientCert} tripleo::profile::base::logging::rsyslog::elasticsearch_tls_client_cert: {get_param: RsyslogElasticsearchTlsClientCert}
tripleo::profile::base::logging::rsyslog::elasticsearch_tls_client_key: {get_param: RsyslogElasticsearchTlsClientKey} tripleo::profile::base::logging::rsyslog::elasticsearch_tls_client_key: {get_param: RsyslogElasticsearchTlsClientKey}
service_config_settings:
tripleo_logging_sources_rsyslog: {get_attr: [RoleParametersValue, value, extra_logging_sources]}
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config:
config_volume: rsyslog config_volume: rsyslog