Skip to content

Commit 92b5262

Browse files
authored
Merge pull request #51804 from bburt-rh/RHDEVDOCS-4540-update-custom-prometheus-guidance-for-uwm
RHDEVDOCS-4540 - Clarify custom Prometheus guidance for user-defined monitoring
2 parents 55b1368 + b11ba97 commit 92b5262

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

modules/monitoring-support-considerations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This procedure is a supported exception to the preceding statement.
2121
+
2222
* *Modifying resources of the stack.* The {product-title} monitoring stack ensures its resources are always in the state it expects them to be. If they are modified, the stack will reset them.
2323
* *Deploying user-defined workloads to `openshift-*`, and `kube-*` projects.* These projects are reserved for Red Hat provided components and they should not be used for user-defined workloads.
24-
* *Installing custom Prometheus instances on {product-title}.*
24+
* *Installing custom Prometheus instances on {product-title}.* A custom instance is a Prometheus custom resource (CR) managed by the Prometheus Operator.
2525
* *Enabling symptom based monitoring by using the `Probe` custom resource definition (CRD) in Prometheus Operator.*
2626
2727
[NOTE]

monitoring/enabling-monitoring-for-user-defined-projects.adoc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ toc::[]
88

99
In {product-title} {product-version}, you can enable monitoring for user-defined projects in addition to the default platform monitoring. You can monitor your own projects in {product-title} without the need for an additional monitoring solution. Using this feature centralizes monitoring for core platform components and user-defined projects.
1010

11-
[NOTE]
12-
====
13-
Custom Prometheus instances and the Prometheus Operator installed through Operator Lifecycle Manager (OLM) can cause issues with user-defined workload monitoring if it is enabled. Custom Prometheus instances are not supported in {product-title}.
14-
====
11+
include::snippets/monitoring-custom-prometheus-note.adoc[]
1512

1613
// Enabling monitoring for user-defined projects
1714
include::modules/monitoring-enabling-monitoring-for-user-defined-projects.adoc[leveloffset=+1]
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Text snippet included in the following modules:
2+
//
3+
// * modules/monitoring-enabling-monitoring-for-user-defined-projects.adoc
4+
5+
:_content-type: SNIPPET
6+
7+
[NOTE]
8+
====
9+
Versions of Prometheus Operator installed using Operator Lifecycle Manager (OLM) are not compatible with user-defined monitoring. Therefore, custom Prometheus instances installed as a Prometheus custom resource (CR) managed by the OLM Prometheus Operator are not supported in {product-title}.
10+
====

0 commit comments

Comments
 (0)