diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2017-06-05 13:46:33 -0700 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2017-06-05 14:32:35 -0700 |
| commit | 1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51 (patch) | |
| tree | 726fdbc0122d6c4d633a0ef064b2562a315cd445 /roles/openshift_logging/defaults | |
| parent | e1b3fe7618186f84136675e24e6c3ec7877ea944 (diff) | |
| download | openshift-1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51.tar.gz openshift-1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51.tar.bz2 openshift-1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51.tar.xz openshift-1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51.zip | |
Reverted most of this pr 4356 except:
adding
openshift_logging_fluentd_buffer_queue_limit: 1024
openshift_logging_fluentd_buffer_size_limit: 1m
openshift_logging_mux_buffer_queue_limit: 1024
openshift_logging_mux_buffer_size_limit: 1m
and setting the matched environment variables.
Diffstat (limited to 'roles/openshift_logging/defaults')
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index d7c83d8e8..95a86354e 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -69,15 +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: "{{ openshift_hosted_logging_fluentd_cpu_limit | default('100m') }}" -openshift_logging_fluentd_memory_limit: "{{ openshift_hosted_logging_fluentd_memory_limit | default('512Mi') }}" +openshift_logging_fluentd_cpu_limit: 100m +openshift_logging_fluentd_memory_limit: 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_fluentd_buffer_queue_limit: 1024 +openshift_logging_fluentd_buffer_size_limit: 1m openshift_logging_es_host: logging-es openshift_logging_es_port: 9200 |