Skip to content

Commit bdee332

Browse files
committed
OBSDOCS-819: Add and implement attributes for the Cluster Monitoring Operator
1 parent fe06805 commit bdee332

23 files changed

+41
-38
lines changed

_attributes/common-attributes.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ endif::[]
147147
//observability
148148
:ObservabilityLongName: Red Hat OpenShift Observability
149149
:ObservabilityShortName: Observability
150+
// Cluster Monitoring Operator
151+
:cmo-first: Cluster Monitoring Operator (CMO)
152+
:cmo-full: Cluster Monitoring Operator
153+
:cmo-short: CMO
150154
//power monitoring
151155
:PM-title-c: Power monitoring for Red Hat OpenShift
152156
:PM-title: power monitoring for Red Hat OpenShift

modules/cluster-monitoring-operator.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// * operators/operator-reference.adoc
44

55
[id="cluster-monitoring-operator_{context}"]
6-
= Cluster Monitoring Operator
6+
= {cmo-full}
77

88
[discrete]
99
== Purpose
1010

11-
The Cluster Monitoring Operator manages and updates the Prometheus-based cluster monitoring stack deployed on top of {product-title}.
11+
The {cmo-first} manages and updates the Prometheus-based cluster monitoring stack deployed on top of {product-title}.
1212

1313
[discrete]
1414
== Project

modules/infrastructure-moving-monitoring.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
= Moving the monitoring solution
88

99
The monitoring stack includes multiple components, including Prometheus, Thanos Querier, and Alertmanager.
10-
The Cluster Monitoring Operator manages this stack. To redeploy the monitoring stack to infrastructure nodes, you can create and apply a custom config map.
10+
The {cmo-full} manages this stack. To redeploy the monitoring stack to infrastructure nodes, you can create and apply a custom config map.
1111

1212
.Procedure
1313

modules/monitoring-common-terms.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Alertmanager handles alerts received from Prometheus. Alertmanager is also respo
1414
Alerting rules::
1515
Alerting rules contain a set of conditions that outline a particular state within a cluster. Alerts are triggered when those conditions are true. An alerting rule can be assigned a severity that defines how the alerts are routed.
1616

17-
Cluster Monitoring Operator::
18-
The Cluster Monitoring Operator (CMO) is a central component of the monitoring stack. It deploys and manages Prometheus instances such as, the Thanos Querier, the Telemeter Client, and metrics targets to ensure that they are up to date. The CMO is deployed by the Cluster Version Operator (CVO).
17+
{cmo-full}::
18+
The {cmo-first} is a central component of the monitoring stack. It deploys and manages Prometheus instances such as, the Thanos Querier, the Telemeter Client, and metrics targets to ensure that they are up to date. The {cmo-short} is deployed by the Cluster Version Operator (CVO).
1919

2020
Cluster Version Operator::
2121
The Cluster Version Operator (CVO) manages the lifecycle of cluster Operators, many of which are installed in {product-title} by default.

modules/monitoring-configuring-different-alert-receivers-for-default-platform-alerts-and-user-defined-alerts.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ You can configure different alert receivers for default platform alerts and user
1111
* All default platform alerts are sent to a receiver owned by the team in charge of these alerts.
1212
* All user-defined alerts are sent to another receiver so that the team can focus only on platform alerts.
1313
14-
You can achieve this by using the `openshift_io_alert_source="platform"` label that is added by the Cluster Monitoring Operator to all platform alerts:
14+
You can achieve this by using the `openshift_io_alert_source="platform"` label that is added by the {cmo-full} to all platform alerts:
1515

1616
* Use the `openshift_io_alert_source="platform"` matcher to match default platform alerts.
1717
* Use the `openshift_io_alert_source!="platform"` or `'openshift_io_alert_source=""'` matcher to match user-defined alerts.

modules/monitoring-configuring-pod-topology-spread-constraints.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
You can configure pod topology spread constraints for
1010
ifndef::openshift-dedicated,openshift-rosa[]
11-
all the pods deployed by the Cluster Monitoring Operator
11+
all the pods deployed by the {cmo-full}
1212
endif::openshift-dedicated,openshift-rosa[]
1313
ifdef::openshift-dedicated,openshift-rosa[]
1414
all the pods for user-defined monitoring

modules/monitoring-configuring-the-monitoring-stack.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
= Configuring the monitoring stack
88

99
ifndef::openshift-dedicated,openshift-rosa[]
10-
In {product-title} {product-version}, you can configure the monitoring stack using the `cluster-monitoring-config` or `user-workload-monitoring-config` `ConfigMap` objects. Config maps configure the Cluster Monitoring Operator (CMO), which in turn configures the components of the stack.
10+
In {product-title} {product-version}, you can configure the monitoring stack using the `cluster-monitoring-config` or `user-workload-monitoring-config` `ConfigMap` objects. Config maps configure the {cmo-first}, which in turn configures the components of the stack.
1111
endif::openshift-dedicated,openshift-rosa[]
1212
ifdef::openshift-dedicated,openshift-rosa[]
13-
In {product-title}, you can configure the stack that monitors workloads for user-defined projects by using the `user-workload-monitoring-config` `ConfigMap` object. Config maps configure the Cluster Monitoring Operator (CMO), which in turn configures the components of the stack.
13+
In {product-title}, you can configure the stack that monitors workloads for user-defined projects by using the `user-workload-monitoring-config` `ConfigMap` object. Config maps configure the {cmo-first}, which in turn configures the components of the stack.
1414
endif::openshift-dedicated,openshift-rosa[]
1515

1616
.Prerequisites

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-
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.
9+
You can configure the core {product-title} monitoring components by creating the `cluster-monitoring-config` `ConfigMap` object in the `openshift-monitoring` project. The {cmo-first} 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-
You can configure the user workload monitoring components with 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.
9+
You can configure the user workload monitoring components with the `user-workload-monitoring-config` `ConfigMap` object in the `openshift-user-workload-monitoring` project. The {cmo-first} then configures the components that monitor user-defined projects.
1010

1111
[NOTE]
1212
====

modules/monitoring-default-monitoring-components.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ By default, the {product-title} {product-version} monitoring stack includes thes
1414

1515
|Component|Description
1616

17-
|Cluster Monitoring Operator
18-
|The Cluster Monitoring Operator (CMO) is a central component of the monitoring stack. It deploys, manages, and automatically updates Prometheus and Alertmanager instances, Thanos Querier, Telemeter Client, and metrics targets. The CMO is deployed by the Cluster Version Operator (CVO).
17+
|{cmo-full}
18+
|The {cmo-first} is a central component of the monitoring stack. It deploys, manages, and automatically updates Prometheus and Alertmanager instances, Thanos Querier, Telemeter Client, and metrics targets. The {cmo-short} is deployed by the Cluster Version Operator (CVO).
1919

2020
|Prometheus Operator
2121
|The Prometheus Operator (PO) in the `openshift-monitoring` project creates, configures, and manages platform Prometheus instances and Alertmanager instances. It also automatically generates monitoring target configurations based on Kubernetes label queries.
@@ -34,7 +34,7 @@ By default, the {product-title} {product-version} monitoring stack includes thes
3434

3535
|monitoring-plugin
3636
|The monitoring-plugin dynamic plugin component deploys the monitoring pages in the *Observe* section of the {product-title} web console.
37-
You can use Cluster Monitoring Operator (CMO) config map settings to manage monitoring-plugin resources for the web console pages.
37+
You can use {cmo-full} config map settings to manage monitoring-plugin resources for the web console pages.
3838

3939
|openshift-state-metrics agent
4040
|The openshift-state-metrics exporter (OSM in the preceding diagram) expands upon kube-state-metrics by adding metrics for {product-title}-specific resources.

0 commit comments

Comments
 (0)