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 | |
| 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')
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 573cbdd09..d7c83d8e8 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -69,13 +69,15 @@ openshift_logging_kibana_ops_key: "" openshift_logging_kibana_ops_ca: "" openshift_logging_fluentd_nodeselector: "{{ openshift_hosted_logging_fluentd_nodeselector_label | default('logging-infra-fluentd=true') | map_from_pairs }}" -openshift_logging_fluentd_cpu_limit: 100m -openshift_logging_fluentd_memory_limit: 512Mi +openshift_logging_fluentd_cpu_limit: "{{ openshift_hosted_logging_fluentd_cpu_limit | default('100m') }}" +openshift_logging_fluentd_memory_limit: "{{ openshift_hosted_logging_fluentd_memory_limit | default('512Mi') }}" openshift_logging_fluentd_es_copy: false openshift_logging_fluentd_use_journal: "{{ openshift_hosted_logging_use_journal if openshift_hosted_logging_use_journal is defined else (docker_log_driver == 'journald') | ternary(True, False) if docker_log_driver is defined else (openshift.docker.log_driver == 'journald') | ternary(True, False) if openshift.docker.log_driver is defined else openshift.docker.options | search('--log-driver=journald') if openshift.docker.options is defined else default(omit) }}" openshift_logging_fluentd_journal_source: "{{ openshift_hosted_logging_journal_source | default('') }}" openshift_logging_fluentd_journal_read_from_head: "{{ openshift_hosted_logging_journal_read_from_head | default('') }}" openshift_logging_fluentd_hosts: ['--all'] +openshift_logging_fluentd_buffer_queue_limit: "{{ openshift_hosted_logging_fluentd_buffer_queue_limit | default('1024') }}" +openshift_logging_fluentd_buffer_size_limit: "{{ openshift_hosted_logging_fluentd_buffer_size_limit | default('1m') }}" openshift_logging_es_host: logging-es openshift_logging_es_port: 9200 |