Skip to content

Commit 0ae1506

Browse files
authored
Merge pull request #44904 from libander/RHDEVDOCS-3797-rename
RHDEVDOCS-3797 - Logging Name Change w/ Peer Review Edits v3
2 parents 5c688f9 + 11405e3 commit 0ae1506

File tree

66 files changed

+138
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+138
-173
lines changed

logging/cluster-logging-deploying.adoc

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
:_content-type: ASSEMBLY
22
:context: cluster-logging-deploying
33
[id="cluster-logging-deploying"]
4-
= Installing OpenShift Logging
4+
= Installing the {logging-title}
55
include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

99

10-
You can install OpenShift Logging by deploying
11-
the OpenShift Elasticsearch and Red Hat OpenShift Logging Operators. The OpenShift Elasticsearch Operator
12-
creates and manages the Elasticsearch cluster used by OpenShift Logging.
13-
The Red Hat OpenShift Logging Operator creates and manages the components of the logging stack.
10+
You can install the {logging-title} by deploying the OpenShift Elasticsearch and Red Hat OpenShift Logging Operators. The OpenShift Elasticsearch Operator creates and manages the Elasticsearch cluster used by OpenShift Logging. The {logging} Operator creates and manages the components of the logging stack.
1411

15-
The process for deploying OpenShift Logging to {product-title} involves:
12+
The process for deploying the {logging} to {product-title} involves:
1613

17-
* Reviewing the xref:../logging/config/cluster-logging-storage-considerations#cluster-logging-storage[OpenShift Logging storage considerations].
14+
* Reviewing the xref:../logging/config/cluster-logging-storage-considerations#cluster-logging-storage[{logging-uc} storage considerations].
1815
1916
* Installing the OpenShift Elasticsearch Operator and Red Hat OpenShift Logging Operator using the {product-title} xref:../logging/cluster-logging-deploying.adoc#cluster-logging-deploy-console_cluster-logging-deploying[web console] or xref:../logging/cluster-logging-deploying.adoc#cluster-logging-deploy-cli_cluster-logging-deploying[CLI].
2017
@@ -34,7 +31,7 @@ include::modules/cluster-logging-deploy-console.adoc[leveloffset=+1]
3431

3532
If you plan to use Kibana, you must xref:#cluster-logging-visualizer-indices_cluster-logging-deploying[manually create your Kibana index patterns and visualizations] to explore and visualize data in Kibana.
3633

37-
If your cluster network provider enforces network isolation, xref:#cluster-logging-deploy-multitenant_cluster-logging-deploying[allow network traffic between the projects that contain the OpenShift Logging operators].
34+
If your cluster network provider enforces network isolation, xref:#cluster-logging-deploy-multitenant_cluster-logging-deploying[allow network traffic between the projects that contain the {logging} Operators].
3835

3936

4037
include::modules/cluster-logging-deploy-cli.adoc[leveloffset=+1]
@@ -43,7 +40,7 @@ include::modules/cluster-logging-deploy-cli.adoc[leveloffset=+1]
4340

4441
If you plan to use Kibana, you must xref:#cluster-logging-visualizer-indices_cluster-logging-deploying[manually create your Kibana index patterns and visualizations] to explore and visualize data in Kibana.
4542

46-
If your cluster network provider enforces network isolation, xref:#cluster-logging-deploy-multitenant_cluster-logging-deploying[allow network traffic between the projects that contain the OpenShift Logging operators].
43+
If your cluster network provider enforces network isolation, xref:#cluster-logging-deploy-multitenant_cluster-logging-deploying[allow network traffic between the projects that contain the {logging} Operators].
4744

4845
include::modules/cluster-logging-visualizer-indices.adoc[leveloffset=+2]
4946

logging/cluster-logging-eventrouter.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
The {product-title} Event Router is a pod that watches Kubernetes events and logs them for collection by OpenShift Logging. You must manually deploy the Event Router.
9+
The {product-title} Event Router is a pod that watches Kubernetes events and logs them for collection by the {logging}. You must manually deploy the Event Router.
1010

11-
The Event Router collects events from all projects and writes them to `STDOUT`. Fluentd collects those events and forwards them into the {product-title} Elasticsearch instance. Elasticsearch indexes the events to the `infra` index.
11+
The Event Router collects events from all projects and writes them to `STDOUT`. The collector then forwards those events to the store defined in the `ClusterLogForwarder` custom resource (CR).
1212

1313
[IMPORTANT]
1414
====

logging/cluster-logging-exported-fields.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
The following fields can be present in log records exported by OpenShift Logging. Although log records are typically formatted as JSON objects, the same data model can be applied to other encodings.
9+
The following fields can be present in log records exported by the {logging}. Although log records are typically formatted as JSON objects, the same data model can be applied to other encodings.
1010

1111
To search these fields from Elasticsearch and Kibana, use the full dotted field name when searching. For example, with an Elasticsearch */_search URL*, to look for a Kubernetes pod name, use `/_search/q=kubernetes.pod_name:name-of-my-pod`.
1212

1313
// The logging system can parse JSON-formatted log entries to external systems. These log entries are formatted as a fluentd message with extra fields such as `kubernetes`. The fields exported by the logging system and available for searching from Elasticsearch and Kibana are documented at the end of this document.
1414

1515
include::modules/cluster-logging-exported-fields-top-level-fields.adoc[leveloffset=0]
16+
1617
include::modules/cluster-logging-exported-fields-kubernetes.adoc[leveloffset=0]
18+
1719
// add modules/cluster-logging-exported-fields-openshift when available

logging/cluster-logging-external.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
By default, OpenShift Logging sends container and infrastructure logs to the default internal Elasticsearch log store defined in the `ClusterLogging` custom resource. However, it does not send audit logs to the internal store because it does not provide secure storage. If this default configuration meets your needs, you do not need to configure the Cluster Log Forwarder.
9+
By default, the {logging} sends container and infrastructure logs to the default internal Elasticsearch log store defined in the `ClusterLogging` custom resource. However, it does not send audit logs to the internal store because it does not provide secure storage. If this default configuration meets your needs, you do not need to configure the Cluster Log Forwarder.
1010

1111
To send logs to other log aggregators, you use the {product-title} Cluster Log Forwarder. This API enables you to send container, infrastructure, and audit logs to specific endpoints within or outside your cluster. In addition, you can send different types of logs to various systems so that various individuals can access each type. You can also enable Transport Layer Security (TLS) support to send logs securely, as required by your organization.
1212

@@ -15,7 +15,7 @@ To send logs to other log aggregators, you use the {product-title} Cluster Log F
1515
To send audit logs to the default internal Elasticsearch log store, use the Cluster Log Forwarder as described in xref:../logging/config/cluster-logging-log-store.adoc#cluster-logging-elasticsearch-audit_cluster-logging-store[Forward audit logs to the log store].
1616
====
1717

18-
When you forward logs externally, the Red Hat OpenShift Logging Operator creates or modifies a Fluentd config map to send logs using your desired protocols. You are responsible for configuring the protocol on the external log aggregator.
18+
When you forward logs externally, the {logging} creates or modifies a Fluentd config map to send logs using your desired protocols. You are responsible for configuring the protocol on the external log aggregator.
1919

2020
[IMPORTANT]
2121
====

logging/cluster-logging-release-notes.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ toc::[]
88

99
include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1]
1010

11-
[id="cluster-logging-supported-versions"]
12-
== Supported Versions
13-
include::modules/cluster-logging-supported-versions.adoc[leveloffset=+1]
11+
[id="cluster-logging-ocp-compatibility"]
12+
= {product-title} compatibility
13+
The {logging-title} is provided as an installable component, with a distinct release cycle from the core {product-title}. The link:https://access.redhat.com/support/policy/updates/openshift#logging[Red Hat OpenShift Container Platform Life Cycle Policy] outlines release compatibility.
1414

1515
// Release Notes by version
1616
[id="cluster-logging-release-notes-5-3-0"]

logging/cluster-logging-uninstall.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
You can remove OpenShift Logging from your {product-title} cluster.
9+
You can remove the {logging} from your {product-title} cluster.
1010

1111
// The following include statements pull in the module files that comprise
1212
// the assembly. Include any combination of concept, procedure, or reference

logging/cluster-logging-upgrading.adoc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,9 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
.{product-title} version support for Red Hat OpenShift Logging (RHOL)
10-
[options="header"]
11-
|====
12-
| |4.7 |4.8 |4.9
13-
|RHOL 5.0|X |X |
14-
|RHOL 5.1|X |X |
15-
|RHOL 5.2|X |X |X
16-
|====
9+
[id="cluster-logging-supported-versions"]
10+
== Supported Versions
11+
For version compatibility and support information, see link:https://access.redhat.com/support/policy/updates/openshift#logging[Red Hat OpenShift Container Platform Life Cycle Policy]
1712

1813
To upgrade from cluster logging in {product-title} version 4.6 and earlier to OpenShift Logging 5.x, you update the {product-title} cluster to version 4.7 or 4.8. Then, you update the following operators:
1914

@@ -23,4 +18,5 @@ To upgrade from cluster logging in {product-title} version 4.6 and earlier to Op
2318
To upgrade from a previous version of OpenShift Logging to the current version, you update OpenShift Elasticsearch Operator and Red Hat OpenShift Logging Operator to their current versions.
2419

2520
include::modules/cluster-logging-updating-logging-to-5-0.adoc[leveloffset=+1]
21+
2622
include::modules/cluster-logging-updating-logging-to-5-1.adoc[leveloffset=+1]

logging/cluster-logging-visualizer.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
OpenShift Logging includes a web console for visualizing collected log data. Currently, {product-title} deploys the Kibana console for visualization.
9+
The {logging} includes a web console for visualizing collected log data. Currently, {product-title} deploys the Kibana console for visualization.
1010

1111
Using the log visualizer, you can do the following with your data:
1212

@@ -15,7 +15,7 @@ Using the log visualizer, you can do the following with your data:
1515
* create and view custom dashboards using the *Dashboard* tab.
1616
1717
Use and configuration of the Kibana interface is beyond the scope of this documentation. For more information,
18-
on using the interface, see the link:https://www.elastic.co/guide/en/kibana/6.8/connect-to-elasticsearch.html[Kibana documentation].
18+
on using the interface, see the link:https://www.elastic.co/guide/en/kibana/6.8/connect-to-elasticsearch.html[Kibana documentation].
1919

2020
[NOTE]
2121
====
@@ -29,5 +29,3 @@ The audit logs are not stored in the internal {product-title} Elasticsearch inst
2929

3030
include::modules/cluster-logging-visualizer-indices.adoc[leveloffset=+1]
3131
include::modules/cluster-logging-visualizer-kibana.adoc[leveloffset=+1]
32-
33-

logging/cluster-logging.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
:_content-type: ASSEMBLY
22
:context: cluster-logging
33
[id="cluster-logging"]
4-
= Understanding Red Hat OpenShift Logging
4+
= Understanding the {logging-title}
55
include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

99

1010

1111
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
12-
As a cluster administrator, you can deploy OpenShift Logging to
12+
As a cluster administrator, you can deploy the {logging} to
1313
aggregate all the logs from your {product-title} cluster, such as node system audit logs, application container logs, and infrastructure logs.
14-
OpenShift Logging aggregates these logs from throughout your cluster and stores them in a default log store. You can xref:../logging/cluster-logging-visualizer.adoc#cluster-logging-visualizer[use the Kibana web console to visualize log data].
14+
The {logging} aggregates these logs from throughout your cluster and stores them in a default log store. You can xref:../logging/cluster-logging-visualizer.adoc#cluster-logging-visualizer[use the Kibana web console to visualize log data].
1515

16-
OpenShift Logging aggregates the following types of logs:
16+
The {logging} aggregates the following types of logs:
1717

1818
* `application` - Container logs generated by user applications running in the cluster, except infrastructure container applications.
1919
* `infrastructure` - Logs generated by infrastructure components running in the cluster and {product-title} nodes, such as journal logs. Infrastructure components are pods that run in the `openshift*`, `kube*`, or `default` projects.

logging/config/cluster-logging-collector.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
{product-title} uses Fluentd to collect operations and application logs from your cluster and enriches the data with Kubernetes pod and project metadata.
9+
{logging-title-uc} collects operations and application logs from your cluster and enriches the data with Kubernetes pod and project metadata.
1010

1111
You can configure the CPU and memory limits for the log collector and xref:../../logging/config/cluster-logging-moving-nodes.adoc#cluster-logging-moving[move the log collector pods to specific nodes]. All supported modifications to the log collector can be performed though the `spec.collection.log.fluentd` stanza in the `ClusterLogging` custom resource (CR).
1212

0 commit comments

Comments
 (0)