diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2017-07-27 09:50:03 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2017-08-01 11:12:06 -0600 |
| commit | ace4a6cf7c5f9e3abea46a1811d04f4d5a03505f (patch) | |
| tree | 1adeea93f394cca7d1d3e625b66c8af146993743 /roles/openshift_logging_mux | |
| parent | 1990a975c3101389631eaee925760607600a0629 (diff) | |
| download | openshift-ace4a6cf7c5f9e3abea46a1811d04f4d5a03505f.tar.gz openshift-ace4a6cf7c5f9e3abea46a1811d04f4d5a03505f.tar.bz2 openshift-ace4a6cf7c5f9e3abea46a1811d04f4d5a03505f.tar.xz openshift-ace4a6cf7c5f9e3abea46a1811d04f4d5a03505f.zip | |
use mux_client_mode instead of use_mux_client
Instead of the `openshift_logging_use_mux_client` boolean parameter,
use `openshift_logging_mux_client_mode` which will allow us to support
different mux client use cases:
The value `maximal` will cause Fluentd to perform as much of the
processing as possible at the local node. This currently means all of
the processing *except* for the Kubernetes metadata processing, which will
be done by mux. This is the currently recommended mode to use due to
current scaling issues.
The value `minimal` means that Fluentd will do *no* processing at all,
and send the raw logs to mux for processing. This is currently not
recommended to use due to current scaling issues. Ansible will warn
you if you try to use this mode.
`MUX_ALLOW_EXTERNAL` is no longer needed in the mux dc. mux now always
operates to process external logs. The ansible setting
`openshift_logging_mux_allow_external` is still required in order to
set up the mux service to accept connections from outside of the
cluster.
Diffstat (limited to 'roles/openshift_logging_mux')
| -rw-r--r-- | roles/openshift_logging_mux/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/templates/mux.j2 | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 35fc7146f..7a3da9b4c 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -28,6 +28,7 @@ openshift_logging_mux_journal_source: "{{ openshift_hosted_logging_journal_sourc openshift_logging_mux_journal_read_from_head: "{{ openshift_hosted_logging_journal_read_from_head | default('') }}" openshift_logging_mux_allow_external: False +openshift_logging_use_mux: "{{ openshift_logging_mux_allow_external | default(False) }}" openshift_logging_mux_hostname: "{{ 'mux.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true)) }}" openshift_logging_mux_port: 24284 # the namespace to use for undefined projects should come first, followed by any diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index e43d9d397..70afe5cee 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -101,8 +101,6 @@ spec: value: "{{ openshift_logging_mux_port }}" - name: USE_MUX value: "true" - - name: MUX_ALLOW_EXTERNAL - value: "{{ openshift_logging_mux_allow_external | default('false') | lower }}" - name: "BUFFER_QUEUE_LIMIT" value: "{{ openshift_logging_mux_buffer_queue_limit }}" - name: "BUFFER_SIZE_LIMIT" |