diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-10 09:32:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 09:32:07 -0500 |
| commit | bef3e1dc951699d769b7776129a5bd73fce2ff7c (patch) | |
| tree | 46c6727c44cada4f906dcf7f3ec9637edcc7d801 /roles | |
| parent | e54124bd9d525f06a4800fbd6463c5dba20872fa (diff) | |
| parent | ff02c984c4a0dcc809ec65fe5db530a3ceb81a84 (diff) | |
| download | openshift-bef3e1dc951699d769b7776129a5bd73fce2ff7c.tar.gz openshift-bef3e1dc951699d769b7776129a5bd73fce2ff7c.tar.bz2 openshift-bef3e1dc951699d769b7776129a5bd73fce2ff7c.tar.xz openshift-bef3e1dc951699d769b7776129a5bd73fce2ff7c.zip | |
Merge pull request #3293 from jcantrill/bz_1420204_use_journal_fix
fix bug 1420204. Default openshift_logging_use_journal to empty so fl…
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_logging/README.md | 4 | ||||
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md index f4ec58668..f7b2f7743 100644 --- a/roles/openshift_logging/README.md +++ b/roles/openshift_logging/README.md @@ -51,8 +51,8 @@ When both `openshift_logging_install_logging` and `openshift_logging_upgrade_log - `openshift_logging_fluentd_cpu_limit`: The CPU limit for Fluentd pods. Defaults to '100m'. - `openshift_logging_fluentd_memory_limit`: The memory limit for Fluentd pods. Defaults to '512Mi'. - `openshift_logging_fluentd_es_copy`: Whether or not to use the ES_COPY feature for Fluentd (DEPRECATED). Defaults to 'False'. -- `openshift_logging_fluentd_use_journal`: Whether or not Fluentd should read log entries from Journal. Defaults to 'False'. NOTE: Fluentd will attempt to detect whether or not Docker is using the journald log driver and may overwrite this value. -- `openshift_logging_fluentd_journal_read_from_head`: Whether or not Fluentd will try to read from the head of Journal when first starting up, using this may cause a delay in ES receiving current log records. Defaults to 'False'. +- `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_es_host`: The name of the ES service Fluentd should send logs to. Defaults to 'logging-es'. diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 5a229ee73..73849f46a 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -39,8 +39,8 @@ openshift_logging_fluentd_nodeselector: {'logging-infra-fluentd': 'true'} openshift_logging_fluentd_cpu_limit: 100m openshift_logging_fluentd_memory_limit: 512Mi openshift_logging_fluentd_es_copy: false -openshift_logging_fluentd_use_journal: false -openshift_logging_fluentd_journal_read_from_head: false +openshift_logging_fluentd_use_journal: '' +openshift_logging_fluentd_journal_read_from_head: '' openshift_logging_fluentd_hosts: ['--all'] openshift_logging_es_host: logging-es |