diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-28 21:01:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-28 21:01:11 -0400 |
| commit | 1990a975c3101389631eaee925760607600a0629 (patch) | |
| tree | 71229bbd384693a8ab041bcca7183c5d8a7d5cd3 /roles/openshift_logging_fluentd | |
| parent | b5850e6cae2998e83702f2562ab32d1a1687a572 (diff) | |
| parent | 61fe309c853946585a2a6a6404ef89dc5ebfb9f0 (diff) | |
| download | openshift-1990a975c3101389631eaee925760607600a0629.tar.gz openshift-1990a975c3101389631eaee925760607600a0629.tar.bz2 openshift-1990a975c3101389631eaee925760607600a0629.tar.xz openshift-1990a975c3101389631eaee925760607600a0629.zip | |
Merge pull request #4943 from jcantrill/file_buffer_master
Impl fluentd file buffer
Diffstat (limited to 'roles/openshift_logging_fluentd')
| -rw-r--r-- | roles/openshift_logging_fluentd/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging_fluentd/templates/fluentd.j2 | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/roles/openshift_logging_fluentd/defaults/main.yml b/roles/openshift_logging_fluentd/defaults/main.yml index ce7cfc433..be9943b0d 100644 --- a/roles/openshift_logging_fluentd/defaults/main.yml +++ b/roles/openshift_logging_fluentd/defaults/main.yml @@ -57,3 +57,5 @@ openshift_logging_fluentd_es_copy: false #fluentd_config_contents: #fluentd_throttle_contents: #fluentd_secureforward_contents: + +openshift_logging_fluentd_file_buffer_limit: 1Gi diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2 index 970e5c2a5..a4cf9a149 100644 --- a/roles/openshift_logging_fluentd/templates/fluentd.j2 +++ b/roles/openshift_logging_fluentd/templates/fluentd.j2 @@ -62,6 +62,8 @@ spec: - name: dockerdaemoncfg mountPath: /etc/docker readOnly: true + - name: filebufferstorage + mountPath: /var/lib/fluentd {% if openshift_logging_use_mux_client | bool %} - name: muxcerts mountPath: /etc/fluent/muxkeys @@ -112,6 +114,8 @@ spec: resource: limits.memory - name: "USE_MUX_CLIENT" value: "{{ openshift_logging_use_mux_client | default('false') | lower }}" + - name: "FILE_BUFFER_LIMIT" + value: "{{ openshift_logging_fluentd_file_buffer_limit | default('1Gi') }}" volumes: - name: runlogjournal hostPath: @@ -145,3 +149,6 @@ spec: secret: secretName: logging-mux {% endif %} + - name: filebufferstorage + hostPath: + path: "/var/lib/fluentd" |