openshift · ahardin-rh · Feb 25, 2021 · Feb 25, 2021
diff --git a/logging/cluster-logging-exported-fields.adoc b/logging/cluster-logging-exported-fields.adoc
@@ -47,6 +47,3 @@ include::modules/cluster-logging-exported-fields-ovirt.adoc[leveloffset=+1]
 include::modules/cluster-logging-exported-fields-aushape.adoc[leveloffset=+1]
 
 include::modules/cluster-logging-exported-fields-tlog.adoc[leveloffset=+1]
-
-
-
diff --git a/logging/cluster-logging-upgrading.adoc b/logging/cluster-logging-upgrading.adoc
@@ -7,7 +7,7 @@ toc::[]
 
 
 
-After updating the {product-title} cluster from 4.6 to 4.7, you can update the Elasticsearch Operator and Cluster Logging Operator from 4.6 to 4.7.
+After updating the {product-title} cluster from 4.6 to 4.7, you can update the Elasticsearch Operator and Cluster Logging Operator from 4.6 to 5.0.
 
 // The following include statements pull in the module files that comprise
 // the assembly. Include any combination of concept, procedure, or reference

diff --git a/modules/cluster-logging-configuring-image-about.adoc b/modules/cluster-logging-configuring-image-about.adoc
@@ -18,8 +18,8 @@ $ oc -n openshift-logging set env deployment/cluster-logging-operator --list | g
 
 [source,terminal]
 ----
-FLUENTD_IMAGE=registry.redhat.io/openshift4/ose-logging-fluentd@sha256:ffdf79da7386871d2bc24cd937e02284b30f85a9979dc8c635fb73021cbca2f3 <1>
-CURATOR_IMAGE=registry.redhat.io/openshift4/ose-logging-curator5@sha256:b57c5135d72a01170e1cef26af1ea79d80ce52934456cfe363280ecbe795f21a <2>
+FLUENTD_IMAGE=registry.redhat.io/openshift-logging/fluentd-rhel8:latest@sha256:ffdf79da7386871d2bc24cd937e02284b30f85a9979dc8c635fb73021cbca2f3 <1>
+CURATOR_IMAGE=registry.redhat.io/openshift-logging/logging-curator5-rhel8:latest@sha256:b57c5135d72a01170e1cef26af1ea79d80ce52934456cfe363280ecbe795f21a <2>
 ----
 <1> *FLUENTD_IMAGE* deploys Fluentd.
 <2> *CURATOR_IMAGE* deploys Curator.
@@ -29,15 +29,4 @@ CURATOR_IMAGE=registry.redhat.io/openshift4/ose-logging-curator5@sha256:b57c5135
 Promtail is not officially supported at this time.
 ====
 
-////
-RSYSLOG_IMAGE=registry.redhat.io/openshift4/ose-logging-rsyslog:v4.3 <6>
-<6> *RSYSLOG_IMAGE* deploys Rsyslog.
-
-
-[NOTE]
-====
-The Rsyslog log collector is in Technology Preview.
-====
-////
-
 The values might be different depending on your environment.
diff --git a/modules/cluster-logging-deploy-cli.adoc b/modules/cluster-logging-deploy-cli.adoc
@@ -139,14 +139,14 @@ metadata:
   name: "elasticsearch-operator"
   namespace: "openshift-operators-redhat" <1>
 spec:
-  channel: "4.7" <2>
+  channel: "5.0" <2>
   installPlanApproval: "Automatic"
   source: "redhat-operators" <3>
   sourceNamespace: "openshift-marketplace"
   name: "elasticsearch-operator"
 ----
 <1> You must specify the `openshift-operators-redhat` Namespace.
-<2> Specify `4.7` as the channel.
+<2> Specify `5.0` or `stable` as the channel. `stable` is the latest 5.x released code.
 <3> Specify `redhat-operators`. If your {product-title} cluster is installed on a restricted network, also known as a disconnected cluster,
 specify the name of the CatalogSource object created when you configured the Operator Lifecycle Manager (OLM).
 
@@ -177,14 +177,14 @@ $ oc get csv --all-namespaces
 [source,terminal]
 ----
 NAMESPACE                                               NAME                                            DISPLAY                  VERSION               REPLACES   PHASE
-default                                                 elasticsearch-operator.4.7.0-202007012112.p0    Elasticsearch Operator   4.7.0-202007012112.p0               Succeeded
-kube-node-lease                                         elasticsearch-operator.4.7.0-202007012112.p0    Elasticsearch Operator   4.7.0-202007012112.p0               Succeeded
-kube-public                                             elasticsearch-operator.4.7.0-202007012112.p0    Elasticsearch Operator   4.7.0-202007012112.p0               Succeeded
-kube-system                                             elasticsearch-operator.4.7.0-202007012112.p0    Elasticsearch Operator   4.7.0-202007012112.p0               Succeeded
-openshift-apiserver-operator                            elasticsearch-operator.4.7.0-202007012112.p0    Elasticsearch Operator   4.7.0-202007012112.p0               Succeeded
-openshift-apiserver                                     elasticsearch-operator.4.7.0-202007012112.p0    Elasticsearch Operator   4.7.0-202007012112.p0               Succeeded
-openshift-authentication-operator                       elasticsearch-operator.4.7.0-202007012112.p0    Elasticsearch Operator   4.7.0-202007012112.p0               Succeeded
-openshift-authentication                                elasticsearch-operator.4.7.0-202007012112.p0    Elasticsearch Operator   4.7.0-202007012112.p0               Succeeded
+default                                                 elasticsearch-operator.5.0.0-202007012112.p0    Elasticsearch Operator   5.0.0-202007012112.p0               Succeeded
+kube-node-lease                                         elasticsearch-operator.5.0.0-202007012112.p0    Elasticsearch Operator   5.0.0-202007012112.p0               Succeeded
+kube-public                                             elasticsearch-operator.5.0.0-202007012112.p0    Elasticsearch Operator   5.0.0-202007012112.p0               Succeeded
+kube-system                                             elasticsearch-operator.5.0.0-202007012112.p0    Elasticsearch Operator   5.0.0-202007012112.p0               Succeeded
+openshift-apiserver-operator                            elasticsearch-operator.5.0.0-202007012112.p0    Elasticsearch Operator   5.0.0-202007012112.p0               Succeeded
+openshift-apiserver                                     elasticsearch-operator.5.0.0-202007012112.p0    Elasticsearch Operator   5.0.0-202007012112.p0               Succeeded
+openshift-authentication-operator                       elasticsearch-operator.5.0.0-202007012112.p0    Elasticsearch Operator   5.0.0-202007012112.p0               Succeeded
+openshift-authentication                                elasticsearch-operator.5.0.0-202007012112.p0    Elasticsearch Operator   5.0.0-202007012112.p0               Succeeded
 ...
 ----
 +
@@ -232,13 +232,13 @@ metadata:
   name: cluster-logging
   namespace: openshift-logging <1>
 spec:
-  channel: "4.7" <2>
+  channel: "5.0" <2>
   name: cluster-logging
   source: redhat-operators <3>
   sourceNamespace: openshift-marketplace
 ----
 <1> You must specify the `openshift-logging` Namespace.
-<2> Specify `4.7` as the channel.
+<2> Specify `5.0` or `stable` as the channel. `stable` is the latest 5.x released code.
 <3> Specify `redhat-operators`. If your {product-title} cluster is installed on a restricted network, also known as a disconnected cluster, specify the name of the `CatalogSource` object you created when you configured the Operator Lifecycle Manager (OLM).
 +
 [source,terminal]
@@ -269,7 +269,7 @@ $ oc get csv -n openshift-logging
 ----
 NAMESPACE                                               NAME                                         DISPLAY                  VERSION               REPLACES   PHASE
 ...
-openshift-logging                                       clusterlogging.4.7.0-202007012112.p0         OpenShift Logging          4.7.0-202007012112.p0              Succeeded
+openshift-logging                                       clusterlogging.5.0.0-202007012112.p0         OpenShift Logging          5.0.0-202007012112.p0              Succeeded
 ...
 ----
 

diff --git a/modules/cluster-logging-deploy-console.adoc b/modules/cluster-logging-deploy-console.adoc
@@ -24,7 +24,7 @@ ifdef::openshift-origin[]
 +
 If you have the pull secret, add the `redhat-operators` catalog to the OperatorHub custom resource (CR) as shown in _Configuring {product-title} to use Red Hat Operators_.
 endif::[]
- 
+
 .Procedure
 
 To install the Elasticsearch Operator and Cluster Logging Operator using the {product-title} web console:
@@ -50,7 +50,7 @@ This option sets the `openshift.io/cluster-monitoring: "true"` label in the Name
 You must select this option to ensure that cluster monitoring
 scrapes the `openshift-operators-redhat` namespace.
 
-.. Select *4.7* as the *Update Channel*.
+.. Select *5.0* as the *Update Channel*.
 
 .. Select an *Approval Strategy*.
 +
@@ -80,7 +80,7 @@ This option sets the `openshift.io/cluster-monitoring: "true"` label in the Name
 You must select this option to ensure that cluster monitoring
 scrapes the `openshift-logging` namespace.
 
-.. Select *4.7* as the *Update Channel*.
+.. Select *5.0* as the *Update Channel*.
 
 .. Select an *Approval Strategy*.
 +

diff --git a/modules/cluster-logging-eventrouter-deploy.adoc b/modules/cluster-logging-eventrouter-deploy.adoc
@@ -106,7 +106,7 @@ objects:
 parameters:
   - name: IMAGE
     displayName: Image
-    value: "registry.redhat.io/openshift4/ose-logging-eventrouter:latest"
+    value: "registry.redhat.io/openshift-logging/eventrouter-rhel8:latest"
   - name: CPU  <6>
     displayName: CPU
     value: "100m"

diff --git a/modules/cluster-logging-log-store-status-comp.adoc b/modules/cluster-logging-log-store-status-comp.adoc
@@ -149,7 +149,7 @@ The output includes the following status information:
 ....
   Containers:
    elasticsearch:
-    Image:      registry.redhat.io/openshift4/ose-logging-elasticsearch5:v4.3
+    Image:      registry.redhat.io/openshift-logging/elasticsearch6-rhel8
     Readiness:  exec [/usr/share/elasticsearch/probe/readiness.sh] delay=10s timeout=30s period=5s #success=1 #failure=3
 
 ....
@@ -194,7 +194,7 @@ The output includes the following status information:
 ....
   Containers:
    elasticsearch:
-    Image:      registry.redhat.io/openshift4/ose-logging-elasticsearch6@sha256:4265742c7cdd85359140e2d7d703e4311b6497eec7676957f455d6908e7b1c25
+    Image:      registry.redhat.io/openshift-logging/elasticsearch6-rhel8@sha256:4265742c7cdd85359140e2d7d703e4311b6497eec7676957f455d6908e7b1c25
     Readiness:  exec [/usr/share/elasticsearch/probe/readiness.sh] delay=10s timeout=30s period=5s #success=1 #failure=3
 
 ....

diff --git a/modules/cluster-logging-updating-logging.adoc b/modules/cluster-logging-updating-logging.adoc
@@ -5,7 +5,7 @@
 [id="cluster-logging-updating-logging_{context}"]
 = Updating OpenShift Logging
 
-After updating the {product-title} cluster, you can update OpenShift Logging from 4.6 to 4.7 by changing the subscription for the Elasticsearch Operator and the Cluster Logging Operator.
+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 Elasticsearch Operator and the Cluster Logging Operator.
 
 When you update:
 
@@ -18,7 +18,7 @@ If you update the Cluster Logging Operator before the Elasticsearch Operator, Ki
 
 [IMPORTANT]
 ====
-If your OpenShift Logging version is prior to 4.5, you must upgrade OpenShift Logging to 4.6 before updating to 4.7.
+Upgrade your cluster logging version to 4.6 before updating to Red Hat OpenShift Logging 5.0.
 ====
 
 .Prerequisites
@@ -44,18 +44,11 @@ If your OpenShift Logging version is prior to 4.5, you must upgrade OpenShift Lo
 
 .. Click *Subscription* -> *Channel*.
 
-.. In the *Change Subscription Update Channel* window, select *4.7* and click *Save*.
+.. In the *Change Subscription Update Channel* window, select *5.0* and click *Save*.
 
 .. Wait for a few seconds, then click *Operators* -> *Installed Operators*.
 +
-The Elasticsearch Operator is shown as 4.7. For example:
-+
-[source,terminal]
-----
-Elasticsearch Operator
-4.7.0-202007012112.p0 provided
-by Red Hat, Inc
-----
+Verify that the Elasticsearch Operator version is 5.0.x.
 +
 Wait for the *Status* field to report *Succeeded*.
 
@@ -69,18 +62,11 @@ Wait for the *Status* field to report *Succeeded*.
 
 .. Click *Subscription* -> *Channel*.
 
-.. In the *Change Subscription Update Channel* window, select *4.7* and click *Save*.
+.. In the *Change Subscription Update Channel* window, select *5.0* and click *Save*.
 
 .. Wait for a few seconds, then click *Operators* -> *Installed Operators*.
 +
-The Cluster Logging Operator is shown as 4.7. For example:
-+
-[source,terminal]
-----
-OpenShift Logging
-4.7.0-202007012112.p0 provided
-by Red Hat, Inc
-----
+Verify that the Cluster Logging Operator version is 5.0.x.
 +
 Wait for the *Status* field to report *Succeeded*.
 
@@ -142,7 +128,7 @@ elasticsearch-rollover-audit   */15 * * * *   False     0        <none>
 elasticsearch-rollover-infra   */15 * * * *   False     0        <none>          27s
 ----
 
-.. Verify that the log store is updated to 4.7 and the indices are `green`:
+.. Verify that the log store is updated to 5.0 and the indices are `green`:
 +
 [source,terminal]
 ----
@@ -191,7 +177,7 @@ green  open   audit-000001
 ----
 ====
 
-.. Verify that the log collector is updated to 4.7:
+.. Verify that the log collector is updated to 5.0:
 +
 [source,terminal]
 ----
@@ -205,7 +191,7 @@ Verify that the output includes a `fluentd-init` container:
 "containerName": "fluentd-init"
 ----
 
-.. Verify that the log visualizer is updated to 4.7 using the Kibana CRD:
+.. Verify that the log visualizer is updated to 5.0 using the Kibana CRD:
 +
 [source,terminal]
 ----
@@ -252,7 +238,7 @@ Verify that the output includes a Kibana pod with the `ready` status:
 ----
 ====
 
-.. Verify the Curator is updated to 4.7:
+.. Verify the Curator is updated to 5.0:
 +
 [source,terminal]
 ----

diff --git a/modules/cluster-logging-visualizer-kibana.adoc b/modules/cluster-logging-visualizer-kibana.adoc
@@ -72,7 +72,7 @@ The log data displays as  time-stamped documents.
       "container_name": "registry-server",
       "namespace_name": "openshift-marketplace",
       "pod_name": "redhat-marketplace-n64gc",
-      "container_image": "registry.redhat.io/redhat/redhat-marketplace-index:v4.6",
+      "container_image": "registry.redhat.io/redhat/redhat-marketplace-index:v4.7",
       "container_image_id": "registry.redhat.io/redhat/redhat-marketplace-index@sha256:65fc0c45aabb95809e376feb065771ecda9e5e59cc8b3024c4545c168f",
       "pod_id": "8f594ea2-c866-4b5c-a1c8-a50756704b2a",
       "host": "ip-10-0-182-28.us-east-2.compute.internal",

diff --git a/modules/olm-mirroring-package-manifest-catalog.adoc b/modules/olm-mirroring-package-manifest-catalog.adoc
@@ -85,7 +85,7 @@ $ echo "select * from related_image \
 .Example output
 [source,terminal]
 ----
-image = registry.redhat.io/openshift4/ose-logging-kibana5@sha256:aa4a8b2a00836d0e28aa6497ad90a3c116f135f382d8211e3c55f34fb36dfe61
+image = registry.redhat.io/openshift-logging/kibana6-rhel8@sha256:aa4a8b2a00836d0e28aa6497ad90a3c116f135f382d8211e3c55f34fb36dfe61
 operatorbundle_name = clusterlogging.4.3.33-202008111029.p0
 
 image = registry.redhat.io/openshift4/ose-oauth-proxy@sha256:6b4db07f6e6c962fc96473d86c44532c93b146bbefe311d0c348117bf759c506
@@ -100,7 +100,7 @@ For example, you can use the `image` values from the previous example output to
 .Matching image mappings in `mapping.txt`
 [source,txt]
 ----
-registry.redhat.io/openshift4/ose-logging-kibana5@sha256:aa4a8b2a00836d0e28aa6497ad90a3c116f135f382d8211e3c55f34fb36dfe61=<registry_host_name>:<port>/openshift4-ose-logging-kibana5:a767c8f0
+registry.redhat.io/openshift-logging/kibana6-rhel8@sha256:aa4a8b2a00836d0e28aa6497ad90a3c116f135f382d8211e3c55f34fb36dfe61=<registry_host_name>:<port>/kibana6-rhel8:a767c8f0
 registry.redhat.io/openshift4/ose-oauth-proxy@sha256:6b4db07f6e6c962fc96473d86c44532c93b146bbefe311d0c348117bf759c506=<registry_host_name>:<port>/openshift4-ose-oauth-proxy:3754ea2b
 ----
 +
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,6 +47,3 @@ include::modules/cluster-logging-exported-fields-ovirt.adoc[leveloffset=+1]
		include::modules/cluster-logging-exported-fields-aushape.adoc[leveloffset=+1]

		include::modules/cluster-logging-exported-fields-tlog.adoc[leveloffset=+1]