Merge "Add more metadata to logs" into stable/train

This commit is contained in:
Zuul 2020-10-13 01:02:00 +00:00 committed by Gerrit Code Review
commit c385f04db5
1 changed files with 23 additions and 1 deletions

View File

@ -53,6 +53,14 @@ parameters:
default: ''
description: Contains content of the private key corresponding to the cert RsyslogElasticsearchTlsClientCert.
type: string
CloudName:
default: overcloud.localdomain
description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
type: string
KeystoneRegion:
type: string
default: 'regionOne'
description: Keystone region for endpoint
resources:
ContainersCommon:
@ -136,6 +144,7 @@ outputs:
- property:
outname: '@timestamp'
name: timereported
dateFormat: 'rfc3339'
format: jsonf
- property:
outname: host
@ -143,7 +152,7 @@ outputs:
format: jsonf
- property:
outname: severity
name: syslogseverity-text
name: syslogseverity
format: jsonf
- property:
outname: facility
@ -161,6 +170,19 @@ outputs:
outname: message
name: msg
format: jsonf
- property:
outname: file
name: '$!metadata!filename'
format: jsonf
- constant:
outname: cloud
value: {get_param: CloudName}
format: jsonf
- constant:
outname: region
value: {get_param: KeystoneRegion}
format: jsonf
tripleo::profile::base::logging::rsyslog::elasticsearch:
map_merge:
- {get_param: RsyslogElasticsearchSetting}