diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-15 12:53:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 12:53:48 -0400 |
| commit | 96b98a07e6cc6a7fb437383d5716d8147dd22fcd (patch) | |
| tree | 514a624dc4f992143b74f0a9d9a01c53c1a98094 /roles/openshift_logging | |
| parent | 58960f7599c564c8e72ae8afb8d5a3804a4d7737 (diff) | |
| parent | 1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51 (diff) | |
| download | openshift-96b98a07e6cc6a7fb437383d5716d8147dd22fcd.tar.gz openshift-96b98a07e6cc6a7fb437383d5716d8147dd22fcd.tar.bz2 openshift-96b98a07e6cc6a7fb437383d5716d8147dd22fcd.tar.xz openshift-96b98a07e6cc6a7fb437383d5716d8147dd22fcd.zip | |
Merge pull request #4356 from nhosoi/mux_params-0
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/README.md | 5 | ||||
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md index 0c60ef6fd..dd0f22d4b 100644 --- a/roles/openshift_logging/README.md +++ b/roles/openshift_logging/README.md @@ -55,6 +55,9 @@ When both `openshift_logging_install_logging` and `openshift_logging_upgrade_log - `openshift_logging_fluentd_use_journal`: NOTE: Fluentd will attempt to detect whether or not Docker is using the journald log driver when using the default of empty. - `openshift_logging_fluentd_journal_read_from_head`: If empty, Fluentd will use its internal default, which is false. - `openshift_logging_fluentd_hosts`: List of nodes that should be labeled for Fluentd to be deployed to. Defaults to ['--all']. +- `openshift_logging_fluentd_buffer_queue_limit`: Buffer queue limit for Fluentd. Defaults to 1024. +- `openshift_logging_fluentd_buffer_size_limit`: Buffer chunk limit for Fluentd. Defaults to 1m. + - `openshift_logging_es_host`: The name of the ES service Fluentd should send logs to. Defaults to 'logging-es'. - `openshift_logging_es_port`: The port for the ES service Fluentd should sent its logs to. Defaults to '9200'. @@ -155,3 +158,5 @@ Elasticsearch OPS too, if using an OPS cluster: - `openshift_logging_mux_namespaces`: Default `[]` - additional namespaces to create for _external_ mux clients to associate with their logs - users will need to set this +- `openshift_logging_mux_buffer_queue_limit`: Default `[1024]` - Buffer queue limit for Mux. +- `openshift_logging_mux_buffer_size_limit`: Default `[1m]` - Buffer chunk limit for Mux. diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 3c343c9dc..66d880d23 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -76,6 +76,8 @@ openshift_logging_fluentd_use_journal: "{{ openshift_hosted_logging_use_journal 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: 1024 +openshift_logging_fluentd_buffer_size_limit: 1m openshift_logging_es_host: logging-es openshift_logging_es_port: 9200 |