Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions install_config/aggregate_logging.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ administrators can view all logs, but application developers can only view logs
for projects they have permission to view. The stack components communicate
securely.

Aggregated logging is supported using the `json-file` or `journald` driver in Docker.
The Docker log driver is set to `journald` as the default for all nodes. See
Aggregated logging is supported using the `json-file` or `journald` driver in Docker.
The Docker log driver is set to `json-file` as the default for all nodes. See
xref:fluentd-upgrade-source[Updating Fluentd's Log Source After a Docker Log
Driver Update] for more information about switching between `json-file` and `journald`.
Fluentd automatically determines which log driver (`journald` or `json-file`) the container runtime is using.
Fluentd automatically determines which log driver (`journald` or `json-file`) the container runtime is using.

When the log driver is set to `journald`, Fluentd reads journald logs. When set to `json-file` Fluentd reads from *_/var/log/containers_*.
When the log driver is set to `journald`, Fluentd reads journald logs. When set to `json-file` Fluentd reads from *_/var/log/containers_*.

See xref:../install_config/install/host_preparation.adoc#managing-docker-container-logs[Managing
Docker Container Logs] for information on `json-file` logging driver options
Expand All @@ -57,7 +57,7 @@ to manage container logs and prevent filling node disks.

[IMPORTANT]
====
If Docker log-driver is set to journald, there is no log rate throttling with the `journald` driver.
If Docker log-driver is set to journald, there is no log rate throttling with the `journald` driver.
As a result, there is a risk of denial-of-service attacks from rogue containers.
====

Expand Down Expand Up @@ -1775,7 +1775,7 @@ $ curl --key /etc/elasticsearch/secret/admin-key \
[[fluentd-update-source]]
== Changing the Aggregated Logging Driver

By default, aggregated logging uses the `journald` log driver
By default, aggregated logging uses the `journald` log driver
xref:../install_config/install/advanced_install.adoc#configuring-host-variables[unless `json-file` was specified during installation]. You can change the log driver between `journald` and `json-file` as needed.

[IMPORTANT]
Expand All @@ -1795,7 +1795,7 @@ Logging Driver: journald
----

To change between `json-file` and `journald` after installation:

. Modify either the *_/etc/sysconfig/docker_* or *_/etc/docker/daemon.json_* files.
+
For example:
Expand Down
12 changes: 6 additions & 6 deletions install_config/install/advanced_install.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -513,12 +513,12 @@ which may cause invalid configurations. Example usage:
|`openshift_docker_options`
a|This variable configures additional `docker` options within
*_/etc/sysconfig/docker_*, such as options used in
xref:../../install_config/install/host_preparation.adoc#managing-docker-container-logs[Managing Container Logs].
Use `json-file` or `journald`. The default is `journald`.
Example usage:
xref:../../install_config/install/host_preparation.adoc#managing-docker-container-logs[Managing Container Logs].
Use `json-file` or `journald`. The default is `json-file`.
Example usage:
----
"--log-driver json-file --log-opt max-size=1M --log-opt max-file=3"
"--log-driver journald"
"--log-driver journald"
----
Do not use when
xref:advanced-install-docker-system-container[running `docker` as a system container].
Expand Down Expand Up @@ -816,7 +816,7 @@ openshift_docker_additional_registries=example.com

If you are using a Cockpit registry console image other than the default or require a specific version of the console,
specify the desired registry within the
*_/etc/ansible/hosts_* file.
*_/etc/ansible/hosts_* file.

----
openshift_cockpit_deployer_prefix=<registry-name>/<namespace>/
Expand All @@ -839,7 +839,7 @@ For example:
If your image is at *_registry.example.com/openshift3/registry-console_* and you require
version 1.4.1, enter:
----
openshift_cockpit_deployer_prefix='registry.example.com/openshift3/'
openshift_cockpit_deployer_prefix='registry.example.com/openshift3/'
openshift_cockpit_deployer_version='1.4.1'
----

Expand Down