diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-26 16:12:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 16:12:55 -0700 |
| commit | 5280a900e1c151b59f5e5c95b882e284f94c0d40 (patch) | |
| tree | 923a37922c311272685e01c435356f4df1345a0a | |
| parent | 350d40f23efc825a62f3d414048dfd6b71a222d4 (diff) | |
| parent | 7937f5d02fdf56ad12ffe01f4ee71b02c76673c2 (diff) | |
| download | openshift-5280a900e1c151b59f5e5c95b882e284f94c0d40.tar.gz openshift-5280a900e1c151b59f5e5c95b882e284f94c0d40.tar.bz2 openshift-5280a900e1c151b59f5e5c95b882e284f94c0d40.tar.xz openshift-5280a900e1c151b59f5e5c95b882e284f94c0d40.zip | |
Merge pull request #5503 from nhosoi/output_config_test
Automatic merge from submit-queue
Fluentd: one output tag, one output plugin (origin-aggregated-logging)
| -rw-r--r-- | roles/openshift_logging_fluentd/templates/fluent.conf.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/files/fluent.conf | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_logging_fluentd/templates/fluent.conf.j2 b/roles/openshift_logging_fluentd/templates/fluent.conf.j2 index 46de94d60..6e07b403a 100644 --- a/roles/openshift_logging_fluentd/templates/fluent.conf.j2 +++ b/roles/openshift_logging_fluentd/templates/fluent.conf.j2 @@ -49,7 +49,9 @@ @include configs.d/openshift/filter-viaq-data-model.conf @include configs.d/openshift/filter-post-*.conf ## +</label> +<label @OUTPUT> ## matches @include configs.d/openshift/output-pre-*.conf @include configs.d/openshift/output-operations.conf diff --git a/roles/openshift_logging_mux/files/fluent.conf b/roles/openshift_logging_mux/files/fluent.conf index aeaa705ee..bf61c9811 100644 --- a/roles/openshift_logging_mux/files/fluent.conf +++ b/roles/openshift_logging_mux/files/fluent.conf @@ -25,7 +25,9 @@ @include configs.d/openshift/filter-viaq-data-model.conf @include configs.d/openshift/filter-post-*.conf ## +</label> +<label @OUTPUT> ## matches @include configs.d/openshift/output-pre-*.conf @include configs.d/openshift/output-operations.conf |