summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_fluentd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-18 01:27:36 -0800
committerGitHub <noreply@github.com>2017-11-18 01:27:36 -0800
commit71ac647d479768a1e3097a3dde02b9707d175a38 (patch)
treecb38393098c337c9ad4c79b7796d899e070d0e4e /roles/openshift_logging_fluentd
parent57184994bbc61ec02ecb917c6ab81b3cfbf75440 (diff)
parent4b2b0a0b5d5df89c98332a3ae24de336a65c0332 (diff)
downloadopenshift-71ac647d479768a1e3097a3dde02b9707d175a38.tar.gz
openshift-71ac647d479768a1e3097a3dde02b9707d175a38.tar.bz2
openshift-71ac647d479768a1e3097a3dde02b9707d175a38.tar.xz
openshift-71ac647d479768a1e3097a3dde02b9707d175a38.zip
Merge pull request #5652 from ruromero/bz1498398
Automatic merge from submit-queue. Add enclosing <store> tags to sample secure-forward.conf files This fixes [BZ#1498398](https://bugzilla.redhat.com/show_bug.cgi?id=1498398) The examples provided in the documentation to configure the secure forward mention the configuration must be enclosed between the <store> tag. For that I think the examples should include it as well. See [3.6 Documentation](https://docs.openshift.com/container-platform/3.6/install_config/aggregate_logging.html#aggregated-fluentd) ~~~ <store> @type secure_forward self_hostname pod-${HOSTNAME} shared_key thisisasharedkey secure yes enable_strict_verification yes ca_cert_path /etc/fluent/keys/your_ca_cert ca_private_key_path /etc/fluent/keys/your_private_key ca_private_key_passphrase passphrase <server> host ose1.example.com port 24284 </server> <server> host ose2.example.com port 24284 standby </server> <server> host ose3.example.com port 24284 standby </server> </store> ~~~
Diffstat (limited to 'roles/openshift_logging_fluentd')
-rw-r--r--roles/openshift_logging_fluentd/files/secure-forward.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_logging_fluentd/files/secure-forward.conf b/roles/openshift_logging_fluentd/files/secure-forward.conf
index f4483df79..87410c1c5 100644
--- a/roles/openshift_logging_fluentd/files/secure-forward.conf
+++ b/roles/openshift_logging_fluentd/files/secure-forward.conf
@@ -1,3 +1,4 @@
+# <store>
# @type secure_forward
# self_hostname ${HOSTNAME}
@@ -22,3 +23,4 @@
# specify hostlabel for FQDN verification if ipaddress is used for host
# hostlabel server.fqdn.example.com
# </server>
+# </store>