Skip to content

Commit 4d30913

Browse files
authored
Merge pull request #73723 from eromanova97/OBSDOCS-197
/lgtm, merging OBSDOCS-197: Clarify information about secrets in custom Alertmanager…
2 parents 55a9f2d + ce3f0ca commit 4d30913

4 files changed

+5
-5
lines changed

modules/monitoring-creating-cluster-monitoring-configmap.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="creating-cluster-monitoring-configmap_{context}"]
77
= Creating a cluster monitoring config map
88

9-
To configure core {product-title} monitoring components, you must create the `cluster-monitoring-config` `ConfigMap` object in the `openshift-monitoring` project.
9+
You can configure the core {product-title} monitoring components by creating the `cluster-monitoring-config` `ConfigMap` object in the `openshift-monitoring` project. The Cluster Monitoring Operator (CMO) then configures the core components of the monitoring stack.
1010

1111
[NOTE]
1212
====

modules/monitoring-creating-user-defined-workload-monitoring-configmap.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="creating-user-defined-workload-monitoring-configmap_{context}"]
77
= Creating a user-defined workload monitoring config map
88

9-
To configure the components that monitor user-defined projects, you must create the `user-workload-monitoring-config` `ConfigMap` object in the `openshift-user-workload-monitoring` project.
9+
You can configure the user workload monitoring components by creating the `user-workload-monitoring-config` `ConfigMap` object in the `openshift-user-workload-monitoring` project. The Cluster Monitoring Operator (CMO) then configures the components that monitor user-defined projects.
1010

1111
[NOTE]
1212
====

modules/monitoring-support-considerations.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ ifndef::openshift-dedicated,openshift-rosa[]
1414
+
1515
[NOTE]
1616
====
17-
The Alertmanager configuration is deployed as a secret resource in the `openshift-monitoring` namespace.
18-
If you have enabled a separate Alertmanager instance for user-defined alert routing, an Alertmanager configuration is also deployed as a secret resource in the `openshift-user-workload-monitoring` namespace.
17+
The Alertmanager configuration is deployed as the `alertmanager-main` secret resource in the `openshift-monitoring` namespace.
18+
If you have enabled a separate Alertmanager instance for user-defined alert routing, an Alertmanager configuration is also deployed as the `alertmanager-user-workload` secret resource in the `openshift-user-workload-monitoring` namespace.
1919
To configure additional routes for any instance of Alertmanager, you need to decode, modify, and then encode that secret.
2020
This procedure is a supported exception to the preceding statement.
2121
====

monitoring/configuring-the-monitoring-stack.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ifndef::openshift-dedicated,openshift-rosa[]
3737
[id="preparing-to-configure-the-monitoring-stack"]
3838
== Preparing to configure the monitoring stack
3939

40-
You can configure the monitoring stack by creating and updating monitoring config maps.
40+
You can configure the monitoring stack by creating and updating monitoring config maps. These config maps configure the Cluster Monitoring Operator (CMO), which in turn configures the components of the monitoring stack.
4141

4242
include::modules/monitoring-creating-cluster-monitoring-configmap.adoc[leveloffset=+2]
4343
include::modules/monitoring-creating-user-defined-workload-monitoring-configmap.adoc[leveloffset=+2]

0 commit comments

Comments
 (0)