1
0
mirror of https://github.com/openshift/openshift-docs.git synced 2026-02-05 12:46:18 +01:00

Merge pull request #70875 from openshift-cherrypick-robot/cherry-pick-70762-to-enterprise-4.15

[enterprise-4.15] OBSDOCS-677: update CMO config map ref for OCP 4.15
This commit is contained in:
Brian Burt
2024-01-26 11:06:18 -05:00
committed by GitHub

View File

@@ -144,6 +144,8 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
|kubeStateMetrics|*link:#kubestatemetricsconfig[KubeStateMetricsConfig]|`KubeStateMetricsConfig` defines settings for the `kube-state-metrics` agent.
|metricsServer|*link:#metricsserverconfig[MetricsServerConfig]|`MetricsServer` defines settings for the Metrics Server component.
|prometheusK8s|*link:#prometheusk8sconfig[PrometheusK8sConfig]|`PrometheusK8sConfig` defines settings for the Prometheus component.
|prometheusOperator|*link:#prometheusoperatorconfig[PrometheusOperatorConfig]|`PrometheusOperatorConfig` defines settings for the Prometheus Operator component.
@@ -166,6 +168,12 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
=== Description
[IMPORTANT]
====
This setting is deprecated and is planned to be removed in a future {product-title} version.
In the current version, this setting still exists but has no effect.
====
You can use the `DedicatedServiceMonitors` resource to configure dedicated Service Monitors for the Prometheus Adapter
Appears in: link:#k8sprometheusadapter[K8sPrometheusAdapter]
@@ -223,6 +231,30 @@ Appears in: link:#clustermonitoringconfiguration[ClusterMonitoringConfiguration]
|===
== MetricsServerConfig
=== Description
:FeatureName: Metrics Server
include::snippets/technology-preview.adoc[leveloffset=+1]
The `MetricsServerConfig` resource defines settings for the Metrics Server component. Note that this setting only applies when the `TechPreviewNoUpgrade` feature gate is enabled.
Appears in: link:#clustermonitoringconfiguration[ClusterMonitoringConfiguration]
[options="header"]
|===
| Property | Type | Description
|nodeSelector|map[string]string|Defines the nodes on which the pods are scheduled.
|tolerations|[]v1.Toleration|Defines tolerations for the pods.
|resources|*v1.ResourceRequirements|Defines resource requests and limits for the Metrics Server container.
|topologySpreadConstraints|[]v1.TopologySpreadConstraint|Defines a pod's topology spread constraints.
|===
== PrometheusOperatorAdmissionWebhookConfig
=== Description
@@ -621,6 +653,9 @@ link:#prometheusrestrictedconfig[PrometheusRestrictedConfig]
|remoteTimeout|string|Defines the timeout value for requests to the remote write endpoint.
|sendExemplars|*bool|Enables sending exemplars via remote write. When enabled, this setting configures Prometheus to store a maximum of 100,000 exemplars in memory.
This setting only applies to user-defined monitoring and is not applicable to core platform monitoring.
|sigv4|*monv1.Sigv4|Defines AWS Signature Version 4 authentication settings.
|tlsConfig|*monv1.SafeTLSConfig|Defines TLS authentication settings for the remote write endpoint.