Skip to content

Commit 8d47319

Browse files
authored
Merge pull request #70762 from bburt-rh/OBSDOCS-677-update-4-15-CMO-config-map-ref
OBSDOCS-677: update CMO config map ref for OCP 4.15
2 parents d89b80d + ce01799 commit 8d47319

File tree

1 file changed

+35
-0
lines changed

1 file changed

+35
-0
lines changed

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
144144

145145
|kubeStateMetrics|*link:#kubestatemetricsconfig[KubeStateMetricsConfig]|`KubeStateMetricsConfig` defines settings for the `kube-state-metrics` agent.
146146

147+
|metricsServer|*link:#metricsserverconfig[MetricsServerConfig]|`MetricsServer` defines settings for the Metrics Server component.
148+
147149
|prometheusK8s|*link:#prometheusk8sconfig[PrometheusK8sConfig]|`PrometheusK8sConfig` defines settings for the Prometheus component.
148150

149151
|prometheusOperator|*link:#prometheusoperatorconfig[PrometheusOperatorConfig]|`PrometheusOperatorConfig` defines settings for the Prometheus Operator component.
@@ -166,6 +168,12 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
166168

167169
=== Description
168170

171+
[IMPORTANT]
172+
====
173+
This setting is deprecated and is planned to be removed in a future {product-title} version.
174+
In the current version, this setting still exists but has no effect.
175+
====
176+
169177
You can use the `DedicatedServiceMonitors` resource to configure dedicated Service Monitors for the Prometheus Adapter
170178

171179
Appears in: link:#k8sprometheusadapter[K8sPrometheusAdapter]
@@ -223,6 +231,30 @@ Appears in: link:#clustermonitoringconfiguration[ClusterMonitoringConfiguration]
223231

224232
|===
225233

234+
== MetricsServerConfig
235+
236+
=== Description
237+
238+
:FeatureName: Metrics Server
239+
include::snippets/technology-preview.adoc[leveloffset=+1]
240+
241+
The `MetricsServerConfig` resource defines settings for the Metrics Server component. Note that this setting only applies when the `TechPreviewNoUpgrade` feature gate is enabled.
242+
243+
Appears in: link:#clustermonitoringconfiguration[ClusterMonitoringConfiguration]
244+
245+
[options="header"]
246+
|===
247+
| Property | Type | Description
248+
|nodeSelector|map[string]string|Defines the nodes on which the pods are scheduled.
249+
250+
|tolerations|[]v1.Toleration|Defines tolerations for the pods.
251+
252+
|resources|*v1.ResourceRequirements|Defines resource requests and limits for the Metrics Server container.
253+
254+
|topologySpreadConstraints|[]v1.TopologySpreadConstraint|Defines a pod's topology spread constraints.
255+
256+
|===
257+
226258
== PrometheusOperatorAdmissionWebhookConfig
227259

228260
=== Description
@@ -621,6 +653,9 @@ link:#prometheusrestrictedconfig[PrometheusRestrictedConfig]
621653

622654
|remoteTimeout|string|Defines the timeout value for requests to the remote write endpoint.
623655

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.
657+
This setting only applies to user-defined monitoring and is not applicable to core platform monitoring.
658+
624659
|sigv4|*monv1.Sigv4|Defines AWS Signature Version 4 authentication settings.
625660

626661
|tlsConfig|*monv1.SafeTLSConfig|Defines TLS authentication settings for the remote write endpoint.

0 commit comments

Comments
 (0)