Merge pull request #65622 from abrennan89/log-relnotes-cleanup

OBSDOCS-561: Clean up logging release notes and remove duplicate files

Author: abrennan89

_topic_maps/_topic_map.yml

@@ -2467,15 +2467,22 @@ Dir: logging
 Distros: openshift-enterprise,openshift-origin
 Topics:
 - Name: Release notes
-  File: cluster-logging-release-notes
+  Dir: logging_release_notes
+  Topics:
+  - Name: Logging 5.7
+    File: logging-5-7-release-notes
+  - Name: Logging 5.6
+    File: logging-5-6-release-notes
+  - Name: Logging 5.5
+    File: logging-5-5-release-notes
+  - Name: Logging 5.4
+    File: logging-5-4-release-notes
 - Name: Support
   File: cluster-logging-support
 - Name: Logging 5.7
   Dir: v5_7
   Distros: openshift-enterprise,openshift-origin
   Topics:
-  - Name: Logging 5.7 Release Notes
-    File: logging-5-7-release-notes
   - Name: Configuring Logging
     File: logging-5-7-configuration
   - Name: Administering Logging
@@ -2486,8 +2493,6 @@ Topics:
   Dir: v5_6
   Distros: openshift-enterprise,openshift-origin
   Topics:
-  - Name: Logging 5.6 Release Notes
-    File: logging-5-6-release-notes
   - Name: Configuring Logging
     File: logging-5-6-configuration
   - Name: Administering Logging
@@ -2498,8 +2503,6 @@ Topics:
   Dir: v5_5
   Distros: openshift-enterprise,openshift-origin
   Topics:
-  - Name: Logging 5.5 Release Notes
-    File: logging-5-5-release-notes
   - Name: Administering Logging
     File: logging-5-5-administration
 #  - Name: Configuring Logging

_topic_maps/_topic_map_osd.yml

@@ -365,7 +365,16 @@ Dir: logging
 Distros: openshift-dedicated
 Topics:
 - Name: Release notes
-  File: cluster-logging-release-notes
+  Dir: logging_release_notes
+  Topics:
+  - Name: Logging 5.7
+    File: logging-5-7-release-notes
+  - Name: Logging 5.6
+    File: logging-5-6-release-notes
+  - Name: Logging 5.5
+    File: logging-5-5-release-notes
+  - Name: Logging 5.4
+    File: logging-5-4-release-notes
 - Name: Support
   File: cluster-logging-support
 - Name: About Logging

_topic_maps/_topic_map_rosa.yml

@@ -512,7 +512,16 @@ Dir: logging
 Distros: openshift-rosa
 Topics:
 - Name: Release notes
-  File: cluster-logging-release-notes
+  Dir: logging_release_notes
+  Topics:
+  - Name: Logging 5.7
+    File: logging-5-7-release-notes
+  - Name: Logging 5.6
+    File: logging-5-6-release-notes
+  - Name: Logging 5.5
+    File: logging-5-5-release-notes
+  - Name: Logging 5.4
+    File: logging-5-4-release-notes
 - Name: Support
   File: cluster-logging-support
 - Name: About Logging

logging/.meta-logging-quickref.adoc

@@ -0,0 +1 @@
+../../_attributes/

logging/cluster-logging-release-notes.adoc

@@ -0,0 +1 @@
+../../images/

logging/logging_release_notes/_attributes

@@ -0,0 +1,26 @@
+:_content-type: ASSEMBLY
+[id="logging-5-4-release-notes"]
+include::_attributes/common-attributes.adoc[]
+= Logging 5.4
+:context: logging-5-4-release-notes
+
+toc::[]
+
+include::snippets/logging-compatibility-snip.adoc[]
+
+include::modules/cluster-logging-rn-5.4.14.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.13.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.12.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.11.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.10.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.9.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.8.adoc[leveloffset=+1]
+//include::modules/cluster-logging-rn-5.4.7.adoc[leveloffset=+1]
+// why is this commented out?
+include::modules/cluster-logging-rn-5.4.6.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.5.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.4.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.3.adoc[leveloffset=+1]
+include::modules/cluster-logging-rn-5.4.2.adoc[leveloffset=+1]
+include::modules/logging-rn-5-4-1.adoc[leveloffset=+1]
+include::modules/logging-rn-5-4-0.adoc[leveloffset=+1]

logging/logging_release_notes/images

@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
-[id="logging-release-notes-5-5"]
-= Logging 5.5 Release Notes
+[id="logging-5-5-release-notes"]
 include::_attributes/common-attributes.adoc[]
-:context: logging-5.5-release-notes
+= Logging 5.5
+:context: logging-5-5-release-notes
 
 toc::[]
 

logging/logging_release_notes/logging-5-4-release-notes.adoc

@@ -1,15 +1,17 @@
 :_content-type: ASSEMBLY
-[id="logging-release-notes-5-6"]
-= Logging 5.6 Release Notes
+[id="logging-5-6-release-notes"]
 include::_attributes/common-attributes.adoc[]
-:context: logging-5.6-release-notes
+= Logging 5.6
+:context: logging-5-6-release-notes
 
 toc::[]
 
 include::snippets/logging-compatibility-snip.adoc[]
 
 include::snippets/logging-stable-updates-snip.adoc[]
 
+// No release notes for 5.6.6 and 5.6.7 since these were CVE only releases. In the future, add a link to the CVE.
+
 include::modules/logging-rn-5.6.8.adoc[leveloffset=+1]
 
 include::modules/logging-rn-5.6.5.adoc[leveloffset=+1]