Skip to content

Commit 407ff64

Browse files
authored
Merge pull request #74265 from bburt-rh/OBSDOCS-910-clarify-what-CMO-fields-are-available-to-config
OBSDOCS-910: clarify what CMO fields are available and supported for configuration
2 parents e9e26a6 + 070ad85 commit 407ff64

4 files changed

+42
-14
lines changed

modules/monitoring-maintenance-and-support.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
[id="maintenance-and-support_{context}"]
66
= Maintenance and support for monitoring
77

8-
The supported way of configuring {product-title} Monitoring is by configuring it using the options described in this document. *Do not use other configurations, as they are unsupported.* Configuration paradigms might change across Prometheus releases, and such cases can only be handled gracefully if all configuration possibilities are controlled. If you use configurations other than those described in this section, your changes will disappear because the `cluster-monitoring-operator` reconciles any differences. The Operator resets everything to the defined state by default and by design.
8+
Not all configuration options for the monitoring stack are exposed. The only supported way of configuring {product-title} monitoring is by configuring the Cluster Monitoring Operator using the options described in the "Config map reference for the Cluster Monitoring Operator". *Do not use other configurations, as they are unsupported.*
9+
10+
Configuration paradigms might change across Prometheus releases, and such cases can only be handled gracefully if all configuration possibilities are controlled. If you use configurations other than those described in the "Config map reference for the Cluster Monitoring Operator", your changes will disappear because the Cluster Monitoring Operator automatically reconciles any differences and resets any unsupported changes back to the originally defined state by default and by design.
911

1012
ifdef::openshift-dedicated,openshift-rosa[]
1113
[IMPORTANT]

modules/monitoring-support-considerations.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
[id="support-considerations_{context}"]
77
= Support considerations for monitoring
88

9+
[NOTE]
10+
====
11+
Backward compatibility for metrics, recording rules, or alerting rules is not guaranteed.
12+
====
13+
914
The following modifications are explicitly not supported:
1015

1116
ifndef::openshift-dedicated,openshift-rosa[]
@@ -23,11 +28,6 @@ This procedure is a supported exception to the preceding statement.
2328
* *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.
2429
* *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.
2530
* *Enabling symptom based monitoring by using the `Probe` custom resource definition (CRD) in Prometheus Operator.*
26-
27-
[NOTE]
28-
====
29-
Backward compatibility for metrics, recording rules, or alerting rules is not guaranteed.
30-
====
3131
endif::openshift-dedicated,openshift-rosa[]
3232
3333
* *Installing custom Prometheus instances on {product-title}.* A custom instance is a Prometheus custom resource (CR) managed by the Prometheus Operator.

monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ These configurations are defined by link:#userworkloadconfiguration[UserWorkload
2525

2626
The configuration file is always defined under the `config.yaml` key in the config map data.
2727

28-
[NOTE]
28+
[IMPORTANT]
2929
====
30-
* Not all configuration parameters are exposed.
30+
* Not all configuration parameters for the monitoring stack are exposed.
31+
Only the parameters and fields listed in this reference are supported for configuration.
32+
For more information about supported configurations, see xref:../monitoring/configuring-the-monitoring-stack.adoc#maintenance-and-support_configuring-the-monitoring-stack[Maintenance and support for monitoring].
3133
* Configuring cluster monitoring is optional.
3234
* If a configuration does not exist or is empty, default values are used.
3335
* If the configuration is invalid YAML data, the Cluster Monitoring Operator stops reconciling the resources and reports `Degraded=True` in the status conditions of the Operator.
@@ -170,7 +172,7 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
170172

171173
[IMPORTANT]
172174
====
173-
This setting is deprecated and is planned to be removed in a future {product-title} version.
175+
This setting is deprecated and is planned to be removed in a future {product-title} version.
174176
In the current version, this setting still exists but has no effect.
175177
====
176178

@@ -244,7 +246,7 @@ Appears in: link:#clustermonitoringconfiguration[ClusterMonitoringConfiguration]
244246

245247
[options="header"]
246248
|===
247-
| Property | Type | Description
249+
| Property | Type | Description
248250
|nodeSelector|map[string]string|Defines the nodes on which the pods are scheduled.
249251

250252
|tolerations|[]v1.Toleration|Defines tolerations for the pods.
@@ -653,7 +655,7 @@ link:#prometheusrestrictedconfig[PrometheusRestrictedConfig]
653655

654656
|remoteTimeout|string|Defines the timeout value for requests to the remote write endpoint.
655657

656-
|sendExemplars|*bool|Enables sending exemplars via remote write. When enabled, this setting configures Prometheus to store a maximum of 100,000 exemplars in memory.
658+
|sendExemplars|*bool|Enables sending exemplars via remote write. When enabled, this setting configures Prometheus to store a maximum of 100,000 exemplars in memory.
657659
This setting only applies to user-defined monitoring and is not applicable to core platform monitoring.
658660

659661
|sigv4|*monv1.Sigv4|Defines AWS Signature Version 4 authentication settings.

monitoring/configuring-the-monitoring-stack.adoc

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include::_attributes/common-attributes.adoc[]
77
toc::[]
88

99
ifndef::openshift-dedicated,openshift-rosa[]
10-
The {product-title} 4 installation program provides only a low number of configuration options before installation. Configuring most {product-title} framework components, including the cluster monitoring stack, happens postinstallation.
10+
The {product-title} installation program provides only a low number of configuration options before installation. Configuring most {product-title} framework components, including the cluster monitoring stack, happens after the installation.
1111
endif::openshift-dedicated,openshift-rosa[]
1212

1313
This section explains what configuration is supported,
@@ -19,14 +19,38 @@ shows how to configure the monitoring stack for user-defined projects,
1919
endif::openshift-dedicated,openshift-rosa[]
2020
and demonstrates several common configuration scenarios.
2121

22+
[IMPORTANT]
23+
====
24+
Not all configuration parameters for the monitoring stack are exposed.
25+
Only the parameters and fields listed in the xref:../monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc#cluster-monitoring-operator-configuration-reference[Config map reference for the Cluster Monitoring Operator] are supported for configuration.
26+
====
27+
2228
ifndef::openshift-dedicated,openshift-rosa[]
2329
== Prerequisites
2430

2531
* The monitoring stack imposes additional resource requirements. Consult the computing resources recommendations in xref:../scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc#scaling-cluster-monitoring-operator[Scaling the Cluster Monitoring Operator] and verify that you have sufficient resources.
2632
endif::openshift-dedicated,openshift-rosa[]
2733
2834
// Maintenance and support for monitoring
29-
include::modules/monitoring-maintenance-and-support.adoc[leveloffset=+1]
35+
// include::modules/monitoring-maintenance-and-support.adoc[leveloffset=+1]
36+
37+
// .Additional resources
38+
// xref:../monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc#cluster-monitoring-operator-configuration-reference[Config map reference for the Cluster Monitoring Operator]
39+
40+
[id="maintenance-and-support_{context}"]
41+
== Maintenance and support for monitoring
42+
43+
Not all configuration options for the monitoring stack are exposed. The only supported way of configuring {product-title} monitoring is by configuring the Cluster Monitoring Operator using the options described in the xref:../monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc#cluster-monitoring-operator-configuration-reference[Config map reference for the Cluster Monitoring Operator]. *Do not use other configurations, as they are unsupported.*
44+
45+
Configuration paradigms might change across Prometheus releases, and such cases can only be handled gracefully if all configuration possibilities are controlled. If you use configurations other than those described in the xref:../monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc#cluster-monitoring-operator-configuration-reference[Config map reference for the Cluster Monitoring Operator], your changes will disappear because the Cluster Monitoring Operator automatically reconciles any differences and resets any unsupported changes back to the originally defined state by default and by design.
46+
47+
ifdef::openshift-dedicated,openshift-rosa[]
48+
[IMPORTANT]
49+
====
50+
Installing another Prometheus instance is not supported by the Red Hat Site Reliability Engineers (SRE).
51+
====
52+
endif::openshift-dedicated,openshift-rosa[]
53+
3054
include::modules/monitoring-support-considerations.adoc[leveloffset=+2]
3155
ifndef::openshift-dedicated,openshift-rosa[]
3256
include::modules/monitoring-unmanaged-monitoring-operators.adoc[leveloffset=+2]
@@ -122,7 +146,7 @@ endif::openshift-dedicated,openshift-rosa[]
122146
// Configuring limits and resource requests for monitoring components
123147

124148
[id="managing-cpu-and-memory-resources-for-monitoring-components"]
125-
== Managing CPU and memory resources for monitoring components
149+
== Managing CPU and memory resources for monitoring components
126150

127151
You can ensure that the containers that run monitoring components have enough CPU and memory resources by specifying values for resource limits and requests for those components.
128152

0 commit comments

Comments
 (0)