diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 3c4a657108db..7fdba719bb78 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -7,6 +7,18 @@ Topics: File: about-ocp-monitoring - Name: Monitoring stack architecture File: monitoring-stack-architecture +--- +Name: Support for monitoring +Dir: support-for-monitoring +Distros: openshift-monitoring +Topics: +- Name: Maintenance and support for monitoring + File: maintenance-and-support-for-monitoring +--- +Name: Monitoring key concepts +Dir: key-concepts +Distros: openshift-monitoring +Topics: - Name: Key concepts File: key-concepts --- @@ -21,8 +33,6 @@ Name: Getting started Dir: getting-started Distros: openshift-monitoring Topics: -- Name: Maintenance and support for monitoring - File: maintenance-and-support-for-monitoring - Name: Core platform monitoring first steps File: core-platform-monitoring-first-steps - Name: User workload monitoring first steps diff --git a/accessing-metrics/accessing-metrics-as-a-developer.adoc b/accessing-metrics/accessing-metrics-as-a-developer.adoc index 9cc922f46d28..2812a3edad6c 100644 --- a/accessing-metrics/accessing-metrics-as-a-developer.adoc +++ b/accessing-metrics/accessing-metrics-as-a-developer.adoc @@ -11,7 +11,7 @@ You can access metrics to monitor the performance of your cluster workloads. [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#understanding-metrics_key-concepts[Understanding metrics] +* xref:../key-concepts/key-concepts.adoc#understanding-metrics_key-concepts[Understanding metrics] ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] //Viewing a list of available metrics @@ -32,5 +32,5 @@ include::modules/monitoring-reviewing-monitoring-dashboards-developer.adoc[level [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#about-monitoring-dashboards_key-concepts[About monitoring dashboards] +* xref:../key-concepts/key-concepts.adoc#about-monitoring-dashboards_key-concepts[About monitoring dashboards] * link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/building_applications/index#monitoring-project-and-application-metrics-using-developer-perspective[Monitoring project and application metrics using the Developer perspective] diff --git a/accessing-metrics/accessing-metrics-as-an-administrator.adoc b/accessing-metrics/accessing-metrics-as-an-administrator.adoc index 70372207db0c..3492c5e54609 100644 --- a/accessing-metrics/accessing-metrics-as-an-administrator.adoc +++ b/accessing-metrics/accessing-metrics-as-an-administrator.adoc @@ -11,7 +11,7 @@ You can access metrics to monitor the performance of cluster components and your [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#understanding-metrics_key-concepts[Understanding metrics] +* xref:../key-concepts/key-concepts.adoc#understanding-metrics_key-concepts[Understanding metrics] ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] //Viewing a list of available metrics @@ -35,4 +35,4 @@ include::modules/monitoring-reviewing-monitoring-dashboards-admin.adoc[leveloffs [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#about-monitoring-dashboards_key-concepts[About monitoring dashboards] +* xref:../key-concepts/key-concepts.adoc#about-monitoring-dashboards_key-concepts[About monitoring dashboards] diff --git a/config-map-reference/config-map-reference-for-the-cluster-monitoring-operator.adoc b/config-map-reference/config-map-reference-for-the-cluster-monitoring-operator.adoc index 9c50ecd701b9..cec914ef37f9 100644 --- a/config-map-reference/config-map-reference-for-the-cluster-monitoring-operator.adoc +++ b/config-map-reference/config-map-reference-for-the-cluster-monitoring-operator.adoc @@ -32,7 +32,7 @@ The configuration file is always defined under the `config.yaml` key in the conf ==== * Not all configuration parameters for the monitoring stack are exposed. Only the parameters and fields listed in this reference are supported for configuration. -For more information about supported configurations, see xref:../getting-started/maintenance-and-support-for-monitoring.adoc#maintenance-and-support-for-monitoring[Maintenance and support for monitoring]. +For more information about supported configurations, see xref:../support-for-monitoring/maintenance-and-support-for-monitoring.adoc#maintenance-and-support-for-monitoring[Maintenance and support for monitoring]. * Configuring cluster monitoring is optional. * If a configuration does not exist or is empty, default values are used. diff --git a/configuring-core-platform-monitoring/configuring-alerts-and-notifications.adoc b/configuring-core-platform-monitoring/configuring-alerts-and-notifications.adoc index 822edbf3fc27..5f0289047cb5 100644 --- a/configuring-core-platform-monitoring/configuring-alerts-and-notifications.adoc +++ b/configuring-core-platform-monitoring/configuring-alerts-and-notifications.adoc @@ -46,10 +46,10 @@ Alertmanager does not send notifications by default. It is strongly recommended [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#sending-notifications-to-external-systems_key-concepts[Sending notifications to external systems] +* xref:../key-concepts/key-concepts.adoc#sending-notifications-to-external-systems_key-concepts[Sending notifications to external systems] * link:https://www.pagerduty.com/[PagerDuty website] * link:https://www.pagerduty.com/docs/guides/prometheus-integration-guide/[Prometheus Integration Guide (PagerDuty documentation)] -* xref:../getting-started/maintenance-and-support-for-monitoring.adoc#support-version-matrix-for-monitoring-components_maintenance-and-support-for-monitoring[Support version matrix for monitoring components] +* xref:../support-for-monitoring/maintenance-and-support-for-monitoring.adoc#support-version-matrix-for-monitoring-components_maintenance-and-support-for-monitoring[Support version matrix for monitoring components] * xref:../configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#enabling-alert-routing-for-user-defined-projects_preparing-to-configure-the-monitoring-stack-uwm[Enabling alert routing for user-defined projects] include::modules/monitoring-configuring-alert-routing-default-platform-alerts.adoc[leveloffset=+2] diff --git a/configuring-core-platform-monitoring/configuring-metrics.adoc b/configuring-core-platform-monitoring/configuring-metrics.adoc index 0adfc30240a3..9ad7ebe19102 100644 --- a/configuring-core-platform-monitoring/configuring-metrics.adoc +++ b/configuring-core-platform-monitoring/configuring-metrics.adoc @@ -13,7 +13,7 @@ You can send ingested metrics to remote systems for long-term storage and add cl [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#understanding-metrics_key-concepts[Understanding metrics] +* xref:../key-concepts/key-concepts.adoc#understanding-metrics_key-concepts[Understanding metrics] // Configuring remote write storage include::modules/monitoring-configuring-remote-write-storage.adoc[leveloffset=+1,tags=**;CPM;!UWM] @@ -46,5 +46,5 @@ include::modules/monitoring-creating-cluster-id-labels-for-metrics.adoc[leveloff [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#adding-cluster-id-labels-to-metrics_key-concepts[Adding cluster ID labels to metrics] +* xref:../key-concepts/key-concepts.adoc#adding-cluster-id-labels-to-metrics_key-concepts[Adding cluster ID labels to metrics] * link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/support/index#support-get-cluster-id_gathering-cluster-data[Obtaining your cluster ID] diff --git a/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc b/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc index 82eba3672155..728ee42201b5 100644 --- a/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc +++ b/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc @@ -11,7 +11,7 @@ You can configure the monitoring stack to optimize the performance and scale of [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#about-performance-and-scalability_key-concepts[About performance and scalability] +* xref:../key-concepts/key-concepts.adoc#about-performance-and-scalability_key-concepts[About performance and scalability] [id="controlling-placement-and-distribution-of-monitoing-components_{context}"] == Controlling the placement and distribution of monitoring components @@ -28,7 +28,7 @@ By controlling placement and distribution of monitoring components, you can opti [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#using-node-selectors-to-move-monitoring-components_key-concepts[Using node selectors to move monitoring components] +* xref:../key-concepts/key-concepts.adoc#using-node-selectors-to-move-monitoring-components_key-concepts[Using node selectors to move monitoring components] include::modules/monitoring-moving-monitoring-components-to-different-nodes.adoc[leveloffset=+2,tags=**;CPM;!UWM] @@ -69,7 +69,7 @@ include::modules/monitoring-specifying-limits-and-requests-for-monitoring-compon [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#about-specifying-limits-and-requests-for-monitoring-components_key-concepts[About specifying limits and requests] +* xref:../key-concepts/key-concepts.adoc#about-specifying-limits-and-requests-for-monitoring-components_key-concepts[About specifying limits and requests] * link:https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#requests-and-limits[Requests and limits (Kubernetes documentation)] // Choosing a metrics collection profile @@ -78,7 +78,7 @@ include::modules/monitoring-choosing-a-metrics-collection-profile.adoc[leveloffs [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#configuring-metrics-collection-profiles_key-concepts[About metrics collection profiles] +* xref:../key-concepts/key-concepts.adoc#configuring-metrics-collection-profiles_key-concepts[About metrics collection profiles] * xref:../accessing-metrics/accessing-metrics-as-an-administrator.adoc#viewing-a-list-of-available-metrics_accessing-metrics-as-an-administrator[Viewing a list of available metrics] * link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/nodes/index#nodes-cluster-enabling[Enabling features using feature gates] @@ -88,6 +88,6 @@ include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[lev [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#using-pod-topology-spread-constraints-for-monitoring_key-concepts[About pod topology spread constraints for monitoring] +* xref:../key-concepts/key-concepts.adoc#using-pod-topology-spread-constraints-for-monitoring_key-concepts[About pod topology spread constraints for monitoring] * link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/nodes/index#nodes-scheduler-pod-topology-spread-constraints[Controlling pod placement by using pod topology spread constraints] * link:https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/[Pod topology spread constraints (Kubernetes documentation)] diff --git a/configuring-core-platform-monitoring/storing-and-recording-data.adoc b/configuring-core-platform-monitoring/storing-and-recording-data.adoc index 2ad42ccd0b52..aa84b9de8eb2 100644 --- a/configuring-core-platform-monitoring/storing-and-recording-data.adoc +++ b/configuring-core-platform-monitoring/storing-and-recording-data.adoc @@ -34,7 +34,7 @@ include::modules/monitoring-modifying-retention-time-and-size-for-prometheus-met [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#retention-time-and-size-for-prometheus-metrics-data_key-concepts[Retention time and size for Prometheus metrics] +* xref:../key-concepts/key-concepts.adoc#retention-time-and-size-for-prometheus-metrics-data_key-concepts[Retention time and size for Prometheus metrics] * xref:../configuring-core-platform-monitoring/preparing-to-configure-the-monitoring-stack.adoc#preparing-to-configure-the-monitoring-stack[Preparing to configure core platform monitoring stack] * link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/scalability_and_performance/index#prometheus-database-storage-requirements_recommended-infrastructure-practices[Prometheus database storage requirements] * link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/scalability_and_performance/index#recommended-configurable-storage-technology_persistent-storage[Recommended configurable storage technology] diff --git a/configuring-user-workload-monitoring/configuring-alerts-and-notifications-uwm.adoc b/configuring-user-workload-monitoring/configuring-alerts-and-notifications-uwm.adoc index 77879a874b06..de234ff82775 100644 --- a/configuring-user-workload-monitoring/configuring-alerts-and-notifications-uwm.adoc +++ b/configuring-user-workload-monitoring/configuring-alerts-and-notifications-uwm.adoc @@ -54,11 +54,11 @@ Review the following limitations of alert routing for user-defined projects: [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#understanding-alert-routing-for-user-defined-projects_key-concepts[Understanding alert routing for user-defined projects] -* xref:../about-ocp-monitoring/key-concepts.adoc#sending-notifications-to-external-systems_key-concepts[Sending notifications to external systems] +* xref:../key-concepts/key-concepts.adoc#understanding-alert-routing-for-user-defined-projects_key-concepts[Understanding alert routing for user-defined projects] +* xref:../key-concepts/key-concepts.adoc#sending-notifications-to-external-systems_key-concepts[Sending notifications to external systems] * link:https://www.pagerduty.com/[PagerDuty website] * link:https://www.pagerduty.com/docs/guides/prometheus-integration-guide/[Prometheus Integration Guide (PagerDuty documentation)] -* xref:../getting-started/maintenance-and-support-for-monitoring.adoc#support-version-matrix-for-monitoring-components_maintenance-and-support-for-monitoring[Support version matrix for monitoring components] +* xref:../support-for-monitoring/maintenance-and-support-for-monitoring.adoc#support-version-matrix-for-monitoring-components_maintenance-and-support-for-monitoring[Support version matrix for monitoring components] * xref:../configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#enabling-alert-routing-for-user-defined-projects_preparing-to-configure-the-monitoring-stack-uwm[Enabling alert routing for user-defined projects] include::modules/monitoring-configuring-alert-routing-for-user-defined-projects.adoc[leveloffset=+2] diff --git a/configuring-user-workload-monitoring/configuring-metrics-uwm.adoc b/configuring-user-workload-monitoring/configuring-metrics-uwm.adoc index 8eacf1883076..0ed569206081 100644 --- a/configuring-user-workload-monitoring/configuring-metrics-uwm.adoc +++ b/configuring-user-workload-monitoring/configuring-metrics-uwm.adoc @@ -13,7 +13,7 @@ You can send ingested metrics to remote systems for long-term storage and add cl [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#understanding-metrics_key-concepts[Understanding metrics] +* xref:../key-concepts/key-concepts.adoc#understanding-metrics_key-concepts[Understanding metrics] // Configuring remote write storage include::modules/monitoring-configuring-remote-write-storage.adoc[leveloffset=+1,tags=**;!CPM;UWM] @@ -48,7 +48,7 @@ include::modules/monitoring-creating-cluster-id-labels-for-metrics.adoc[leveloff [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#adding-cluster-id-labels-to-metrics_key-concepts[Adding cluster ID labels to metrics] +* xref:../key-concepts/key-concepts.adoc#adding-cluster-id-labels-to-metrics_key-concepts[Adding cluster ID labels to metrics] * link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/support/index#support-get-cluster-id_gathering-cluster-data[Obtaining your cluster ID] // Setting up metrics collection for user-defined projects diff --git a/configuring-user-workload-monitoring/configuring-performance-and-scalability-uwm.adoc b/configuring-user-workload-monitoring/configuring-performance-and-scalability-uwm.adoc index 17b43e21c279..50da497cde62 100644 --- a/configuring-user-workload-monitoring/configuring-performance-and-scalability-uwm.adoc +++ b/configuring-user-workload-monitoring/configuring-performance-and-scalability-uwm.adoc @@ -23,7 +23,7 @@ By controlling placement and distribution of monitoring components, you can opti [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#using-node-selectors-to-move-monitoring-components_key-concepts[Using node selectors to move monitoring components] +* xref:../key-concepts/key-concepts.adoc#using-node-selectors-to-move-monitoring-components_key-concepts[Using node selectors to move monitoring components] include::modules/monitoring-moving-monitoring-components-to-different-nodes.adoc[leveloffset=+2,tags=**;!CPM;UWM] @@ -59,7 +59,7 @@ include::modules/monitoring-specifying-limits-and-requests-for-monitoring-compon [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#about-specifying-limits-and-requests-for-monitoring-components_key-concepts[About specifying limits and requests for monitoring components] +* xref:../key-concepts/key-concepts.adoc#about-specifying-limits-and-requests-for-monitoring-components_key-concepts[About specifying limits and requests for monitoring components] * link:https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#requests-and-limits[Requests and limits (Kubernetes documentation)] [id="controlling-the-impact-of-unbound-attributes-in-user-defined-projects_{context}"] @@ -88,7 +88,7 @@ Limiting scrape samples can help prevent the issues caused by adding many unboun [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#controlling-the-impact-of-unbound-attributes-in-user-defined-projects_key-concepts[Controlling the impact of unbound metrics attributes in user-defined projects] +* xref:../key-concepts/key-concepts.adoc#controlling-the-impact-of-unbound-attributes-in-user-defined-projects_key-concepts[Controlling the impact of unbound metrics attributes in user-defined projects] ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] * xref:../configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#enabling-monitoring-for-user-defined-projects-uwm_preparing-to-configure-the-monitoring-stack-uwm[Enabling monitoring for user-defined projects] endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] @@ -106,7 +106,7 @@ include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[lev [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#using-pod-topology-spread-constraints-for-monitoring_key-concepts[About pod topology spread constraints for monitoring] +* xref:../key-concepts/key-concepts.adoc#using-pod-topology-spread-constraints-for-monitoring_key-concepts[About pod topology spread constraints for monitoring] ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] * link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/nodes/index#nodes-scheduler-pod-topology-spread-constraints[Controlling pod placement by using pod topology spread constraints] endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] diff --git a/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc b/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc index 4cbcc084c66d..7e324cb0e1b7 100644 --- a/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc +++ b/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc @@ -50,7 +50,7 @@ include::modules/monitoring-enabling-alert-routing-for-user-defined-projects.ado [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#understanding-alert-routing-for-user-defined-projects_key-concepts[Understanding alert routing for user-defined projects] +* xref:../key-concepts/key-concepts.adoc#understanding-alert-routing-for-user-defined-projects_key-concepts[Understanding alert routing for user-defined projects] // Enabling the platform Alertmanager instance for user-defined alert routing ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] diff --git a/configuring-user-workload-monitoring/storing-and-recording-data-uwm.adoc b/configuring-user-workload-monitoring/storing-and-recording-data-uwm.adoc index 4adebce31c29..b6f5cc566d80 100644 --- a/configuring-user-workload-monitoring/storing-and-recording-data-uwm.adoc +++ b/configuring-user-workload-monitoring/storing-and-recording-data-uwm.adoc @@ -39,7 +39,7 @@ include::modules/monitoring-modifying-the-retention-time-for-thanos-ruler-metric [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#retention-time-and-size-for-prometheus-metrics-data_key-concepts[Retention time and size for Prometheus metrics] +* xref:../key-concepts/key-concepts.adoc#retention-time-and-size-for-prometheus-metrics-data_key-concepts[Retention time and size for Prometheus metrics] * link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/storage/index#understanding-persistent-storage[Understanding persistent storage] ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] * xref:../configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#enabling-monitoring-for-user-defined-projects-uwm_preparing-to-configure-the-monitoring-stack-uwm[Enabling monitoring for user-defined projects] diff --git a/key-concepts/_attributes b/key-concepts/_attributes new file mode 120000 index 000000000000..f27fd275ea6b --- /dev/null +++ b/key-concepts/_attributes @@ -0,0 +1 @@ +../_attributes/ \ No newline at end of file diff --git a/key-concepts/images b/key-concepts/images new file mode 120000 index 000000000000..e4c5bd02a10a --- /dev/null +++ b/key-concepts/images @@ -0,0 +1 @@ +../images/ \ No newline at end of file diff --git a/about-ocp-monitoring/key-concepts.adoc b/key-concepts/key-concepts.adoc similarity index 100% rename from about-ocp-monitoring/key-concepts.adoc rename to key-concepts/key-concepts.adoc diff --git a/key-concepts/modules b/key-concepts/modules new file mode 120000 index 000000000000..43aab75b53c9 --- /dev/null +++ b/key-concepts/modules @@ -0,0 +1 @@ +../modules/ \ No newline at end of file diff --git a/key-concepts/snippets b/key-concepts/snippets new file mode 120000 index 000000000000..9f5bc7e4dde0 --- /dev/null +++ b/key-concepts/snippets @@ -0,0 +1 @@ +../snippets \ No newline at end of file diff --git a/managing-alerts/managing-alerts-as-a-developer.adoc b/managing-alerts/managing-alerts-as-a-developer.adoc index 1766e072f57e..1d73af1432ef 100644 --- a/managing-alerts/managing-alerts-as-a-developer.adoc +++ b/managing-alerts/managing-alerts-as-a-developer.adoc @@ -21,7 +21,7 @@ include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#searching-alerts-silences-and-alerting-rules_key-concepts[Searching and filtering alerts, silences, and alerting rules] +* xref:../key-concepts/key-concepts.adoc#searching-alerts-silences-and-alerting-rules_key-concepts[Searching and filtering alerts, silences, and alerting rules] // Getting information about alerts, silences and alerting rules include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=+1] @@ -44,7 +44,7 @@ When you create silences, they are replicated across Alertmanager pods. However, [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#managing-silences_key-concepts[Managing silences] +* xref:../key-concepts/key-concepts.adoc#managing-silences_key-concepts[Managing silences] ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] * xref:../configuring-core-platform-monitoring/storing-and-recording-data.adoc#configuring-persistent-storage_storing-and-recording-data[Configuring persistent storage] @@ -69,9 +69,9 @@ In {product-title}, you can create, view, edit, and remove alerting rules for us [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#about-creating-alerting-rules-for-user-defined-projects_key-concepts[Creating alerting rules for user-defined projects] -* xref:../about-ocp-monitoring/key-concepts.adoc#managing-alerting-rules-for-user-defined-projects_key-concepts[Managing alerting rules for user-defined projects] -* xref:../about-ocp-monitoring/key-concepts.adoc#optimizing-alerting-for-user-defined-projects_key-concepts[Optimizing alerting for user-defined projects] +* xref:../key-concepts/key-concepts.adoc#about-creating-alerting-rules-for-user-defined-projects_key-concepts[Creating alerting rules for user-defined projects] +* xref:../key-concepts/key-concepts.adoc#managing-alerting-rules-for-user-defined-projects_key-concepts[Managing alerting rules for user-defined projects] +* xref:../key-concepts/key-concepts.adoc#optimizing-alerting-for-user-defined-projects_key-concepts[Optimizing alerting for user-defined projects] include::modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] diff --git a/managing-alerts/managing-alerts-as-an-administrator.adoc b/managing-alerts/managing-alerts-as-an-administrator.adoc index 9b7c7bcfb4e9..80b0a362a70b 100644 --- a/managing-alerts/managing-alerts-as-an-administrator.adoc +++ b/managing-alerts/managing-alerts-as-an-administrator.adoc @@ -21,7 +21,7 @@ include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#searching-alerts-silences-and-alerting-rules_key-concepts[Searching and filtering alerts, silences, and alerting rules] +* xref:../key-concepts/key-concepts.adoc#searching-alerts-silences-and-alerting-rules_key-concepts[Searching and filtering alerts, silences, and alerting rules] // Getting information about alerts, silences and alerting rules include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=+1] @@ -44,7 +44,7 @@ When you create silences, they are replicated across Alertmanager pods. However, [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#managing-silences_key-concepts[Managing silences] +* xref:../key-concepts/key-concepts.adoc#managing-silences_key-concepts[Managing silences] ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] * xref:../configuring-core-platform-monitoring/storing-and-recording-data.adoc#configuring-persistent-storage_storing-and-recording-data[Configuring persistent storage] @@ -75,8 +75,8 @@ For example, you can change the `severity` label for an alert from `warning` to [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#managing-core-platform-alerting-rules_key-concepts[Managing alerting rules for core platform monitoring] -* xref:../about-ocp-monitoring/key-concepts.adoc#tips-for-optimizing-alerting-rules-for-core-platform-monitoring_key-concepts[Tips for optimizing alerting rules for core platform monitoring] +* xref:../key-concepts/key-concepts.adoc#managing-core-platform-alerting-rules_key-concepts[Managing alerting rules for core platform monitoring] +* xref:../key-concepts/key-concepts.adoc#tips-for-optimizing-alerting-rules-for-core-platform-monitoring_key-concepts[Tips for optimizing alerting rules for core platform monitoring] include::modules/monitoring-creating-new-alerting-rules.adoc[leveloffset=+2] @@ -98,9 +98,9 @@ In {product-title}, you can create, view, edit, and remove alerting rules for us [role="_additional-resources"] .Additional resources -* xref:../about-ocp-monitoring/key-concepts.adoc#about-creating-alerting-rules-for-user-defined-projects_key-concepts[Creating alerting rules for user-defined projects] -* xref:../about-ocp-monitoring/key-concepts.adoc#managing-alerting-rules-for-user-defined-projects_key-concepts[Managing alerting rules for user-defined projects] -* xref:../about-ocp-monitoring/key-concepts.adoc#optimizing-alerting-for-user-defined-projects_key-concepts[Optimizing alerting for user-defined projects] +* xref:../key-concepts/key-concepts.adoc#about-creating-alerting-rules-for-user-defined-projects_key-concepts[Creating alerting rules for user-defined projects] +* xref:../key-concepts/key-concepts.adoc#managing-alerting-rules-for-user-defined-projects_key-concepts[Managing alerting rules for user-defined projects] +* xref:../key-concepts/key-concepts.adoc#optimizing-alerting-for-user-defined-projects_key-concepts[Optimizing alerting for user-defined projects] include::modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] diff --git a/getting-started/sd-accessing-monitoring-for-user-defined-projects.adoc b/rosa_osd_assemblies/sd-accessing-monitoring-for-user-defined-projects.adoc similarity index 100% rename from getting-started/sd-accessing-monitoring-for-user-defined-projects.adoc rename to rosa_osd_assemblies/sd-accessing-monitoring-for-user-defined-projects.adoc diff --git a/getting-started/sd-disabling-monitoring-for-user-defined-projects.adoc b/rosa_osd_assemblies/sd-disabling-monitoring-for-user-defined-projects.adoc similarity index 100% rename from getting-started/sd-disabling-monitoring-for-user-defined-projects.adoc rename to rosa_osd_assemblies/sd-disabling-monitoring-for-user-defined-projects.adoc diff --git a/support-for-monitoring/_attributes b/support-for-monitoring/_attributes new file mode 120000 index 000000000000..f27fd275ea6b --- /dev/null +++ b/support-for-monitoring/_attributes @@ -0,0 +1 @@ +../_attributes/ \ No newline at end of file diff --git a/support-for-monitoring/images b/support-for-monitoring/images new file mode 120000 index 000000000000..e4c5bd02a10a --- /dev/null +++ b/support-for-monitoring/images @@ -0,0 +1 @@ +../images/ \ No newline at end of file diff --git a/getting-started/maintenance-and-support-for-monitoring.adoc b/support-for-monitoring/maintenance-and-support-for-monitoring.adoc similarity index 100% rename from getting-started/maintenance-and-support-for-monitoring.adoc rename to support-for-monitoring/maintenance-and-support-for-monitoring.adoc diff --git a/support-for-monitoring/modules b/support-for-monitoring/modules new file mode 120000 index 000000000000..43aab75b53c9 --- /dev/null +++ b/support-for-monitoring/modules @@ -0,0 +1 @@ +../modules/ \ No newline at end of file diff --git a/support-for-monitoring/snippets b/support-for-monitoring/snippets new file mode 120000 index 000000000000..9f5bc7e4dde0 --- /dev/null +++ b/support-for-monitoring/snippets @@ -0,0 +1 @@ +../snippets \ No newline at end of file