summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-09 20:01:48 -0500
committerGitHub <noreply@github.com>2017-02-09 20:01:48 -0500
commit9e92660ed86623385e48c4960f4db681d86a7a57 (patch)
treed9dbfc5731679cafd51e44b8be81628ef27077ab /roles/openshift_logging
parentce9cf2d55babcc1e2ec8eb4b2d69f944d5e728be (diff)
parentf9daaa768ec415c2ae83a8c42ae35776d996083e (diff)
downloadopenshift-9e92660ed86623385e48c4960f4db681d86a7a57.tar.gz
openshift-9e92660ed86623385e48c4960f4db681d86a7a57.tar.bz2
openshift-9e92660ed86623385e48c4960f4db681d86a7a57.tar.xz
openshift-9e92660ed86623385e48c4960f4db681d86a7a57.zip
Merge pull request #3323 from richm/missing-common-data-model-filter
Bug 1420234 - illegal_argument_exception in Kibana UI.
Diffstat (limited to 'roles/openshift_logging')
-rw-r--r--roles/openshift_logging/files/fluent.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_logging/files/fluent.conf b/roles/openshift_logging/files/fluent.conf
index aa843e983..c0c1c8a44 100644
--- a/roles/openshift_logging/files/fluent.conf
+++ b/roles/openshift_logging/files/fluent.conf
@@ -22,6 +22,7 @@
@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-common-data-model.conf
@include configs.d/openshift/filter-post-*.conf
##