Logging 6.0 Preview

Author: libander

_topic_maps/_topic_map.yml

@@ -2716,15 +2716,15 @@ Topics:
   Dir: logging
   Distros: openshift-enterprise,openshift-origin
   Topics:
-  - Name: Release notes
-    Dir: logging_release_notes
-    Topics:
-    - Name: Logging 5.9
-      File: logging-5-9-release-notes
-    - Name: Logging 5.8
-      File: logging-5-8-release-notes
-    - Name: Logging 5.7
-      File: logging-5-7-release-notes
+#  - Name: Release notes
+#    Dir: logging_release_notes
+#    Topics:
+#    - Name: Logging 5.9
+#      File: logging-5-9-release-notes
+#    - Name: Logging 5.8
+#      File: logging-5-8-release-notes
+#    - Name: Logging 5.7
+#      File: logging-5-7-release-notes
   - Name: Logging 6.0
     Dir: logging-6.0
     Topics:
@@ -2742,110 +2742,6 @@ Topics:
         File: log6x-update
       - Name: References for logging
         File: log6x-references
-  - Name: Support
-    File: cluster-logging-support
-  - Name: Troubleshooting logging
-    Dir: troubleshooting
-    Topics:
-    - Name: Viewing Logging status
-      File: cluster-logging-cluster-status
-    - Name: Troubleshooting log forwarding
-      File: log-forwarding-troubleshooting
-    - Name: Troubleshooting logging alerts
-      File: troubleshooting-logging-alerts
-    - Name: Viewing the status of the Elasticsearch log store
-      File: cluster-logging-log-store-status
-  - Name: About Logging
-    File: cluster-logging
-  - Name: Installing Logging
-    File: cluster-logging-deploying
-  - Name: Updating Logging
-    File: cluster-logging-upgrading
-    Distros: openshift-enterprise,openshift-origin
-  - Name: Visualizing logs
-    Dir: log_visualization
-    Topics:
-    - Name: About log visualization
-      File: log-visualization
-    - Name: Log visualization with the web console
-      File: log-visualization-ocp-console
-    - Name: Viewing cluster dashboards
-      File: cluster-logging-dashboards
-    - Name: Log visualization with Kibana
-      File: logging-kibana
-  - Name: Configuring your Logging deployment
-    Dir: config
-    Distros: openshift-enterprise,openshift-origin
-    Topics:
-    - Name: Configuring CPU and memory limits for Logging components
-      File: cluster-logging-memory
-    - Name: Configuring systemd-journald for Logging
-      File: cluster-logging-systemd
-  - Name: Log collection and forwarding
-    Dir: log_collection_forwarding
-    Topics:
-    - Name: About log collection and forwarding
-      File: log-forwarding
-    - Name: Log output types
-      File: logging-output-types
-    - Name: Enabling JSON log forwarding
-      File: cluster-logging-enabling-json-logging
-    - Name: Configuring log forwarding
-      File: configuring-log-forwarding
-    - Name: Configuring the logging collector
-      File: cluster-logging-collector
-    - Name: Collecting and storing Kubernetes events
-      File: cluster-logging-eventrouter
-  - Name: Log storage
-    Dir: log_storage
-    Topics:
-    - Name: About log storage
-      File: about-log-storage
-    - Name: Installing log storage
-      File: installing-log-storage
-    - Name: Configuring the LokiStack log store
-      File: cluster-logging-loki
-    - Name: Configuring the Elasticsearch log store
-      File: logging-config-es-store
-  - Name: Logging alerts
-    Dir: logging_alerts
-    Topics:
-    - Name: Default logging alerts
-      File: default-logging-alerts
-    - Name: Custom logging alerts
-      File: custom-logging-alerts
-  - Name: Performance and reliability tuning
-    Dir: performance_reliability
-    Topics:
-    - Name: Flow control mechanisms
-      File: logging-flow-control-mechanisms
-    - Name: Filtering logs by content
-      File: logging-content-filtering
-    - Name: Filtering logs by metadata
-      File: logging-input-spec-filtering
-  - Name: Scheduling resources
-    Dir: scheduling_resources
-    Topics:
-    - Name: Using node selectors to move logging resources
-      File: logging-node-selectors
-    - Name: Using tolerations to control logging pod placement
-      File: logging-taints-tolerations
-  - Name: Uninstalling Logging
-    File: cluster-logging-uninstall
-  - Name: Exported fields
-    File: cluster-logging-exported-fields
-    Distros: openshift-enterprise,openshift-origin
-  - Name: API reference
-    Dir: api_reference
-    Topics:
-  #  - Name: 5.8 Logging API reference
-  #    File: logging-5-8-reference
-  #  - Name: 5.7 Logging API reference
-  #    File: logging-5-7-reference
-    - Name: 5.6 Logging API reference
-      File: logging-5-6-reference
-  - Name: Glossary
-    File: logging-common-terms
 - Name: Distributed tracing
   Dir: distr_tracing
   Distros: openshift-enterprise

observability/logging/logging-6.0/log6x-about.adoc

@@ -5,3 +5,28 @@ include::_attributes/common-attributes.adoc[]
 :context: logging-6x
 
 toc::[]
+
+[id="about-upgrading-to-logging-6-0_{context}"]
+= About upgrading to Logging 6.0
+
+OpenShift Container Platform logging version 6.0 introduces significant changes to improve flexibility and control for cluster administrators. This release decouples logging components, updates the log storage solution, and introduces a new API for log forwarding configuration.
+
+Logging 6.0 includes the following key changes:
+
+* Separate operators for logging components
+* Loki-based log storage
+* Vector as the log collector
+* New API in the `observability.openshift.io` group for log forwarding
+
+[IMPORTANT]
+====
+Upgrading to Logging 6.0 is a manual process. The `cluster-logging-operator` does not provide an automated upgrade path.
+====
+
+This documentation explains the changes in Logging 6.0 and provides instructions for upgrading your logging infrastructure. It includes:
+
+* Overview of architectural changes
+* Deployment steps for the new logging stack
+* Configuration examples for common logging scenarios
+
+Understanding these changes will help you maintain your log management capabilities during and after the upgrade to Logging 6.0.

observability/logging/logging-6.0/log6x-clf.adoc

@@ -5,3 +5,14 @@ include::_attributes/common-attributes.adoc[]
 :context: logging-6x
 
 toc::[]
+
+[source,yaml]
+--
+include::snippets/log6x-clf-samples-snip.adoc[tag=input-receivers]
+--
+
+
+[source,yaml]
+--
+include::snippets/log6x-clf-samples-snip.adoc[tag=cloudwatch-output]
+--