diff --git a/observability/monitoring/about-ocp-monitoring/key-concepts.adoc b/observability/monitoring/about-ocp-monitoring/key-concepts.adoc index cffa1f371d..b1c6f735d9 100644 --- a/observability/monitoring/about-ocp-monitoring/key-concepts.adoc +++ b/observability/monitoring/about-ocp-monitoring/key-concepts.adoc @@ -83,6 +83,7 @@ endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] * xref:../../../observability/monitoring/accessing-metrics/accessing-metrics-as-a-developer.adoc#accessing-metrics-as-a-developer[Accessing metrics as a developer] include::modules/monitoring-controlling-the-impact-of-unbound-attributes-in-user-defined-projects.adoc[leveloffset=+2] + include::modules/monitoring-adding-cluster-id-labels-to-metrics.adoc[leveloffset=+2] //About monitoring dashboards @@ -112,16 +113,18 @@ include::modules/monitoring-managing-silences.adoc[leveloffset=+2] ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] include::modules/monitoring-managing-core-platform-alerting-rules.adoc[leveloffset=+2] + include::modules/monitoring-tips-for-optimizing-alerting-rules-for-core-platform-monitoring.adoc[leveloffset=+2] endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] include::modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] + include::modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] + include::modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc[leveloffset=+2] include::modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc[leveloffset=+2] - // Overview of setting up alert routing for user-defined projects include::modules/monitoring-understanding-alert-routing-for-user-defined-projects.adoc[leveloffset=+1] diff --git a/observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc b/observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc index b009e3617c..99d7d081c6 100644 --- a/observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc +++ b/observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc @@ -27,10 +27,12 @@ include::modules/monitoring-default-monitoring-targets.adoc[leveloffset=+2] //Components for monitoring user-defined projects include::modules/monitoring-components-for-monitoring-user-defined-projects.adoc[leveloffset=+1] + include::modules/monitoring-targets-for-user-defined-projects.adoc[leveloffset=+2] //The monitoring stack in high-availability clusters include::modules/monitoring-monitoring-stack-in-ha-clusters.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources diff --git a/observability/monitoring/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc b/observability/monitoring/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc index 79394346c9..67d1cd93a2 100644 --- a/observability/monitoring/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc +++ b/observability/monitoring/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc @@ -8,6 +8,9 @@ toc::[] You can configure the monitoring stack to optimize the performance and scale of your clusters. The following documentation provides information about how to distribute the monitoring components and control the impact of the monitoring stack on CPU and memory resources. +[role="_additional-resources"] +.Additional resources + * xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#about-performance-and-scalability_key-concepts[About performance and scalability] [id="controlling-placement-and-distribution-of-monitoing-components_{context}"] diff --git a/observability/monitoring/configuring-core-platform-monitoring/preparing-to-configure-the-monitoring-stack.adoc b/observability/monitoring/configuring-core-platform-monitoring/preparing-to-configure-the-monitoring-stack.adoc index fd96114170..fffdd177ed 100644 --- a/observability/monitoring/configuring-core-platform-monitoring/preparing-to-configure-the-monitoring-stack.adoc +++ b/observability/monitoring/configuring-core-platform-monitoring/preparing-to-configure-the-monitoring-stack.adoc @@ -1,6 +1,5 @@ :_mod-docs-content-type: ASSEMBLY include::_attributes/common-attributes.adoc[] - [id="preparing-to-configure-the-monitoring-stack"] = Preparing to configure core platform monitoring stack :context: preparing-to-configure-the-monitoring-stack @@ -35,5 +34,6 @@ include::modules/monitoring-granting-users-permissions-for-core-platform-monitor * xref:../../../observability/monitoring/accessing-metrics/accessing-monitoring-apis-by-using-the-cli.adoc#cmo-services-resources_accessing-monitoring-apis-by-using-the-cli[CMO services resources] include::modules/monitoring-granting-user-permissions-using-the-web-console.adoc[leveloffset=+2] + include::modules/monitoring-granting-user-permissions-using-the-cli.adoc[leveloffset=+2,tags=**;CPM;!UWM] diff --git a/observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc b/observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc index cf1412a247..825bf02712 100644 --- a/observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc +++ b/observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc @@ -58,6 +58,7 @@ include::modules/monitoring-enabling-the-platform-alertmanager-instance-for-user endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] include::modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc[leveloffset=+2] + include::modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc[leveloffset=+2] [role="_additional-resources"] @@ -76,6 +77,7 @@ include::modules/monitoring-granting-users-permission-to-monitor-user-defined-pr * xref:../../../observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#granting-users-permission-to-configure-alert-routing-for-user-defined-projects_preparing-to-configure-the-monitoring-stack-uwm[Granting users permission to configure alert routing for user-defined projects] include::modules/monitoring-granting-user-permissions-using-the-web-console.adoc[leveloffset=+2] + include::modules/monitoring-granting-user-permissions-using-the-cli.adoc[leveloffset=+2,tags=**;UWM;!CPM] endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] diff --git a/observability/monitoring/getting-started/maintenance-and-support-for-monitoring.adoc b/observability/monitoring/getting-started/maintenance-and-support-for-monitoring.adoc index 296088205f..3060090b57 100644 --- a/observability/monitoring/getting-started/maintenance-and-support-for-monitoring.adoc +++ b/observability/monitoring/getting-started/maintenance-and-support-for-monitoring.adoc @@ -18,6 +18,7 @@ Installing another Prometheus instance is not supported by the Red Hat Site Reli endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] include::modules/monitoring-support-considerations.adoc[leveloffset=+1] + ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] include::modules/monitoring-support-policy-for-monitoring-operators.adoc[leveloffset=+1] endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] diff --git a/observability/monitoring/getting-started/sd-accessing-monitoring-for-user-defined-projects.adoc b/observability/monitoring/getting-started/sd-accessing-monitoring-for-user-defined-projects.adoc index 6ea75b80ac..dfe9084010 100644 --- a/observability/monitoring/getting-started/sd-accessing-monitoring-for-user-defined-projects.adoc +++ b/observability/monitoring/getting-started/sd-accessing-monitoring-for-user-defined-projects.adoc @@ -1,7 +1,7 @@ :_mod-docs-content-type: ASSEMBLY +include::_attributes/attributes-openshift-dedicated.adoc[] [id="sd-accessing-monitoring-for-user-defined-projects"] = Accessing monitoring for user-defined projects -include::_attributes/attributes-openshift-dedicated.adoc[] :context: sd-accessing-monitoring-for-user-defined-projects toc::[] diff --git a/observability/monitoring/getting-started/sd-disabling-monitoring-for-user-defined-projects.adoc b/observability/monitoring/getting-started/sd-disabling-monitoring-for-user-defined-projects.adoc index 9b31f0706d..6ad67c87ad 100644 --- a/observability/monitoring/getting-started/sd-disabling-monitoring-for-user-defined-projects.adoc +++ b/observability/monitoring/getting-started/sd-disabling-monitoring-for-user-defined-projects.adoc @@ -1,7 +1,7 @@ :_mod-docs-content-type: ASSEMBLY +include::_attributes/attributes-openshift-dedicated.adoc[] [id="sd-disabling-monitoring-for-user-defined-projects"] = Disabling monitoring for user-defined projects -include::_attributes/attributes-openshift-dedicated.adoc[] :context: sd-disabling-monitoring-for-user-defined-projects toc::[] diff --git a/observability/monitoring/managing-alerts/managing-alerts-as-a-developer.adoc b/observability/monitoring/managing-alerts/managing-alerts-as-a-developer.adoc index f5a111fbea..3b75c74f37 100644 --- a/observability/monitoring/managing-alerts/managing-alerts-as-a-developer.adoc +++ b/observability/monitoring/managing-alerts/managing-alerts-as-a-developer.adoc @@ -55,7 +55,9 @@ ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] include::modules/monitoring-silencing-alerts.adoc[leveloffset=+2] + include::modules/monitoring-editing-silences.adoc[leveloffset=+2] + include::modules/monitoring-expiring-silences.adoc[leveloffset=+2] @@ -72,6 +74,7 @@ In {product-title}, you can create, view, edit, and remove alerting rules for us * xref:../../../observability/monitoring/about-ocp-monitoring/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] + include::modules/monitoring-creating-cross-project-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] [role="_additional-resources"] @@ -80,6 +83,7 @@ include::modules/monitoring-creating-cross-project-alerting-rules-for-user-defin * link:https://prometheus.io/docs/practices/alerting/[Alerting (Prometheus documentation)] include::modules/monitoring-accessing-alerting-rules-for-your-project.adoc[leveloffset=+2] + include::modules/monitoring-removing-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] [role="_additional-resources"] diff --git a/observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc b/observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc index c7a7dcf0f9..47f5d3ac6e 100644 --- a/observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc +++ b/observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc @@ -55,7 +55,9 @@ ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] include::modules/monitoring-silencing-alerts.adoc[leveloffset=+2] + include::modules/monitoring-editing-silences.adoc[leveloffset=+2] + include::modules/monitoring-expiring-silences.adoc[leveloffset=+2] ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] @@ -77,6 +79,7 @@ For example, you can change the `severity` label for an alert from `warning` to * xref:../../../observability/monitoring/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] include::modules/monitoring-creating-new-alerting-rules.adoc[leveloffset=+2] + include::modules/monitoring-modifying-core-platform-alerting-rules.adoc[leveloffset=+2] [role="_additional-resources"] @@ -100,6 +103,7 @@ In {product-title}, you can create, view, edit, and remove alerting rules for us * xref:../../../observability/monitoring/about-ocp-monitoring/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] + include::modules/monitoring-creating-cross-project-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] [role="_additional-resources"] @@ -109,7 +113,9 @@ include::modules/monitoring-creating-cross-project-alerting-rules-for-user-defin * link:https://prometheus.io/docs/practices/alerting/[Alerting (Prometheus documentation)] include::modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc[leveloffset=+2] + include::modules/monitoring-removing-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] + include::modules/monitoring-disabling-cross-project-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] [role="_additional-resources"] diff --git a/observability/monitoring/troubleshooting-monitoring-issues.adoc b/observability/monitoring/troubleshooting-monitoring-issues.adoc index a1a1a23159..23d1ea3092 100644 --- a/observability/monitoring/troubleshooting-monitoring-issues.adoc +++ b/observability/monitoring/troubleshooting-monitoring-issues.adoc @@ -1,7 +1,7 @@ :_mod-docs-content-type: ASSEMBLY +include::_attributes/common-attributes.adoc[] [id="troubleshooting-monitoring-issues"] = Troubleshooting monitoring issues -include::_attributes/common-attributes.adoc[] :context: troubleshooting-monitoring-issues toc::[] @@ -46,6 +46,7 @@ include::modules/monitoring-resolving-the-kubepersistentvolumefillingup-alert-fi ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[] // Resolving the AlertmanagerReceiversNotConfigured alert firing for Prometheus include::modules/monitoring-resolving-the-alertmanagerreceiversnotconfigured-alert.adoc[leveloffset=+1] + [role="_additional-resources"] .Additional resources * xref:../../observability/monitoring/configuring-core-platform-monitoring/configuring-alerts-and-notifications.adoc#configuring-alert-notifications_configuring-alerts-and-notifications[Configuring alert notifications for default platform monitoring]