[enterprise-4.15] OBSDOCS-594 + OBSDOCS-567: Logging upgrading docs and mCLF note

_topic_maps/_topic_map.yml

@@ -2535,6 +2535,8 @@ Topics:
   File: cluster-logging
 - Name: Installing Logging
   File: cluster-logging-deploying
+- Name: Updating Logging
+  File: cluster-logging-upgrading
   Distros: openshift-enterprise,openshift-origin
 - Name: Configuring your Logging deployment
   Dir: config
@@ -2576,8 +2578,6 @@ Topics:
     File: cluster-logging-collector
   - Name: Collecting and storing Kubernetes events
     File: cluster-logging-eventrouter
-- Name: Updating Logging
-  File: cluster-logging-upgrading
 - Name: Viewing cluster dashboards
   File: cluster-logging-dashboards
 - Name: Logging alerts

_topic_maps/_topic_map_osd.yml

@@ -143,7 +143,7 @@ Topics:
 # cannot list resource "secrets" in API group "" in the namespace "openshift-config"
 #  - Name: Importing simple content access entitlements with Insights Operator
 #    File: insights-operator-simple-access
-# must-gather not supported for customers, per Dustin Row, cannot create resource "namespaces" 
+# must-gather not supported for customers, per Dustin Row, cannot create resource "namespaces"
 # - Name: Gathering data about your cluster
 #   File: gathering-cluster-data
 #   Distros: openshift-dedicated
@@ -165,7 +165,7 @@ Topics:
 #  - Name: Troubleshooting operating system issues
 #    File: troubleshooting-operating-system-issues
 #    Distros: openshift-dedicated
-# cannot patch resource "nodes", "nodes/proxy", "namespaces"  
+# cannot patch resource "nodes", "nodes/proxy", "namespaces"
 #  - Name: Troubleshooting network issues
 #    File: troubleshooting-network-issues
 #    Distros: openshift-dedicated
@@ -858,6 +858,8 @@ Topics:
   File: cluster-logging
 - Name: Installing Logging
   File: cluster-logging-deploying
+- Name: Updating Logging
+  File: cluster-logging-upgrading
 - Name: Accessing the service logs
   File: sd-accessing-the-service-logs
 - Name: Configuring your Logging deployment
@@ -899,8 +901,6 @@ Topics:
     File: cluster-logging-collector
   - Name: Collecting and storing Kubernetes events
     File: cluster-logging-eventrouter
-- Name: Updating Logging
-  File: cluster-logging-upgrading
 - Name: Viewing cluster dashboards
   File: cluster-logging-dashboards
 - Name: Logging alerts

_topic_maps/_topic_map_rosa.yml

@@ -242,7 +242,7 @@ Topics:
 # cannot list resource "secrets" in API group "" in the namespace "openshift-config"
 #  - Name: Importing simple content access entitlements with Insights Operator
 #    File: insights-operator-simple-access
-# must-gather not supported for customers, per Dustin Row, cannot create resource "namespaces" 
+# must-gather not supported for customers, per Dustin Row, cannot create resource "namespaces"
 # - Name: Gathering data about your cluster
 #   File: gathering-cluster-data
 #   Distros: openshift-rosa
@@ -267,7 +267,7 @@ Topics:
 #  - Name: Troubleshooting operating system issues
 #    File: troubleshooting-operating-system-issues
 #    Distros: openshift-rosa
-# cannot patch resource "nodes", "nodes/proxy", "namespaces"  
+# cannot patch resource "nodes", "nodes/proxy", "namespaces"
 #  - Name: Troubleshooting network issues
 #    File: troubleshooting-network-issues
 #    Distros: openshift-rosa
@@ -1029,6 +1029,8 @@ Topics:
   File: cluster-logging
 - Name: Installing Logging
   File: cluster-logging-deploying
+- Name: Updating Logging
+  File: cluster-logging-upgrading
 - Name: Accessing the service logs
   File: sd-accessing-the-service-logs
 - Name: Viewing cluster logs in the AWS Console
@@ -1071,8 +1073,6 @@ Topics:
     File: cluster-logging-collector
   - Name: Collecting and storing Kubernetes events
     File: cluster-logging-eventrouter
-- Name: Updating Logging
-  File: cluster-logging-upgrading
 - Name: Viewing cluster dashboards
   File: cluster-logging-dashboards
 - Name: Logging alerts

logging/cluster-logging-upgrading.adoc

@@ -1,20 +1,31 @@
 :_mod-docs-content-type: ASSEMBLY
 :context: cluster-logging-upgrading
 [id="cluster-logging-upgrading"]
-= Updating OpenShift Logging
+= Updating Logging
 include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-[id="cluster-logging-supported-versions"]
-== Supported Versions
-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]
+There are two types of {logging} updates: minor release updates (5.y.z) and major release updates (5.y).
 
-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:
+[id="cluster-logging-upgrading-minor"]
+== Minor release updates
 
-* From Elasticsearch Operator 4.x to OpenShift Elasticsearch Operator 5.x
-* From Cluster Logging Operator 4.x to Red Hat OpenShift Logging Operator 5.x
+If you installed the {logging} Operators using the *Automatic* update approval option, your Operators receive minor version updates automatically. You do not need to complete any manual update steps.
 
-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.
+If you installed the {logging} Operators using the *Manual* update approval option, you must manually approve minor version updates. For more information, see xref:../operators/admin/olm-upgrading-operators.adoc#olm-approving-pending-upgrade_olm-upgrading-operators[Manually approving a pending Operator update].
 
-include::modules/cluster-logging-updating-logging-to-current.adoc[leveloffset=+1]
+[id="cluster-logging-upgrading-major"]
+== Major release updates
+
+For major version updates you must complete some manual steps.
+
+For major release version compatibility and support information, see link:https://access.redhat.com/support/policy/updates/openshift_operators#platform-agnostic[OpenShift Operator Life Cycles].
+
+include::modules/logging-operator-upgrading-all-ns.adoc[leveloffset=+1]
+
+include::modules/logging-upgrading-clo.adoc[leveloffset=+1]
+
+include::modules/logging-upgrading-loki.adoc[leveloffset=+1]
+
+include::modules/cluster-logging-upgrading-elasticsearch.adoc[leveloffset=+1]

logging/log_collection_forwarding/log-forwarding.adoc

@@ -26,13 +26,17 @@ Administrators can create `ClusterLogForwarder` resources that specify which log
 
 Administrators can also authorize RBAC permissions that define which service accounts and users can access and forward which types of logs.
 
-////
-include::modules/log-forwarding-modes.adoc[leveloffset=+1]
+include::modules/log-forwarding-implementations.adoc[leveloffset=+1]
 
-[id="log-forwarding-enabling-multi-clf-mode"]
-== Enabling multi log forwarder mode for a cluster
+[id="log-forwarding-enabling-multi-clf-feature"]
+== Enabling the multi log forwarder feature for a cluster
 
-To use multi log forwarder mode, you must create a service account and cluster role bindings for that service account. You can then reference the service account in the `ClusterLogForwarder` resource to control access permissions.
+To use the multi log forwarder feature, you must create a service account and cluster role bindings for that service account. You can then reference the service account in the `ClusterLogForwarder` resource to control access permissions.
+
+[IMPORTANT]
+====
+In order to support multi log forwarding in additional namespaces other than the `openshift-logging` namespace, you must xref:../../logging/cluster-logging-upgrading.adoc#logging-operator-upgrading-all-ns_cluster-logging-upgrading[update the Cluster Logging Operator to watch all namespaces]. This functionality is supported by default in new Cluster Logging Operator version 5.8 installations.
+====
 
 include::modules/log-collection-rbac-permissions.adoc[leveloffset=+2]
 
@@ -45,7 +49,6 @@ endif::[]
 * link:https://kubernetes.io/docs/reference/access-authn-authz/rbac/[Using RBAC Authorization Kubernetes documentation]
 
 include::modules/logging-create-clf.adoc[leveloffset=+1]
-////
 
 [id="log-forwarding-audit-logs"]
 == Sending audit logs to the internal log store