diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-06 09:23:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 09:23:18 -0800 |
| commit | fa6c7cc621ff05b35eadc846d3960ac2dc1009c0 (patch) | |
| tree | 43e1137f4034514e88194e9109640f7b60817a2a /roles/openshift_logging_mux/files/2.x/fluent.conf | |
| parent | 75e1741b2068f6b01a9e77db0c0518f5c0154822 (diff) | |
| parent | 2e1598117fe896033a3f290820c8e8dfbc42bd81 (diff) | |
| download | openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.tar.gz openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.tar.bz2 openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.tar.xz openshift-fa6c7cc621ff05b35eadc846d3960ac2dc1009c0.zip | |
Merge pull request #6628 from ewolinetz/es_5.x_opt_in
Automatic merge from submit-queue.
Es 5.x opt in
FYI @richm @jcantrill
Diffstat (limited to 'roles/openshift_logging_mux/files/2.x/fluent.conf')
| -rw-r--r-- | roles/openshift_logging_mux/files/2.x/fluent.conf | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/roles/openshift_logging_mux/files/2.x/fluent.conf b/roles/openshift_logging_mux/files/2.x/fluent.conf new file mode 100644 index 000000000..bf61c9811 --- /dev/null +++ b/roles/openshift_logging_mux/files/2.x/fluent.conf @@ -0,0 +1,37 @@ +# This file is the fluentd configuration entrypoint. Edit with care. + +@include configs.d/openshift/system.conf + +# In each section below, pre- and post- includes don't include anything initially; +# they exist to enable future additions to openshift conf as needed. + +## sources +## ordered so that syslog always runs last... +@include configs.d/openshift/input-pre-*.conf +@include configs.d/dynamic/input-docker-*.conf +@include configs.d/dynamic/input-syslog-*.conf +@include configs.d/openshift/input-post-*.conf +## + +<label @INGRESS> +## filters + @include configs.d/openshift/filter-pre-*.conf + @include configs.d/openshift/filter-retag-journal.conf + @include configs.d/openshift/filter-k8s-meta.conf + @include configs.d/openshift/filter-kibana-transform.conf + @include configs.d/openshift/filter-k8s-flatten-hash.conf + @include configs.d/openshift/filter-k8s-record-transform.conf + @include configs.d/openshift/filter-syslog-record-transform.conf + @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 + @include configs.d/openshift/output-applications.conf + # no post - applications.conf matches everything left +## +</label> |