Adding the defaults for openshift_logging_fluentd_{cpu,memory}_limit to roles/openshift_logging_fluentd/defaults/main.yml.

Adding the description for openshift_hosted_logging_fluentd_{cpu,memory}_limit to README.md.

Replaced openshift_hosted_logging_mux_.* with openshift_logging_mux_.*.

3 files changed, 8 insertions, 6 deletions

diff --git a/roles/openshift_hosted_logging/README.md b/roles/openshift_hosted_logging/README.md
index 12ffe777d..ad1e9d92b 100644
--- a/roles/openshift_hosted_logging/README.md
+++ b/roles/openshift_hosted_logging/README.md
@@ -25,6 +25,8 @@
 - openshift_hosted_logging_use_journal: If this is unset or empty, logging will try to figure out from docker which log driver it is using (json-file or journald).  You can set this param to "true" or "false" to force logging to use journal or not (but make sure you are sure which one docker is using).
 - openshift_hosted_logging_journal_source: By default, if this param is unset or empty, logging will use `/var/log/journal` if it exists, or `/run/log/journal` if not.  You can use this param to force logging to use a different location.
 - openshift_hosted_logging_journal_read_from_head: Set to `true` to have fluentd read from the beginning of the journal, to get historical log data.  Default is `false`.  *WARNING* Using `true` may take several minutes or even hours, depending on the size of the journal, until any new records show up in Elasticsearch, and will cause fluentd to consume a lot of CPU and RAM resources.
+- openshift_hosted_logging_fluentd_cpu_limit: The CPU limit for Fluentd pods. Defaults to "100m".
+- openshift_hosted_logging_fluentd_memory_limit: The memory limit for Fluentd pods. Defaults to '512Mi'.
 
 When `openshift_hosted_logging_enable_ops_cluster` is `True`, there are some
 additional vars.  These work the same as above for their non-ops counterparts,
diff --git a/roles/openshift_logging_fluentd/defaults/main.yml b/roles/openshift_logging_fluentd/defaults/main.yml
index 228196d74..41481f87e 100644
--- a/roles/openshift_logging_fluentd/defaults/main.yml
+++ b/roles/openshift_logging_fluentd/defaults/main.yml
@@ -8,8 +8,8 @@ openshift_logging_fluentd_namespace: logging
 
 ### Common settings
 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_hosts: ['--all']
 
 # float time in seconds to wait between node labelling
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml
index 3c706b1ca..52d1c5320 100644
--- a/roles/openshift_logging_mux/defaults/main.yml
+++ b/roles/openshift_logging_mux/defaults/main.yml
@@ -9,10 +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: "{{ 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_cpu_limit: "{{ openshift_logging_mux_cpu_limit | default('500m') }}"
+openshift_logging_mux_memory_limit: "{{ openshift_logging_mux_memory_limit | default('1Gi') }}"
+openshift_logging_mux_buffer_queue_limit: "{{ openshift_logging_mux_buffer_queue_limit | default('1024') }}"
+openshift_logging_mux_buffer_size_limit: "{{ openshift_logging_mux_buffer_size_limit | default('1m') }}"
 
 openshift_logging_mux_replicas: 1