diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2017-05-24 09:50:07 -0700 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2017-06-02 10:55:29 -0700 |
| commit | 49d8b7e373f00dfcce2940cdd22d4d60471f84c4 (patch) | |
| tree | 96f959198339d5d500ce37a521387901f14747dc /roles/openshift_logging_mux | |
| parent | 47a269e171e81fc5e9e0c9960a6306e47b253c54 (diff) | |
| download | openshift-49d8b7e373f00dfcce2940cdd22d4d60471f84c4.tar.gz openshift-49d8b7e373f00dfcce2940cdd22d4d60471f84c4.tar.bz2 openshift-49d8b7e373f00dfcce2940cdd22d4d60471f84c4.tar.xz openshift-49d8b7e373f00dfcce2940cdd22d4d60471f84c4.zip | |
Introducing fluentd/mux buffer_queue_limit, buffer_size_limit, cpu_limit, and memory_limit.
Default values:
openshift_logging_fluentd_cpu_limit: 100m
openshift_logging_fluentd_memory_limit: 512Mi
openshift_logging_fluentd_buffer_queue_limit: 1024
openshift_logging_fluentd_buffer_size_limit: 16m
openshift_logging_fluentd_buffer_size_limit: 1m
openshift_logging_mux_cpu_limit: 500m
openshift_logging_mux_memory_limit: 1Gi
openshift_logging_mux_buffer_queue_limit: 1024
openshift_logging_mux_buffer_size_limit: 1m
Diffstat (limited to 'roles/openshift_logging_mux')
| -rw-r--r-- | roles/openshift_logging_mux/defaults/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/templates/mux.j2 | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 10fa4372c..3c706b1ca 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -9,8 +9,10 @@ openshift_logging_mux_namespace: logging ### Common settings openshift_logging_mux_nodeselector: "{{ openshift_hosted_logging_mux_nodeselector_label | default('') | map_from_pairs }}" -openshift_logging_mux_cpu_limit: 500m -openshift_logging_mux_memory_limit: 1Gi +openshift_logging_mux_cpu_limit: "{{ openshift_hosted_logging_mux_cpu_limit | default('500m') }}" +openshift_logging_mux_memory_limit: "{{ openshift_hosted_logging_mux_memory_limit | default('1Gi') }}" +openshift_logging_mux_buffer_queue_limit: "{{ openshift_hosted_logging_mux_buffer_queue_limit | default('1024') }}" +openshift_logging_mux_buffer_size_limit: "{{ openshift_hosted_logging_mux_buffer_size_limit | default('1m') }}" openshift_logging_mux_replicas: 1 diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index 770a2bfbd..e51cfcbc6 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -103,6 +103,10 @@ spec: value: "true" - name: MUX_ALLOW_EXTERNAL value: "{{ openshift_logging_mux_allow_external | default('false') }}" + - name: "BUFFER_QUEUE_LIMIT" + value: "{{ openshift_logging_mux_buffer_queue_limit }}" + - name: "BUFFER_SIZE_LIMIT" + value: "{{ openshift_logging_mux_buffer_size_limit }}" volumes: - name: config configMap: |