Move ROSA and OSD distribution to the new monitoirng structure

Author: eromanova97

_topic_maps/_topic_map_osd.yml

@@ -1130,24 +1130,53 @@ Topics:
   Dir: monitoring
   Distros: openshift-dedicated
   Topics:
-  - Name: Monitoring overview
-    File: monitoring-overview
-  - Name: Accessing monitoring for user-defined projects
-    File: sd-accessing-monitoring-for-user-defined-projects
-  - Name: Configuring the monitoring stack
-    File: configuring-the-monitoring-stack
-  - Name: Disabling monitoring for user-defined projects
-    File: sd-disabling-monitoring-for-user-defined-projects
-  - Name: Enabling alert routing for user-defined projects
-    File: enabling-alert-routing-for-user-defined-projects
-  - Name: Managing metrics
-    File: managing-metrics
+  - Name: About monitoring
+    Dir: about-ocp-monitoring
+    Topics:
+    - Name: About monitoring
+      File: about-ocp-monitoring
+    - Name: Monitoring stack architecture
+      File: monitoring-stack-architecture
+    - Name: Key concepts
+      File: key-concepts
+  - Name: Getting started
+    Dir: getting-started
+    Topics:
+    - Name: Maintenance and support for monitoring
+      File: maintenance-and-support-for-monitoring
+    - Name: Accessing monitoring for user-defined projects
+      File: sd-accessing-monitoring-for-user-defined-projects
+    - Name: Disabling monitoring for user-defined projects
+      File: sd-disabling-monitoring-for-user-defined-projects
+  - Name: Configuring user workload monitoring
+    Dir: configuring-user-workload-monitoring
+    Topics:
+    - Name: Preparing to configure the monitoring stack
+      File: preparing-to-configure-the-monitoring-stack-uwm
+    - Name: Configuring performance and scalability
+      File: configuring-performance-and-scalability-uwm
+    - Name: Storing and recording data
+      File: storing-and-recording-data-uwm
+    - Name: Configuring metrics
+      File: configuring-metrics-uwm
+    - Name: Configuring alerts and notifications
+      File: configuring-alerts-and-notifications-uwm
+  - Name: Accessing metrics
+    Dir: accessing-metrics
+    Topics:
+    - Name: Accessing metrics as an administrator
+      File: accessing-metrics-as-an-administrator
+    - Name: Accessing metrics as a developer
+      File: accessing-metrics-as-a-developer
+    - Name: Accessing monitoring APIs by using the CLI
+      File: accessing-monitoring-apis-by-using-the-cli
   - Name: Managing alerts
-    File: managing-alerts
-  - Name: Reviewing monitoring dashboards
-    File: reviewing-monitoring-dashboards
-  - Name: Accessing third-party monitoring APIs
-    File: accessing-third-party-monitoring-apis
+    Dir: managing-alerts
+    Topics:
+    - Name: Managing alerts as an administrator
+      File: managing-alerts-as-an-administrator
+    - Name: Managing alerts as a developer
+      File: managing-alerts-as-a-developer
   - Name: Troubleshooting monitoring issues
     File: troubleshooting-monitoring-issues
   - Name: Config map reference for the Cluster Monitoring Operator

_topic_maps/_topic_map_rosa.yml

@@ -1500,24 +1500,53 @@ Topics:
   Dir: monitoring
   Distros: openshift-rosa
   Topics:
-  - Name: Monitoring overview
-    File: monitoring-overview
-  - Name: Accessing monitoring for user-defined projects
-    File: sd-accessing-monitoring-for-user-defined-projects
-  - Name: Configuring the monitoring stack
-    File: configuring-the-monitoring-stack
-  - Name: Disabling monitoring for user-defined projects
-    File: sd-disabling-monitoring-for-user-defined-projects
-  - Name: Enabling alert routing for user-defined projects
-    File: enabling-alert-routing-for-user-defined-projects
-  - Name: Managing metrics
-    File: managing-metrics
+  - Name: About monitoring
+    Dir: about-ocp-monitoring
+    Topics:
+    - Name: About monitoring
+      File: about-ocp-monitoring
+    - Name: Monitoring stack architecture
+      File: monitoring-stack-architecture
+    - Name: Key concepts
+      File: key-concepts
+  - Name: Getting started
+    Dir: getting-started
+    Topics:
+    - Name: Maintenance and support for monitoring
+      File: maintenance-and-support-for-monitoring
+    - Name: Accessing monitoring for user-defined projects
+      File: sd-accessing-monitoring-for-user-defined-projects
+    - Name: Disabling monitoring for user-defined projects
+      File: sd-disabling-monitoring-for-user-defined-projects
+  - Name: Configuring user workload monitoring
+    Dir: configuring-user-workload-monitoring
+    Topics:
+    - Name: Preparing to configure the monitoring stack
+      File: preparing-to-configure-the-monitoring-stack-uwm
+    - Name: Configuring performance and scalability
+      File: configuring-performance-and-scalability-uwm
+    - Name: Storing and recording data
+      File: storing-and-recording-data-uwm
+    - Name: Configuring metrics
+      File: configuring-metrics-uwm
+    - Name: Configuring alerts and notifications
+      File: configuring-alerts-and-notifications-uwm
+  - Name: Accessing metrics
+    Dir: accessing-metrics
+    Topics:
+    - Name: Accessing metrics as an administrator
+      File: accessing-metrics-as-an-administrator
+    - Name: Accessing metrics as a developer
+      File: accessing-metrics-as-a-developer
+    - Name: Accessing monitoring APIs by using the CLI
+      File: accessing-monitoring-apis-by-using-the-cli
   - Name: Managing alerts
-    File: managing-alerts
-  - Name: Reviewing monitoring dashboards
-    File: reviewing-monitoring-dashboards
-  - Name: Accessing third-party monitoring APIs
-    File: accessing-third-party-monitoring-apis
+    Dir: managing-alerts
+    Topics:
+    - Name: Managing alerts as an administrator
+      File: managing-alerts-as-an-administrator
+    - Name: Managing alerts as a developer
+      File: managing-alerts-as-a-developer
   - Name: Troubleshooting monitoring issues
     File: troubleshooting-monitoring-issues
   - Name: Config map reference for the Cluster Monitoring Operator

_topic_maps/_topic_map_rosa_hcp.yml

@@ -1158,24 +1158,53 @@ Topics:
   Dir: monitoring
   Distros: openshift-rosa-hcp
   Topics:
-  - Name: Monitoring overview
-    File: monitoring-overview
-  - Name: Accessing monitoring for user-defined projects
-    File: sd-accessing-monitoring-for-user-defined-projects
-  - Name: Configuring the monitoring stack
-    File: configuring-the-monitoring-stack
-  - Name: Disabling monitoring for user-defined projects
-    File: sd-disabling-monitoring-for-user-defined-projects
-  - Name: Enabling alert routing for user-defined projects
-    File: enabling-alert-routing-for-user-defined-projects
-  - Name: Managing metrics
-    File: managing-metrics
+  - Name: About monitoring
+    Dir: about-ocp-monitoring
+    Topics:
+    - Name: About monitoring
+      File: about-ocp-monitoring
+    - Name: Monitoring stack architecture
+      File: monitoring-stack-architecture
+    - Name: Key concepts
+      File: key-concepts
+  - Name: Getting started
+    Dir: getting-started
+    Topics:
+    - Name: Maintenance and support for monitoring
+      File: maintenance-and-support-for-monitoring
+    - Name: Accessing monitoring for user-defined projects
+      File: sd-accessing-monitoring-for-user-defined-projects
+    - Name: Disabling monitoring for user-defined projects
+      File: sd-disabling-monitoring-for-user-defined-projects
+  - Name: Configuring user workload monitoring
+    Dir: configuring-user-workload-monitoring
+    Topics:
+    - Name: Preparing to configure the monitoring stack
+      File: preparing-to-configure-the-monitoring-stack-uwm
+    - Name: Configuring performance and scalability
+      File: configuring-performance-and-scalability-uwm
+    - Name: Storing and recording data
+      File: storing-and-recording-data-uwm
+    - Name: Configuring metrics
+      File: configuring-metrics-uwm
+    - Name: Configuring alerts and notifications
+      File: configuring-alerts-and-notifications-uwm
+  - Name: Accessing metrics
+    Dir: accessing-metrics
+    Topics:
+    - Name: Accessing metrics as an administrator
+      File: accessing-metrics-as-an-administrator
+    - Name: Accessing metrics as a developer
+      File: accessing-metrics-as-a-developer
+    - Name: Accessing monitoring APIs by using the CLI
+      File: accessing-monitoring-apis-by-using-the-cli
   - Name: Managing alerts
-    File: managing-alerts
-  - Name: Reviewing monitoring dashboards
-    File: reviewing-monitoring-dashboards
-  - Name: Accessing third-party monitoring APIs
-    File: accessing-third-party-monitoring-apis
+    Dir: managing-alerts
+    Topics:
+    - Name: Managing alerts as an administrator
+      File: managing-alerts-as-an-administrator
+    - Name: Managing alerts as a developer
+      File: managing-alerts-as-a-developer
   - Name: Troubleshooting monitoring issues
     File: troubleshooting-monitoring-issues
   - Name: Config map reference for the Cluster Monitoring Operator

applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc

@@ -28,12 +28,7 @@ include::modules/odc-image-vulnerabilities-breakdown.adoc[leveloffset=+1]
 
 include::modules/odc-monitoring-your-app-vulnerabilities.adoc[leveloffset=+1]
 
-ifdef::openshift-rosa,openshift-dedicated[]
 [role="_additional-resources"]
 [id="additional-resources-odc-monitoring-project-and-application-metrics-using-developer-perspective"]
 == Additional resources
-* xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview]
-endif::openshift-rosa,openshift-dedicated[]
-ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
-* xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
-endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
+* xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]

machine_configuration/machine-config-daemon-metrics.adoc

@@ -12,10 +12,7 @@ include::modules/machine-config-daemon-metrics-understanding.adoc[leveloffset=+1
 
 [role="_additional-resources"]
 .Additional resources
-ifndef::openshift-rosa,openshift-dedicated[]
 * xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
+ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 * xref:../support/gathering-cluster-data.adoc#gathering-cluster-data[Gathering data about your cluster]
-endif::openshift-rosa,openshift-dedicated[]
-ifdef::openshift-rosa,openshift-dedicated[]
-* xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Understanding the monitoring stack]
-endif::openshift-rosa,openshift-dedicated[]
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]

modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc

@@ -6,6 +6,7 @@
 [id="about-specifying-limits-and-requests-for-monitoring-components_{context}"]
 = About specifying limits and requests for monitoring components
 
+ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 You can configure resource limits and requests for the following core platform monitoring components:
 
 * Alertmanager
@@ -19,6 +20,8 @@ You can configure resource limits and requests for the following core platform m
 * Telemeter Client
 * Thanos Querier
 
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
+
 You can configure resource limits and requests for the following components that monitor user-defined projects:
 
 * Alertmanager

modules/monitoring-enabling-alert-routing-for-user-defined-projects.adoc

@@ -9,14 +9,14 @@
 In {product-title}, an administrator can enable alert routing for user-defined projects.
 This process consists of the following steps:
 
-ifndef::openshift-dedicated,openshift-rosa[]
+ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 * Enable alert routing for user-defined projects:
 ** Use the default platform Alertmanager instance.
 ** Use a separate Alertmanager instance only for user-defined projects.
-endif::openshift-dedicated,openshift-rosa[]
-ifdef::openshift-dedicated,openshift-rosa[]
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
+ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 * Enable alert routing for user-defined projects to use a separate Alertmanager instance.
-endif::openshift-dedicated,openshift-rosa[]
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 * Grant users permission to configure alert routing for user-defined projects.
 
 After you complete these steps, developers and other users can configure custom alerts and alert routing for their user-defined projects.

observability/logging/logging_alerts/custom-logging-alerts.adoc

@@ -23,20 +23,15 @@ ifdef::openshift-enterprise[]
 [role="_additional-resources"]
 .Additional resources
 * xref:../../../authentication/using-rbac.adoc#using-rbac[Using RBAC to define and apply permissions]
-endif::[]
+endif::openshift-enterprise[]
 
 include::modules/logging-enabling-loki-alerts.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 [id="additional-resources_custom-logging-alerts"]
 == Additional resources
-ifdef::openshift-dedicated,openshift-rosa[]
-* xref:../../../observability/monitoring/monitoring-overview.adoc#about-openshift-monitoring[About {product-title} monitoring]
-endif::openshift-dedicated,openshift-rosa[]
-ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 * xref:../../../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
-endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 ifdef::openshift-enterprise[]
 * xref:../../../post_installation_configuration/configuring-alert-notifications.adoc#configuring-alert-notifications[Configuring alert notifications]
-endif::[]
+endif::openshift-enterprise[]
 // maybe need an update to https://docs.openshift.com/container-platform/4.13/observability/monitoring/monitoring-overview.html#default-monitoring-targets_monitoring-overview to talk about Loki and Vector now? Are these part of default monitoring?

observability/logging/logging_alerts/default-logging-alerts.adoc

@@ -16,12 +16,9 @@ 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]
 
+ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 [role="_additional-resources"]
 [id="additional-resources_default-logging-alerts"]
 == Additional resources
-ifdef::openshift-dedicated,openshift-rosa[]
-* xref:../../../observability/monitoring/managing-alerts.adoc#modifying-core-platform-alerting-rules_managing-alerts[Modifying core platform alerting rules]
-endif::openshift-dedicated,openshift-rosa[]
-ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 * xref:../../../observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc#modifying-core-platform-alerting-rules_managing-alerts-as-an-administrator[Modifying core platform alerting rules]
 endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]

observability/logging/troubleshooting/troubleshooting-logging-alerts.adoc

@@ -12,12 +12,7 @@ include::modules/es-cluster-health-is-red.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
-ifdef::openshift-dedicated,openshift-rosa[]
-* xref:../../../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards]
-endif::openshift-dedicated,openshift-rosa[]
-ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 * xref:../../../observability/monitoring/accessing-metrics/accessing-metrics-as-an-administrator.adoc#reviewing-monitoring-dashboards-admin_accessing-metrics-as-an-administrator[Reviewing monitoring dashboards as a cluster administrator]
-endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 * link:https://www.elastic.co/guide/en/elasticsearch/reference/7.13/fix-common-cluster-issues.html#fix-red-yellow-cluster-status[Fix a red or yellow cluster status]
 
 [id="elasticsearch-cluster-health-is-yellow"]