summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2017-08-31 09:55:30 -0700
committerNoriko Hosoi <nhosoi@redhat.com>2017-09-25 10:02:03 -0700
commit7937f5d02fdf56ad12ffe01f4ee71b02c76673c2 (patch)
treeb5630840425a31e5e75a6a5806800c3b2d8ce679
parent33ac861412ab745b0cd36cc42735b92953737661 (diff)
downloadopenshift-7937f5d02fdf56ad12ffe01f4ee71b02c76673c2.tar.gz
openshift-7937f5d02fdf56ad12ffe01f4ee71b02c76673c2.tar.bz2
openshift-7937f5d02fdf56ad12ffe01f4ee71b02c76673c2.tar.xz
openshift-7937f5d02fdf56ad12ffe01f4ee71b02c76673c2.zip
Fluentd: one output tag, one output plugin
Adding <label @OUTPUT> to fluent.conf.
-rw-r--r--roles/openshift_logging_fluentd/templates/fluent.conf.j22
-rw-r--r--roles/openshift_logging_mux/files/fluent.conf2
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