openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[queens-only] Fluentd - Fix multiline format" into stable/queens

This commit is contained in:
Zuul 2020-07-10 23:34:18 +00:00 committed by Gerrit Code Review
parent 2f3ffcc652 c66921b4fb
commit e149018713
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ci/environments/scenario001-multinode-containers.yaml
View File

@ -173,6 +173,13 @@ parameter_defaults:
LoggingServers:
- host: 127.0.0.1
port: 24224
LoggingExtraSources:
- format: multiline
format_firstline: /(?<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d+) (?<pid>\d+) (?<priority>\S+) (?<component>\S+) (?<message> Traceback .*)$/
format1: /(?<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d+) (?<pid>\d+) (?<priority>\S+) (?<component>\S+) (?<message> .*)$/
format2: /(?<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d+) (?<pid>\d+) (?<priority>\S+) (?<component>\S+) (?<traceback> \S.*)$/
path: /var/log/nova/nova-conductor.log
tag: openstack.nova.conductor.traceback
MonitoringRabbitHost: 127.0.0.1
MonitoringRabbitPort: 5676
MonitoringRabbitPassword: sensu

8
common/services/role.role.j2.yaml
View File

@ -123,13 +123,7 @@ resources:
pos_file_path => coalesce($.data.pos_file_path, ''),
sources => coalesce($.data.sources, {}).flatten()
) ->
$sources.where($ != null).select({
'type' => 'tail',
'tag' => $.tag,
'path' => $.path,
'format' => $.get('format', $default_format),
'pos_file' => $.get('pos_file', $pos_file_path + '/' + $.tag + '.pos')
})
$sources.where($ != null)
data:
sources:
- {get_attr: [LoggingConfiguration, LoggingDefaultSources]}