RHIDP-4814: Move observe related content to new titles (redhat-developer#689)

* RHIDP-4814: Move observe related content in new titles

* fixing issues

* Fixing issues

* Fix issues

* Removing offset

* test

* testing titles

* test

* fixing structure

* Changed order and updated version attribute

* Fixing issue

* Moved files and chapter numbering reset

Author: hmanwani-rh

assemblies/assembly-audit-log.adoc

@@ -33,6 +33,7 @@ Audit logs are not forwarded to the internal log store by default because this d
 * For a complete list of fields that a {product-short} audit log can include, see xref:ref-audit-log-fields.adoc_{context}[]
 * For a list of scaffolder events that a {product-short} audit log can include, see xref:ref-audit-log-scaffolder-events.adoc_{context}[]
 
+<<<<<<< HEAD
 include::modules/observe/con-audit-log-config.adoc[]
 
 include::modules/observe/proc-forward-audit-log-splunk.adoc[leveloffset=+2]
@@ -45,4 +46,17 @@ include::modules/observe/ref-audit-log-scaffolder-events.adoc[leveloffset=+2]
 
 include::modules/observe/ref-audit-log-catalog-events.adoc[leveloffset=+2]
 
-include::modules/observe/ref-audit-log-file-rotation-overview.adoc[]
+include::modules/observe/ref-audit-log-file-rotation-overview.adoc[]
+=======
+include::modules/observe/con-audit-log-config.adoc[leveloffset=+1]
+
+include::modules/observe/proc-audit-log-view.adoc[leveloffset=+1]
+
+include::modules/observe/ref-audit-log-fields.adoc[leveloffset=+2]
+
+include::modules/observe/ref-audit-log-scaffolder-events.adoc[leveloffset=+2]
+
+include::modules/observe/ref-audit-log-catalog-events.adoc[leveloffset=+2]
+
+include::modules/observe/ref-audit-log-file-rotation-overview.adoc[leveloffset=+1]
+>>>>>>> c10a907 (RHIDP-4814: Move observe related content to new titles (#689))

assemblies/assembly-rhdh-integration-aks.adoc

@@ -13,6 +13,7 @@ This integration requires the deployment of {product-short} on {aks-short} using
 * The Helm chart
 * The {product} Operator
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 //include::modules/admin/proc-rhdh-monitoring-logging-aks.adoc[leveloffset=+1] // moving observe category related content to new titles: RHIDP-4814
 =======
@@ -21,3 +22,6 @@ This integration requires the deployment of {product-short} on {aks-short} using
 
 include::modules/admin/proc-rhdh-monitoring-logging-aks.adoc[leveloffset=+1]
 >>>>>>> f5f4208 (RHIDP-4860 Remove Azure authentication provider from admin guide (#690))
+=======
+//include::modules/admin/proc-rhdh-monitoring-logging-aks.adoc[leveloffset=+1] // moving observe category related content to new titles: RHIDP-4814
+>>>>>>> c10a907 (RHIDP-4814: Move observe related content to new titles (#689))