summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_mux/templates/mux.j2
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-28 21:01:11 -0400
committerGitHub <noreply@github.com>2017-07-28 21:01:11 -0400
commit1990a975c3101389631eaee925760607600a0629 (patch)
tree71229bbd384693a8ab041bcca7183c5d8a7d5cd3 /roles/openshift_logging_mux/templates/mux.j2
parentb5850e6cae2998e83702f2562ab32d1a1687a572 (diff)
parent61fe309c853946585a2a6a6404ef89dc5ebfb9f0 (diff)
downloadopenshift-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_mux/templates/mux.j2')
-rw-r--r--roles/openshift_logging_mux/templates/mux.j214
1 files changed, 14 insertions, 0 deletions
diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2
index 2b3b64bb8..e43d9d397 100644
--- a/roles/openshift_logging_mux/templates/mux.j2
+++ b/roles/openshift_logging_mux/templates/mux.j2
@@ -66,6 +66,8 @@ spec:
- name: muxcerts
mountPath: /etc/fluent/muxkeys
readOnly: true
+ - name: filebufferstorage
+ mountPath: /var/lib/fluentd
env:
- name: "K8S_HOST_URL"
value: "{{openshift_logging_mux_master_url}}"
@@ -115,6 +117,8 @@ spec:
resourceFieldRef:
containerName: "mux"
resource: limits.memory
+ - name: "FILE_BUFFER_LIMIT"
+ value: "{{ openshift_logging_mux_file_buffer_limit | default('2Gi') }}"
volumes:
- name: config
configMap:
@@ -131,3 +135,13 @@ spec:
- name: muxcerts
secret:
secretName: logging-mux
+ - name: filebufferstorage
+{% if openshift_logging_mux_file_buffer_storage_type == 'pvc' %}
+ persistentVolumeClaim:
+ claimName: {{ openshift_logging_mux_file_buffer_pvc_name }}
+{% elif openshift_logging_mux_file_buffer_storage_type == 'hostmount' %}
+ hostPath:
+ path: "/var/log/fluentd"
+{% else %}
+ emptydir: {}
+{% endif %}