Merge "Enable configuration of omamqp1 plugin"
This commit is contained in:
commit
2732d826c8
@ -58,6 +58,10 @@ parameters:
|
|||||||
type: string
|
type: string
|
||||||
default: 'regionOne'
|
default: 'regionOne'
|
||||||
description: Keystone region for endpoint
|
description: Keystone region for endpoint
|
||||||
|
RsyslogAmqp1Setting:
|
||||||
|
default: {}
|
||||||
|
description: Configuration for rsyslog-omamqp1 plugin
|
||||||
|
type: json
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
@ -67,9 +71,17 @@ conditions:
|
|||||||
use_tls:
|
use_tls:
|
||||||
not:
|
not:
|
||||||
and:
|
and:
|
||||||
|
- equals: [{get_param: RsyslogElasticsearchSetting}, {}]
|
||||||
- equals: [{get_param: RsyslogElasticsearchTlsCACert}, '']
|
- equals: [{get_param: RsyslogElasticsearchTlsCACert}, '']
|
||||||
- equals: [{get_param: RsyslogElasticsearchTlsClientCert}, '']
|
- equals: [{get_param: RsyslogElasticsearchTlsClientCert}, '']
|
||||||
- equals: [{get_param: RsyslogElasticsearchTlsClientKey}, '']
|
- equals: [{get_param: RsyslogElasticsearchTlsClientKey}, '']
|
||||||
|
use_elasticsearch:
|
||||||
|
not:
|
||||||
|
equals: [{get_param: RsyslogElasticsearchSetting}, {}]
|
||||||
|
use_amqp1:
|
||||||
|
not:
|
||||||
|
equals: [{get_param: RsyslogAmqp1Setting}, {}]
|
||||||
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
@ -113,6 +125,7 @@ outputs:
|
|||||||
rsyslog::server::modules:
|
rsyslog::server::modules:
|
||||||
imfile: {}
|
imfile: {}
|
||||||
omelasticsearch: {}
|
omelasticsearch: {}
|
||||||
|
omamqp1: {}
|
||||||
# output setting
|
# output setting
|
||||||
rsyslog::server::templates:
|
rsyslog::server::templates:
|
||||||
rsyslog-node-index:
|
rsyslog-node-index:
|
||||||
@ -179,14 +192,23 @@ outputs:
|
|||||||
outname: region
|
outname: region
|
||||||
value: {get_param: KeystoneRegion}
|
value: {get_param: KeystoneRegion}
|
||||||
format: jsonf
|
format: jsonf
|
||||||
|
- if:
|
||||||
tripleo::profile::base::logging::rsyslog::elasticsearch:
|
- use_elasticsearch
|
||||||
map_merge:
|
- tripleo::profile::base::logging::rsyslog::elasticsearch:
|
||||||
- {get_param: RsyslogElasticsearchSetting}
|
map_merge:
|
||||||
- template: rsyslog-record
|
- {get_param: RsyslogElasticsearchSetting}
|
||||||
searchIndex: rsyslog-node-index
|
- template: rsyslog-record
|
||||||
dynSearchIndex: "on"
|
searchIndex: rsyslog-node-index
|
||||||
errorfile: '/var/log/rsyslog/omelasticsearch.log'
|
dynSearchIndex: "on"
|
||||||
|
errorfile: '/var/log/rsyslog/omelasticsearch.log'
|
||||||
|
- {}
|
||||||
|
- if:
|
||||||
|
- use_amqp1
|
||||||
|
- tripleo::profile::base::logging::rsyslog::amqp1:
|
||||||
|
map_merge:
|
||||||
|
- {get_param: RsyslogAmqp1Setting}
|
||||||
|
- template: rsyslog-record
|
||||||
|
- {}
|
||||||
- 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}
|
||||||
|
Loading…
Reference in New Issue
Block a user