Merge pull request #5503 from nhosoi/output_config_test

Automatic merge from submit-queue

Fluentd: one output tag, one output plugin (origin-aggregated-logging)

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

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