Merge pull request #64641 from abrennan89/OBSDOCS-498

OBSDOCS-498: Fixes for major customer portal breakage

Author: abrennan89

_topic_maps/_topic_map.yml

@@ -2545,10 +2545,6 @@ Topics:
   Topics:
   - Name: Logging 5.7 Release Notes
     File: logging-5-7-release-notes
-  - Name: Getting started with logging
-    File: logging-5-7-getting-started
-  - Name: Understanding Logging
-    File: logging-5-7-architecture
   - Name: Configuring Logging
     File: logging-5-7-configuration
   - Name: Administering Logging
@@ -2561,10 +2557,6 @@ Topics:
   Topics:
   - Name: Logging 5.6 Release Notes
     File: logging-5-6-release-notes
-  - Name: Getting started with logging
-    File: logging-5-6-getting-started
-  - Name: Understanding Logging
-    File: logging-5-6-architecture
   - Name: Configuring Logging
     File: logging-5-6-configuration
   - Name: Administering Logging
@@ -2577,10 +2569,6 @@ Topics:
   Topics:
   - Name: Logging 5.5 Release Notes
     File: logging-5-5-release-notes
-  - Name: Getting started with logging
-    File: logging-5-5-getting-started
-  - Name: Understanding Logging
-    File: logging-5-5-architecture
   - Name: Administering Logging
     File: logging-5-5-administration
 #  - Name: Configuring Logging

logging/.meta-logging-quickref.adoc

@@ -19,8 +19,7 @@ Files referenced only apply to versions 5.5+ of logging.
 
 .Include syntax:
 ----
-\include::target[leveloffset=offset,lines=ranges]
-\include::modules/logging-module-name.adoc[leveloffset=+1,lines=5..10]
+\include::modules/logging-module-name.adoc[leveloffset=+1]
 \include::snippets/
 ----
 
@@ -36,11 +35,9 @@ Files referenced only apply to versions 5.5+ of logging.
 
 * Snippets
 ** logging-stable-updates-snip.adoc[]
-** logging-log-types-snip.adoc[]
 ** logging-compatibility-snip.adoc[]
 ** logging-loki-vs-lokistack-snip.adoc[]
 ** logging-create-secret-snip.adoc[]
 ** logging-supported-config-snip.adoc[]
 ** logging-approval-strategy-snip.adoc[]
 ** logging-subscription-object-snip.adoc[
-** logging-create-apply-cr-snip.adoc[]

logging/cluster-logging-deploying.adoc

@@ -9,7 +9,7 @@ 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} 
+The process for deploying the {logging} to {product-title}
 ifdef::openshift-rosa[]
 (ROSA)
 endif::[]
@@ -19,10 +19,13 @@ endif::[]
 
 * 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].
 
-// The following include statements pull in the module files that comprise
-// the assembly. Include any combination of concept, procedure, or reference
-// modules required to cover the user story. You can also include other
-// assemblies.
+[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[]
+include::snippets/logging-fluentd-dep-snip.adoc[]
 
 include::modules/cluster-logging-deploy-console.adoc[leveloffset=+1]
 

logging/cluster-logging-external.adoc

@@ -34,6 +34,8 @@ include::modules/cluster-logging-collector-log-forwarding-supported-plugins-5-5.
 
 include::modules/cluster-logging-collector-log-forwarding-supported-plugins-5-6.adoc[leveloffset=+1]
 
+include::modules/cluster-logging-collector-log-forwarding-supported-plugins-5-7.adoc[leveloffset=+1]
+
 include::modules/cluster-logging-collector-log-forward-es.adoc[leveloffset=+1]
 
 include::modules/cluster-logging-collector-log-forward-fluentd.adoc[leveloffset=+1]

logging/cluster-logging.adoc

@@ -10,18 +10,14 @@ toc::[]
 ifdef::openshift-enterprise,openshift-rosa,openshift-dedicated,openshift-webscale,openshift-origin[]
 As a cluster administrator, you can deploy the {logging} to aggregate all the logs from your {product-title} cluster, such as node system audit logs, application container logs, and infrastructure logs. 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].
 
-The {logging} aggregates the following types of logs:
-
-* `application` - Container logs generated by user applications running in the cluster, except infrastructure container applications.
-* `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.
-* `audit` - Logs generated by auditd, the node audit system, which are stored in the */var/log/audit/audit.log* file, and the audit logs from the Kubernetes apiserver and the OpenShift apiserver.
-
 [NOTE]
 ====
 Because the internal {product-title} Elasticsearch log store does not provide secure storage for audit logs, audit logs are not stored in the internal Elasticsearch instance by default. If you want to send the audit logs to the default internal Elasticsearch log store, for example to view the audit logs in Kibana, you must use the Log Forwarding API 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].
 ====
 endif::[]
 
+include::modules/logging-architecture-overview.adoc[leveloffset=+1]
+
 ifdef::openshift-rosa,openshift-dedicated[]
 include::modules/cluster-logging-cloudwatch.adoc[leveloffset=+1]
 .Next steps