OBSDOCS-1801: Loki - Adjust Queries for both OTEL and ViaQ

Author: theashiot

_topic_maps/_topic_map.yml

@@ -91,13 +91,14 @@ Topics:
 #- Name: Log visualization with Kibana
 #  File: logging-kibana
 #---
-#Name: Logging alerts
-#Dir: logging_alerts
-#Topics:
-#- Name: Default logging alerts
-#  File: default-logging-alerts
-#- Name: Custom logging alerts
-#  File: custom-logging-alerts
+Name: Logging alerts
+Dir: logging_alerts
+Distros: openshift-logging
+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

logging_alerts/custom-logging-alerts.adoc

@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-In logging 5.7 and later versions, users can configure the LokiStack deployment to produce customized alerts and recorded metrics. If you want to use customized link:https://grafana.com/docs/loki/latest/alert/[alerting and recording rules], you must enable the LokiStack ruler component.
+You can configure the LokiStack deployment to produce customized alerts and recorded metrics. If you want to use customized link:https://grafana.com/docs/loki/latest/alert/[alerting and recording rules], you must enable the LokiStack ruler component.
 
 LokiStack log-based alerts and recorded metrics are triggered by providing link:https://grafana.com/docs/loki/latest/query/[LogQL] expressions to the ruler component. The {loki-op} manages a ruler that is optimized for the selected LokiStack size, which can be `1x.extra-small`, `1x.small`, or `1x.medium`.
 

logging_alerts/default-logging-alerts.adoc

@@ -11,11 +11,13 @@ Logging alerts are installed as part of the {clo} installation. Alerts depend on
 Default logging alerts are sent to the {ocp-product-title} monitoring stack Alertmanager in the `openshift-monitoring` namespace, unless you have disabled the local Alertmanager instance.
 
 // TODO MONITORING REMOVE DEPENDENCY
-include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=+1]
+include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=+1,tag=ADM]
 include::modules/logging-collector-alerts.adoc[leveloffset=+1]
 include::modules/logging-vector-collector-alerts.adoc[leveloffset=+1]
+////
 include::modules/logging-fluentd-collector-alerts.adoc[leveloffset=+1]
 include::modules/cluster-logging-elasticsearch-rules.adoc[leveloffset=+1]
+////
 
 [role="_additional-resources"]
 [id="additional-resources_default-logging-alerts"]

modules/configuring-logging-loki-ruler.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * observability/logging/logging_alerts/custom-logging-alerts.adoc
+// * logging/logging_alerts/custom-logging-alerts.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="configuring-logging-loki-ruler_{context}"]

modules/logging-collector-alerts.adoc

@@ -6,7 +6,7 @@
 [id="logging-collector-alerts_{context}"]
 = Logging collector alerts
 
-In logging 5.8 and later versions, the following alerts are generated by the {clo}. You can view these alerts in the {ocp-product-title} web console.
+The following alerts are generated by the {clo}. You can view these alerts in the {ocp-product-title} web console.
 
 [cols="4", options="header"]
 |===

modules/logging-vector-collector-alerts.adoc

@@ -6,7 +6,7 @@
 [id="logging-vector-collector-alerts_{context}"]
 = Vector collector alerts
 
-In logging 5.7 and later versions, the following alerts are generated by the Vector collector. You can view these alerts in the {ocp-product-title} web console.
+The following alerts are generated by the Vector collector. You can view these alerts in the {ocp-product-title} web console.
 
 .Vector collector alerts
 [cols="2,2,2,1",options="header"]