diff options
| author |   Lars Kellogg-Stedman <lars@redhat.com> | 2016-10-05 09:28:59 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2016-10-05 13:39:06 -0400 |
| commit | dd162f42c73cc2df5cd2d69f69b007037ca2f7a9 (patch) | |
| tree | d7199e82549c0ede996f6082b049020ae8994008 /puppet/services | |
| parent | ff86a856a61ef2d177e05cb5a26d87f7d5741c78 (diff) | |
restore missing fluentd client functionality
in the great rebase following the JINJA ALL THE THINGS changes we lost
critical functionality in the fluentd client service. This review
restores the missing features.
Change-Id: I7c23f16f81e75f3da6a24587b2eb8385b3e920a4
Closes-bug: 1630692
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]} |