diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-23 20:20:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 20:20:41 -0500 |
| commit | f4061b9ad327ddd294b16285462c5bdde10945a6 (patch) | |
| tree | e7e1d824f9d81b1db34a02c1bb32eb245fac9c9c /roles/openshift_logging/files/fluent.conf | |
| parent | dc9786a20225e970edf45daf2038e419f2fe7802 (diff) | |
| parent | 68f8a50abc0acd3005dbd98d0e7964bcf7900e26 (diff) | |
| download | openshift-f4061b9ad327ddd294b16285462c5bdde10945a6.tar.gz openshift-f4061b9ad327ddd294b16285462c5bdde10945a6.tar.bz2 openshift-f4061b9ad327ddd294b16285462c5bdde10945a6.tar.xz openshift-f4061b9ad327ddd294b16285462c5bdde10945a6.zip | |
Merge pull request #3509 from ewolinetz/logging_component_subroles
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/files/fluent.conf')
| -rw-r--r-- | roles/openshift_logging/files/fluent.conf | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/roles/openshift_logging/files/fluent.conf b/roles/openshift_logging/files/fluent.conf deleted file mode 100644 index aeaa705ee..000000000 --- a/roles/openshift_logging/files/fluent.conf +++ /dev/null @@ -1,35 +0,0 @@ -# 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 -## - -## 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> |