Skip to content

Commit c3812fd

Browse files
authored
Merge pull request #34422 from rolfedh/RHDEVDOCS-3023
RHDEVDOCS-3023 Clean up trailing instances of CLO
2 parents 5509d13 + 2e6c3b4 commit c3812fd

File tree

7 files changed

+22
-7
lines changed

7 files changed

+22
-7
lines changed

administering_a_cluster/dedicated-admin-role.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Privileged and custom Operators cannot be installed.
4444
====
4545

4646
Administrators can only install Operators to the default `openshift-operators`
47-
namespace, except for the Cluster Logging Operator, which requires the
47+
namespace, except for the Red Hat OpenShift Logging Operator, which requires the
4848
`openshift-logging` namespace.
4949

5050
.Additional resources

contributing_to_docs/doc_guidelines.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,7 @@ An Operator's full name must be a proper noun, with each word initially
12571257
capitalized. If it includes a product name, defer the product's capitalization
12581258
style guidelines. For example:
12591259

1260-
- Cluster Logging Operator
1260+
- Red Hat OpenShift Logging Operator
12611261
- Prometheus Operator
12621262
- etcd Operator
12631263
- Node Tuning Operator

logging/cluster-logging-upgrading.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ toc::[]
99

1010
After updating the {product-title} cluster from 4.6 to 4.7, you can update the OpenShift Elasticsearch Operator and Cluster Logging Operator from 4.6 to 5.0.
1111

12+
[NOTE]
13+
====
14+
In OpenShift Logging 5.0 and later, the Cluster Logging Operator is called Red Hat OpenShift Logging Operator.
15+
====
16+
1217
// The following include statements pull in the module files that comprise
1318
// the assembly. Include any combination of concept, procedure, or reference
1419
// modules required to cover the user story. You can also include other

modules/cluster-logging-release-notes-5.0.0.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,11 @@ In the table below, features are marked with the following statuses:
136136

137137
* Previously, when the Cluster Logging Operator (CLO) scaled down the number of Elasticsearch nodes in the `clusterlogging` CR to three nodes, it omitted previously-created nodes that had unique IDs. The OpenShift Elasticsearch Operator rejected the update because it has safeguards that prevent nodes with unique IDs from being removed. Now, when the CLO scales down the number of nodes and updates the Elasticsearch CR, it marks nodes with unique IDs as count 0 instead of omitting them. As a result, users can scale down their cluster to 3 nodes by using the `clusterlogging` CR. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1879150[*BZ#1879150*])
138138

139+
[NOTE]
140+
====
141+
In OpenShift Logging 5.0 and later, the Cluster Logging Operator is called Red Hat OpenShift Logging Operator.
142+
====
143+
139144
* Previously, the Fluentd collector pod went into a crash loop when the `ClusterLogForwarder` had an incorrectly-configured secret. The current release fixes this issue. Now, the `ClusterLogForwarder` validates the secrets and reports any errors in its status field. As a result, it does not cause the Fluentd collector pod to crash. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1888943[*BZ#1888943*])
140145

141146
* Previously, if you updated the Kibana resource configuration in the `clusterlogging` instance to `resource{}`, the resulting nil map caused a panic and changed the status of the OpenShift Elasticsearch Operator to `CrashLoopBackOff`. The current release fixes this issue by initializing the map. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1889573[*BZ#1889573*])

modules/cluster-logging-updating-logging.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77

88
After updating the {product-title} cluster, you can update from cluster logging 4.6 to Red Hat OpenShift Logging 5.0 by changing the subscription for the OpenShift Elasticsearch Operator and the Cluster Logging Operator.
99

10+
[NOTE]
11+
====
12+
In OpenShift Logging 5.0 and later, the Cluster Logging Operator is called Red Hat OpenShift Logging Operator.
13+
====
14+
1015
When you update:
1116

1217
* You must update the OpenShift Elasticsearch Operator before updating the Cluster Logging Operator.

security/certificate_types_descriptions/monitoring-and-cluster-logging-operator-component-certificates.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[id="cert-types-monitoring-and-cluster-logging-operator-component-certificates"]
2-
= Monitoring and Cluster Logging Operator component certificates
2+
= Monitoring and OpenShift Logging Operator component certificates
33
include::modules/common-attributes.adoc[]
44
:context: cert-types-monitoring-and-cluster-logging-operator-component-certificates
55

welcome/oke_about.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ The following table is a summary of the feature availability in {oke} and {produ
249249
| Vertical Pod Autoscaler | Included | Included | Vertical Pod Autoscaler
250250
| Cluster Monitoring (Prometheus) | Included | Included | Cluster Monitoring
251251
| Device Manager (for example, GPU) | Included | Included | N/A
252-
| Log Forwarding (with fluentd) | Included | Included | Cluster Logging Operator (for log forwarding with fluentd)
252+
| Log Forwarding (with fluentd) | Included | Included | Red Hat OpenShift Logging Operator (for log forwarding with fluentd)
253253
| Telemeter and Insights Connected Experience | Included | Included | N/A
254254
s| Feature s| {oke} s| {product-title} s| Operator name
255255
| OpenShift Cloud Manager(OCM) SaaS Service | Included | Included | N/A
@@ -274,7 +274,7 @@ s| Feature s| {oke} s| {product-title} s| Operator name
274274
| Helm | Included | Included | N/A
275275
| User Workload Monitoring | Not Included | Included | N/A
276276
| Metering and Cost Management SaaS Service | Not Included | Included | N/A
277-
| Platform Logging | Not Included | Included | Cluster Logging Operator
277+
| Platform Logging | Not Included | Included | Red Hat OpenShift Logging Operator
278278
| OpenShift Elasticsearch Operator provided by Red Hat | Not Included | Cannot be run standalone | N/A
279279
| Developer Web Console | Not Included | Included | N/A
280280
| Developer Application Catalog | Not Included | Included | N/A
@@ -319,9 +319,9 @@ s| Feature s| {oke} s| {product-title} s| Operator name
319319
| Red Hat Integration - 3Scale provided by Red Hat | Not Included - Requires separate subscription | Not Included - Requires separate subscription | 3scale
320320
| Red Hat Integration - 3Scale APICast gateway provided by Red Hat | Not Included - Requires separate subscription | Not Included - Requires separate subscription | 3scale APIcast
321321
| Red Hat Integration - AMQ Broker | Not Included - Requires separate subscription | Not Included - Requires separate subscription | AMQ Broker
322-
| Red Hat Integration - AMQ Broker LTS | Not Included - Requires separate subscription | Not Included - Requires separate subscription |
322+
| Red Hat Integration - AMQ Broker LTS | Not Included - Requires separate subscription | Not Included - Requires separate subscription |
323323
| Red Hat Integration - AMQ Interconnect | Not Included - Requires separate subscription | Not Included - Requires separate subscription | AMQ Interconnect
324-
| Red Hat Integration - AMQ Online | Not Included - Requires separate subscription | Not Included - Requires separate subscription |
324+
| Red Hat Integration - AMQ Online | Not Included - Requires separate subscription | Not Included - Requires separate subscription |
325325
| Red Hat Integration - AMQ Streams | Not Included - Requires separate subscription | Not Included - Requires separate subscription | AMQ Streams
326326
| Red Hat Integration - Camel K | Not Included - Requires separate subscription | Not Included - Requires separate subscription | Camel K
327327
| Red Hat Integration - Fuse Console | Not Included - Requires separate subscription | Not Included - Requires separate subscription | Fuse Console

0 commit comments

Comments
 (0)