Merge "[queens-only] Fluentd - Fix multiline format" into stable/queens
This commit is contained in:
commit
e149018713
|
@ -173,6 +173,13 @@ parameter_defaults:
|
||||||
LoggingServers:
|
LoggingServers:
|
||||||
- host: 127.0.0.1
|
- host: 127.0.0.1
|
||||||
port: 24224
|
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
|
MonitoringRabbitHost: 127.0.0.1
|
||||||
MonitoringRabbitPort: 5676
|
MonitoringRabbitPort: 5676
|
||||||
MonitoringRabbitPassword: sensu
|
MonitoringRabbitPassword: sensu
|
||||||
|
|
|
@ -123,13 +123,7 @@ resources:
|
||||||
pos_file_path => coalesce($.data.pos_file_path, ''),
|
pos_file_path => coalesce($.data.pos_file_path, ''),
|
||||||
sources => coalesce($.data.sources, {}).flatten()
|
sources => coalesce($.data.sources, {}).flatten()
|
||||||
) ->
|
) ->
|
||||||
$sources.where($ != null).select({
|
$sources.where($ != null)
|
||||||
'type' => 'tail',
|
|
||||||
'tag' => $.tag,
|
|
||||||
'path' => $.path,
|
|
||||||
'format' => $.get('format', $default_format),
|
|
||||||
'pos_file' => $.get('pos_file', $pos_file_path + '/' + $.tag + '.pos')
|
|
||||||
})
|
|
||||||
data:
|
data:
|
||||||
sources:
|
sources:
|
||||||
- {get_attr: [LoggingConfiguration, LoggingDefaultSources]}
|
- {get_attr: [LoggingConfiguration, LoggingDefaultSources]}
|
||||||
|
|
Loading…
Reference in New Issue