diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-06 12:34:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-06 12:34:31 +0000 |
| commit | f9c3481c3ef3e1be5a7c86dc3717d20824745399 (patch) | |
| tree | 8394ed714df72108f17e99475286d8c45f1c6ac9 /puppet/services | |
| parent | ac3ee795d329b7b26acca4762875de4f2bbde8a5 (diff) | |
| parent | dd162f42c73cc2df5cd2d69f69b007037ca2f7a9 (diff) | |
Merge "restore missing fluentd client functionality"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/logging/fluentd-config.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/services.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/logging/fluentd-config.yaml b/puppet/services/logging/fluentd-config.yaml index e051781e..58b423fd 100644 --- a/puppet/services/logging/fluentd-config.yaml +++ b/puppet/services/logging/fluentd-config.yaml @@ -70,7 +70,7 @@ parameters: - tag_pattern: '**' type: record_transformer record: - nodename: '${hostname}' + host: '${hostname}' - tag_pattern: 'openstack.**' type: record_transformer diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml index 7b5fa40c..176fd235 100644 --- a/puppet/services/services.yaml +++ b/puppet/services/services.yaml @@ -78,7 +78,7 @@ outputs: sources: - {get_attr: [LoggingConfiguration, LoggingDefaultSources]} - yaql: - expression: list($.data.where($ != null).select($.get('logging_sources')).where($ != null)) + expression: list($.data.where($ != null).select($.get('logging_source')).where($ != null)) data: {get_attr: [ServiceChain, role_data]} - {get_attr: [LoggingConfiguration, LoggingExtraSources]} default_format: {get_attr: [LoggingConfiguration, LoggingDefaultFormat]} |