OBSDOCS-1857: Fix Loki retention module and remove the duplicate module

configuring/configuring-the-log-store.adoc

@@ -58,7 +58,7 @@ include::modules/loki-pod-placement.adoc[leveloffset=+2]
 
 include::modules/logging-loki-reliability-hardening.adoc[leveloffset=+2]
 
-include::modules/loki-retention.adoc[leveloffset=+2]
+include::modules/logging-loki-retention.adoc[leveloffset=+2]
 
 
 include::modules/loki-memberlist-ip.adoc[leveloffset=+2]

modules/logging-loki-retention.adoc

@@ -1,23 +1,35 @@
 // Module included in the following assemblies:
 //
 // * observability/logging/log_storage/cluster-logging-loki.adoc
+// * configuring/configuring-the-log-store.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="logging-loki-retention_{context}"]
 = Enabling stream-based retention with Loki
 
-With Logging version 5.6 and higher, you can configure retention policies based on log streams. Rules for these may be set globally, per tenant, or both. If you configure both, tenant rules apply before global rules.
+With Logging version 5.6 and higher, you can configure retention policies based on log streams. Rules for these might be set globally, per-tenant, or both. If you configure both, tenant rules apply before global rules.
 
 include::snippets/logging-retention-period-snip.adoc[]
 
 [NOTE]
 ====
-Although logging version 5.9 and higher supports schema v12, v13 is recommended.
+* Although logging version 5.9 and higher supports schema v12, v13 is recommended.
+
+* Stream-based retention does not manage the retention for stored logs. You can configure global retention periods for stored logs to a supported maximum of 30 days in your object storage.
 ====
 
+.Prerequisites 
+
+* You have administrator permissions.
+* You have installed the {loki-op}.
+* You have installed the {oc-first}.
+
+.Procedure
+
 . To enable stream-based retention, create a `LokiStack` CR:
 +
-.Example global stream-based retention for AWS
+--
+.Example global stream-based retention for s3
 [source,yaml]
 ----
 apiVersion: loki.grafana.com/v1
@@ -27,13 +39,13 @@ metadata:
   namespace: openshift-logging
 spec:
   limits:
-   global: <1>
-      retention: <2>
+   global: # <1>
+      retention: # <2>
         days: 20
         streams:
         - days: 4
           priority: 1
-          selector: '{kubernetes_namespace_name=~"test.+"}' <3>
+          selector: '{kubernetes_namespace_name=~"test.+"}' # <3>
         - days: 1
           priority: 1
           selector: '{log_type="infrastructure"}'
@@ -43,20 +55,20 @@ spec:
   storage:
     schemas:
     - effectiveDate: "2020-10-11"
-      version: v11
+      version: v13
     secret:
       name: logging-loki-s3
-      type: aws
+      type: s3
   storageClassName: gp3-csi
   tenants:
     mode: openshift-logging
 ----
-<1> Sets retention policy for all log streams. *Note: This field does not impact the retention period for stored logs in object storage.*
+<1> Sets retention policy for all log streams. This field does not impact the retention period for stored logs in object storage.
 <2> Retention is enabled in the cluster when this block is added to the CR.
-<3> Contains the link:https://grafana.com/docs/loki/latest/logql/query_examples/#query-examples[LogQL query] used to define the log stream.spec:
-  limits:
-
-.Example per-tenant stream-based retention for AWS
+<3> Contains the link:https://grafana.com/docs/loki/latest/logql/query_examples/#query-examples[LogQL query] used to define the log stream `spec.limits`.
+--
++
+.Example per-tenant stream-based retention for s3
 [source,yaml]
 ----
 apiVersion: loki.grafana.com/v1
@@ -69,13 +81,13 @@ spec:
     global:
       retention:
         days: 20
-    tenants: <1>
+    tenants: # <1>
       application:
         retention:
           days: 1
           streams:
             - days: 4
-              selector: '{kubernetes_namespace_name=~"test.+"}' <2>
+              selector: '{kubernetes_namespace_name=~"test.+"}' # <2>
       infrastructure:
         retention:
           days: 5
@@ -88,19 +100,19 @@ spec:
   storage:
     schemas:
     - effectiveDate: "2020-10-11"
-      version: v11
+      version: v13
     secret:
       name: logging-loki-s3
-      type: aws
+      type: s3
   storageClassName: gp3-csi
   tenants:
     mode: openshift-logging
 ----
 <1> Sets retention policy by tenant. Valid tenant types are `application`, `audit`, and `infrastructure`.
 <2> Contains the link:https://grafana.com/docs/loki/latest/logql/query_examples/#query-examples[LogQL query] used to define the log stream.
 
-2 Apply the `LokiStack` CR:
-
+. Apply the `LokiStack` CR:
++
 [source,terminal]
 ----
 $ oc apply -f <filename>.yaml