Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ include::modules/monitoring-querying-metrics-for-user-defined-projects-with-mon-
[role="_additional-resources"]
.Additional resources

* link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Querying Prometheus] (Prometheus documentation)
* link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Querying Prometheus (Prometheus documentation)]

//Reviewing monitoring dashboards as a developer
include::modules/monitoring-reviewing-monitoring-dashboards-developer.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ include::modules/monitoring-querying-metrics-for-all-projects-with-mon-dashboard
[role="_additional-resources"]
.Additional resources

* link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Querying Prometheus] (Prometheus documentation)
* link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Querying Prometheus (Prometheus documentation)]

//Getting detailed information about a metrics target
include::modules/monitoring-getting-detailed-information-about-a-target.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include::modules/monitoring-disabling-the-local-alertmanager.adoc[leveloffset=+2
[role="_additional-resources"]
.Additional resources

* link:https://prometheus.io/docs/alerting/latest/alertmanager/[Alertmanager] (Prometheus documentation)
* link:https://prometheus.io/docs/alerting/latest/alertmanager/[Alertmanager (Prometheus documentation)]
* xref:../../../observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc#managing-alerts-as-an-administrator[Managing alerts as an Administrator]

//Configuring secrets for Alertmanager
Expand Down Expand Up @@ -47,8 +47,8 @@ Alertmanager does not send notifications by default. It is strongly recommended
.Additional resources

* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#sending-notifications-to-external-systems_key-concepts[Sending notifications to external systems]
* link:https://www.pagerduty.com/[PagerDuty] (PagerDuty official site)
* link:https://www.pagerduty.com/docs/guides/prometheus-integration-guide/[Prometheus Integration Guide] (PagerDuty official site)
* link:https://www.pagerduty.com/[PagerDuty website]
* link:https://www.pagerduty.com/docs/guides/prometheus-integration-guide/[Prometheus Integration Guide (PagerDuty documentation)]
* xref:../../../observability/monitoring/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:../../../observability/monitoring/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]

Expand All @@ -57,13 +57,13 @@ include::modules/monitoring-configuring-alert-routing-default-platform-alerts.ad
[role="_additional-resources"]
.Additional resources

* link:https://access.redhat.com/solutions/6828481[Send test alerts to Alertmanager in OpenShift 4] (Red{nbsp}Hat Customer Portal)
* link:https://access.redhat.com/solutions/6828481[Send test alerts to Alertmanager in OpenShift 4 (Red{nbsp}Hat Customer Portal)]

include::modules/monitoring-configuring-alert-routing-console.adoc[leveloffset=+2]

[role="_additional-resources"]
.Additional resources

* link:https://access.redhat.com/solutions/6828481[Send test alerts to Alertmanager in OpenShift 4] (Red{nbsp}Hat Customer Portal)
* link:https://access.redhat.com/solutions/6828481[Send test alerts to Alertmanager in OpenShift 4 (Red{nbsp}Hat Customer Portal)]

include::modules/monitoring-configuring-different-alert-receivers-for-default-platform-alerts-and-user-defined-alerts.adoc[leveloffset=+2]
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ include::modules/monitoring-configuring-remote-write-storage.adoc[leveloffset=+1
.Additional resources

* xref:../../../rest_api/monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#spec-remotewrite-writerelabelconfigs[`writeRelabelConfigs`]
* link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config[`relabel_config`] (Prometheus documentation)
* link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config[`relabel_config` (Prometheus documentation)]

include::modules/monitoring-supported-remote-write-authentication-settings.adoc[leveloffset=+2]

Expand All @@ -34,8 +34,8 @@ include::modules/monitoring-example-remote-write-queue-configuration.adoc[levelo
.Additional resources

* xref:../../../rest_api/monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#spec-remotewrite-2[Prometheus REST API reference for remote write]
* link:https://prometheus.io/docs/operating/integrations/#remote-endpoints-and-storage[Setting up remote write compatible endpoints] (Prometheus documentation)
* link:https://prometheus.io/docs/practices/remote_write/#remote-write-tuning[Tuning remote write settings] (Prometheus documentation)
* link:https://prometheus.io/docs/operating/integrations/#remote-endpoints-and-storage[Remote write compatible endpoints (Prometheus documentation)]
* link:https://prometheus.io/docs/practices/remote_write/#remote-write-tuning[Remote write tuning (Prometheus documentation)]
* xref:../../../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets-about_nodes-pods-secrets[Understanding secrets]

//Creating cluster ID labels for metrics for core platform monitoring
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ include::modules/monitoring-moving-monitoring-components-to-different-nodes.adoc
* xref:../../../observability/monitoring/configuring-core-platform-monitoring/preparing-to-configure-the-monitoring-stack.adoc#preparing-to-configure-the-monitoring-stack[Preparing to configure core platform monitoring stack]
* xref:../../../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-updating_nodes-nodes-working[Understanding how to update labels on nodes]
* xref:../../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors]
* link:https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector[nodeSelector] (Kubernetes documentation)
* link:https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector[`nodeSelector` (Kubernetes documentation)]

include::modules/monitoring-assigning-tolerations-to-monitoring-components.adoc[leveloffset=+2,tags=**;CPM;!UWM]

Expand All @@ -44,15 +44,15 @@ include::modules/monitoring-assigning-tolerations-to-monitoring-components.adoc[

* xref:../../../observability/monitoring/configuring-core-platform-monitoring/preparing-to-configure-the-monitoring-stack.adoc#preparing-to-configure-the-monitoring-stack[Preparing to configure core platform monitoring stack]
* xref:../../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
* link:https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[Taints and Tolerations] (Kubernetes documentation)
* link:https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[Taints and tolerations (Kubernetes documentation)]

// Setting the body size limit for metrics scraping
include::modules/monitoring-setting-the-body-size-limit-for-metrics-scraping.adoc[leveloffset=+1]

[role="_additional-resources"]
.Additional resources

* link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config[scrape_config configuration] (Prometheus documentation)
* link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config[`scrape_config` (Prometheus documentation)]

[id="managing-cpu-and-memory-resources-for-monitoring-components_{context}"]
== Managing CPU and memory resources for monitoring components
Expand All @@ -67,7 +67,7 @@ include::modules/monitoring-specifying-limits-and-requests-for-monitoring-compon
.Additional resources

* xref:../../../observability/monitoring/about-ocp-monitoring/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[Kubernetes requests and limits documentation] (Kubernetes documentation)
* link:https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#requests-and-limits[Requests and limits (Kubernetes documentation)]

// Choosing a metrics collection profile
include::modules/monitoring-choosing-a-metrics-collection-profile.adoc[leveloffset=+1]
Expand All @@ -87,7 +87,7 @@ include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[lev

* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#using-pod-topology-spread-constraints-for-monitoring_key-concepts[About pod topology spread constraints for monitoring]
* xref:../../../nodes/scheduling/nodes-scheduler-pod-topology-spread-constraints.adoc#nodes-scheduler-pod-topology-spread-constraints-about[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)
* link:https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/[Pod topology spread constraints (Kubernetes documentation)]



Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include::modules/monitoring-configuring-a-persistent-volume-claim.adoc[leveloffs
.Additional resources

* xref:../../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage]
* link:https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims[PersistentVolumeClaims] (Kubernetes documentation)
* link:https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims[PersistentVolumeClaims (Kubernetes documentation)]

include::modules/monitoring-resizing-a-persistent-volume.adoc[leveloffset=+2,tags=**;CPM;!UWM]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Review the following limitations of alert routing for user-defined projects:

* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#understanding-alert-routing-for-user-defined-projects_key-concepts[Understanding alert routing for user-defined projects]
* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#sending-notifications-to-external-systems_key-concepts[Sending notifications to external systems]
* link:https://www.pagerduty.com/[PagerDuty] (PagerDuty official site)
* link:https://www.pagerduty.com/docs/guides/prometheus-integration-guide/[Prometheus Integration Guide] (PagerDuty official site)
* link:https://www.pagerduty.com/[PagerDuty website]
* link:https://www.pagerduty.com/docs/guides/prometheus-integration-guide/[Prometheus Integration Guide (PagerDuty documentation)]
* xref:../../../observability/monitoring/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:../../../observability/monitoring/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]

Expand All @@ -58,13 +58,13 @@ include::modules/monitoring-configuring-alert-routing-for-user-defined-projects.
[role="_additional-resources"]
.Additional resources

* link:https://access.redhat.com/solutions/6828481[Send test alerts to Alertmanager in OpenShift 4] (Red{nbsp}Hat Customer Portal)
* link:https://access.redhat.com/solutions/6828481[Send test alerts to Alertmanager in OpenShift 4 (Red{nbsp}Hat Customer Portal)]

include::modules/monitoring-configuring-alert-routing-user-defined-alerts-secret.adoc[leveloffset=+2]

[role="_additional-resources"]
.Additional resources

* link:https://access.redhat.com/solutions/6828481[Send test alerts to Alertmanager in OpenShift 4] (Red{nbsp}Hat Customer Portal)
* link:https://access.redhat.com/solutions/6828481[Send test alerts to Alertmanager in OpenShift 4 (Red{nbsp}Hat Customer Portal)]

include::modules/monitoring-configuring-different-alert-receivers-for-default-platform-alerts-and-user-defined-alerts.adoc[leveloffset=+2]
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ include::modules/monitoring-configuring-remote-write-storage.adoc[leveloffset=+1
.Additional resources

* xref:../../../rest_api/monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#spec-remotewrite-writerelabelconfigs[`writeRelabelConfigs`]
* link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config[`relabel_config`] (Prometheus documentation)
* link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config[`relabel_config` (Prometheus documentation)]

include::modules/monitoring-supported-remote-write-authentication-settings.adoc[leveloffset=+2]

Expand All @@ -34,8 +34,8 @@ include::modules/monitoring-example-remote-write-queue-configuration.adoc[levelo
.Additional resources

* xref:../../../rest_api/monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#spec-remotewrite-2[Prometheus REST API reference for remote write]
* link:https://prometheus.io/docs/operating/integrations/#remote-endpoints-and-storage[Setting up remote write compatible endpoints] (Prometheus documentation)
* link:https://prometheus.io/docs/practices/remote_write/#remote-write-tuning[Tuning remote write settings] (Prometheus documentation)
* link:https://prometheus.io/docs/operating/integrations/#remote-endpoints-and-storage[Remote write compatible endpoints (Prometheus documentation)]
* link:https://prometheus.io/docs/practices/remote_write/#remote-write-tuning[Remote write tuning (Prometheus documentation)]
* xref:../../../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets-about_nodes-pods-secrets[Understanding secrets]

// Creating cluster ID labels for metrics for monitoring of user-defined projects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ include::modules/monitoring-moving-monitoring-components-to-different-nodes.adoc
* xref:../../../observability/monitoring/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]
* xref:../../../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-updating_nodes-nodes-working[Understanding how to update labels on nodes]
* xref:../../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors]
* link:https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector[nodeSelector] (Kubernetes documentation)
* link:https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector[`nodeSelector` (Kubernetes documentation)]

include::modules/monitoring-assigning-tolerations-to-monitoring-components.adoc[leveloffset=+2,tags=**;!CPM;UWM]

[role="_additional-resources"]
.Additional resources
* xref:../../../observability/monitoring/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]
* xref:../../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
* link:https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[Taints and Tolerations] (Kubernetes documentation)
* link:https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[Taints and tolerations (Kubernetes documentation)]

[id="managing-cpu-and-memory-resources-for-monitoring-components_{context}"]
== Managing CPU and memory resources for monitoring components
Expand All @@ -54,7 +54,7 @@ include::modules/monitoring-specifying-limits-and-requests-for-monitoring-compon
[role="_additional-resources"]
.Additional resources
* xref:../../../observability/monitoring/about-ocp-monitoring/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[Kubernetes requests and limits documentation] (Kubernetes documentation)
* 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}"]
== Controlling the impact of unbound metrics attributes in user-defined projects
Expand Down Expand Up @@ -94,4 +94,4 @@ include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[lev

* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#using-pod-topology-spread-constraints-for-monitoring_key-concepts[About pod topology spread constraints for monitoring]
* xref:../../../nodes/scheduling/nodes-scheduler-pod-topology-spread-constraints.adoc#nodes-scheduler-pod-topology-spread-constraints-about[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)
* link:https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/[Pod topology spread constraints (Kubernetes documentation)]
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include::modules/monitoring-configuring-a-persistent-volume-claim.adoc[leveloffs
.Additional resources

* xref:../../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage]
* link:https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims[PersistentVolumeClaims] (Kubernetes documentation)
* link:https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims[PersistentVolumeClaims (Kubernetes documentation)]

include::modules/monitoring-resizing-a-persistent-volume.adoc[leveloffset=+2,tags=**;!CPM;UWM]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ include::modules/monitoring-getting-information-about-alerts-silences-and-alerti

[role="_additional-resources"]
.Additional resources
* link:https://github.com/openshift/runbooks/tree/master/alerts/cluster-monitoring-operator[{cmo-full} runbooks] ({cmo-full} GitHub repository)
* link:https://github.com/openshift/runbooks/tree/master/alerts/cluster-monitoring-operator[GitHub {cmo-full} runbooks repository]

[id="managing-silences_{context}"]
== Managing silences
Expand Down Expand Up @@ -67,12 +67,12 @@ include::modules/monitoring-creating-alerting-rules-for-user-defined-projects.ad
[role="_additional-resources"]
.Additional resources
* xref:../../../observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc#monitoring-stack-architecture[Monitoring stack architecture]
* link:https://prometheus.io/docs/practices/alerting/[Alerting] (Prometheus documentation)
* 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"]
.Additional resources

* link:https://prometheus.io/docs/alerting/alertmanager/[Alertmanager] (Prometheus documentation)
* link:https://prometheus.io/docs/alerting/alertmanager/[Alertmanager (Prometheus documentation)]
Loading