Merge pull request #67038 from abrennan89/OBSDOCS-120

OBSDOCS-120: Update formatting and install instructions

Author: abrennan89

_topic_maps/_topic_map.yml

@@ -2543,8 +2543,6 @@ Topics:
     File: cluster-logging-log-store
   - Name: Configuring the log visualizer
     File: cluster-logging-visualizer
-  - Name: Configuring Logging storage
-    File: cluster-logging-storage-considerations
   - Name: Configuring CPU and memory limits for Logging components
     File: cluster-logging-memory
   - Name: Using tolerations to control Logging pod placement

_topic_maps/_topic_map_osd.yml

@@ -740,7 +740,7 @@ Topics:
 # cannot use oc adm cordon; cannot patch resource "machinesets"; cannot patch resource "nodes"
 #  - Name: Working with nodes
 #    File: nodes-nodes-working
-# cannot create resource "kubeletconfigs", "schedulers", "machineconfigs", "kubeletconfigs" 
+# cannot create resource "kubeletconfigs", "schedulers", "machineconfigs", "kubeletconfigs"
 #  - Name: Managing nodes
 #    File: nodes-nodes-managing
 # cannot create resource "kubeletconfigs"
@@ -773,7 +773,7 @@ Topics:
 #    File: nodes-nodes-problem-detector
   - Name: Machine Config Daemon metrics
     File: nodes-nodes-machine-config-daemon-metrics
-# cannot patch resource "nodes" 
+# cannot patch resource "nodes"
 #  - Name: Creating infrastructure nodes
 #    File: nodes-nodes-creating-infrastructure-nodes
 - Name: Working with containers
@@ -871,8 +871,6 @@ Topics:
     File: cluster-logging-log-store
   - Name: Configuring the log visualizer
     File: cluster-logging-visualizer
-  - Name: Configuring Logging storage
-    File: cluster-logging-storage-considerations
   - Name: Configuring CPU and memory limits for Logging components
     File: cluster-logging-memory
   - Name: Using tolerations to control Logging pod placement

_topic_maps/_topic_map_rosa.yml

@@ -910,10 +910,10 @@ Topics:
 # cannot use oc adm cordon; cannot patch resource "machinesets"; cannot patch resource "nodes"
 #  - Name: Working with nodes
 #    File: nodes-nodes-working
-# cannot create resource "kubeletconfigs", "schedulers", "machineconfigs", "kubeletconfigs" 
+# cannot create resource "kubeletconfigs", "schedulers", "machineconfigs", "kubeletconfigs"
 #  - Name: Managing nodes
 #    File: nodes-nodes-managing
-# cannot create resource "kubeletconfigs" 
+# cannot create resource "kubeletconfigs"
 #  - Name: Managing graceful node shutdown
 #    File: nodes-nodes-graceful-shutdown
 # cannot create resource "kubeletconfigs"
@@ -943,7 +943,7 @@ Topics:
 #    File: nodes-nodes-problem-detector
   - Name: Machine Config Daemon metrics
     File: nodes-nodes-machine-config-daemon-metrics
-# cannot patch resource "nodes" 
+# cannot patch resource "nodes"
 #  - Name: Creating infrastructure nodes
 #    File: nodes-nodes-creating-infrastructure-nodes
 - Name: Working with containers
@@ -1044,8 +1044,6 @@ Topics:
     File: cluster-logging-log-store
   - Name: Configuring the log visualizer
     File: cluster-logging-visualizer
-  - Name: Configuring Logging storage
-    File: cluster-logging-storage-considerations
   - Name: Configuring CPU and memory limits for Logging components
     File: cluster-logging-memory
   - Name: Using tolerations to control Logging pod placement

logging/cluster-logging-deploying.adoc

@@ -1,45 +1,42 @@
 :_mod-docs-content-type: ASSEMBLY
 :context: cluster-logging-deploying
 [id="cluster-logging-deploying"]
-= Installing the {logging-title}
+= Installing Logging
 include::_attributes/common-attributes.adoc[]
 include::_attributes/attributes-openshift-dedicated.adoc[]
 
 toc::[]
 
-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.
-
-The process for deploying the {logging} to {product-title}
-ifdef::openshift-rosa[]
-(ROSA)
-endif::[]
- involves:
-
-* Reviewing the xref:../logging/config/cluster-logging-storage-considerations#cluster-logging-storage[{logging-uc} storage considerations].
-
-* Installing the logging subsystem for {product-title} using xref:../logging/cluster-logging-deploying.adoc#cluster-logging-deploy-console_cluster-logging-deploying[the web console] or xref:../logging/cluster-logging-deploying.adoc#cluster-logging-deploy-cli_cluster-logging-deploying[the CLI].
+You can install the {logging-title} by deploying the Red Hat OpenShift Logging Operator. The {logging} Operator creates and manages the components of the logging stack.
 
 [IMPORTANT]
 ====
 For new installations, Vector and LokiStack are recommended. Documentation for logging is in the process of being updated to reflect these underlying component changes.
 ====
 
-include::snippets/logging-elastic-dep-snip.adoc[]
+ifdef::openshift-origin[]
+[id="prerequisites_cluster-logging-deploying"]
+== Prerequisites
+* Ensure that you have downloaded the {cluster-manager-url-pull} as shown in _Obtaining the installation program_ in the installation documentation for your platform.
++
+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::[]
+
 include::snippets/logging-fluentd-dep-snip.adoc[]
 
 include::modules/cluster-logging-deploy-console.adoc[leveloffset=+1]
 
+[id="cluster-logging-deploying-es-operator"]
+== Installing the Elasticsearch Operator
+
+include::snippets/logging-elastic-dep-snip.adoc[]
+include::modules/logging-es-storage-considerations.adoc[leveloffset=+2]
+include::modules/logging-install-es-operator.adoc[leveloffset=+2]
+
 [role="_additional-resources"]
 .Additional resources
-
-ifdef::openshift-enterprise,openshift-origin[]
 * xref:../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-operatorhub_olm-adding-operators-to-a-cluster[Installing Operators from the OperatorHub]
 * xref:../logging/config/cluster-logging-log-store.adoc#cluster-logging-removing-unused-components-if-no-elasticsearch_cluster-logging-log-store[Removing unused components if you do not use the default Elasticsearch log store]
-endif::[]
-ifdef::openshift-rosa,openshift-dedicated[]
-* link:https://docs.openshift.com/container-platform/latest/operators/admin/olm-adding-operators-to-cluster.html[Installing Operators from OperatorHub]
-* link:https://docs.openshift.com/container-platform/latest/logging/config/cluster-logging-log-store.html#cluster-logging-removing-unused-components-if-no-elasticsearch_cluster-logging-log-store[Removing unused components if you do not use the default Elasticsearch log store]
-endif::[]
 
 == Postinstallation tasks
 
@@ -73,9 +70,3 @@ ifdef::openshift-rosa,openshift-dedicated[]
 * link:https://docs.openshift.com/container-platform/latest/networking/openshift_sdn/about-openshift-sdn.html[About the OpenShift SDN default CNI network provider]
 * link:https://docs.openshift.com/container-platform/latest/networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.html[About the OVN-Kubernetes default Container Network Interface (CNI) network provider]
 endif::[]
-
-// include::modules/cluster-logging-deploy-memory.adoc[leveloffset=+1]
-
-// include::modules/cluster-logging-deploy-certificates.adoc[leveloffset=+1]
-
-// include::modules/cluster-logging-deploy-label.adoc[leveloffset=+1]

logging/config/cluster-logging-log-store.adoc

@@ -15,13 +15,6 @@ You can make modifications to your log store, including:
 * shard replication across data nodes in the cluster, from full replication to no replication
 * external access to Elasticsearch data
 
-//Following paragraph also in modules/cluster-logging-deploy-storage-considerations.adoc
-
-Elasticsearch is a memory-intensive application. Each Elasticsearch node needs at least 16G of memory for both memory requests and limits, unless you specify otherwise in the `ClusterLogging` custom resource. The initial set of {product-title} nodes might not be large enough to support the Elasticsearch cluster. You must add additional nodes to the {product-title} cluster to run with the recommended
-or higher memory, up to a maximum of 64G for each Elasticsearch node.
-
-Each Elasticsearch node can operate with a lower memory setting, though this is not recommended for production environments.
-
 include::modules/cluster-logging-elasticsearch-audit.adoc[leveloffset=+1]
 
 [role="_additional-resources"]

logging/config/cluster-logging-storage-considerations.adoc

@@ -6,9 +6,6 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-//Installing the Red Hat OpenShift Logging Operator via webconsole
-include::modules/logging-deploy-RHOL-console.adoc[leveloffset=+1]
-
 //Installing the Loki Operator via webconsole
 include::modules/logging-deploy-loki-console.adoc[leveloffset=+1]
 

logging/v5_5/logging-5-5-administration.adoc

@@ -6,9 +6,6 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-//Installing the Red Hat OpenShift Logging Operator via webconsole
-include::modules/logging-deploy-RHOL-console.adoc[leveloffset=+1]
-
 //Installing the Loki Operator via webconsole
 include::modules/logging-deploy-loki-console.adoc[leveloffset=+1]
 

logging/v5_6/logging-5-6-administration.adoc

@@ -6,9 +6,6 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-//Installing the Red Hat OpenShift Logging Operator via webconsole
-include::modules/logging-deploy-RHOL-console.adoc[leveloffset=+1]
-
 //Installing the Loki Operator via webconsole
 include::modules/logging-deploy-loki-console.adoc[leveloffset=+1]