You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: CHANGELOG.md
+1
Original file line number
Diff line number
Diff line change
@@ -7,6 +7,7 @@
7
7
-[#1950](https://github.com/openshift/cluster-monitoring-operator/pull/1950) Disable CORS headers on Thanos querier by default and add a flag to enable them back.
8
8
-[#1963](https://github.com/openshift/cluster-monitoring-operator/pull/1963) Add nodeExporter settings for network devices list.
-[#2067](https://github.com/openshift/cluster-monitoring-operator/pull/2067) Add options to specify resource requests and limits for all components.
@@ -131,6 +132,7 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
131
132
| kubeStateMetrics |*[KubeStateMetricsConfig](#kubestatemetricsconfig)|`KubeStateMetricsConfig` defines settings for the `kube-state-metrics` agent. |
132
133
| prometheusK8s |*[PrometheusK8sConfig](#prometheusk8sconfig)|`PrometheusK8sConfig` defines settings for the Prometheus component. |
133
134
| prometheusOperator |*[PrometheusOperatorConfig](#prometheusoperatorconfig)|`PrometheusOperatorConfig` defines settings for the Prometheus Operator component. |
135
+
| prometheusOperatorAdmissionWebhook |*[PrometheusOperatorAdmissionWebhookConfig](#prometheusoperatoradmissionwebhookconfig)|`PrometheusOperatorAdmissionWebhookConfig` defines settings for the Prometheus Operator's admission webhook component. |
134
136
| openshiftStateMetrics |*[OpenShiftStateMetricsConfig](#openshiftstatemetricsconfig)|`OpenShiftMetricsConfig` defines settings for the `openshift-state-metrics` agent. |
135
137
| telemeterClient |*[TelemeterClientConfig](#telemeterclientconfig)|`TelemeterClientConfig` defines settings for the Telemeter Client component. |
136
138
| thanosQuerier |*[ThanosQuerierConfig](#thanosquerierconfig)|`ThanosQuerierConfig` defines settings for the Thanos Querier component. |
@@ -167,6 +169,7 @@ The `K8sPrometheusAdapter` resource defines settings for the Prometheus Adapter
167
169
| -------- | ---- | ----------- |
168
170
| audit |*Audit | Defines the audit configuration used by the Prometheus Adapter instance. Possible profile values are: `metadata`, `request`, `requestresponse`, and `none`. The default value is `metadata`. |
169
171
| nodeSelector | map[string]string | Defines the nodes on which the pods are scheduled. |
172
+
| resources |*[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core)| Defines resource requests and limits for the PrometheusAdapter container. |
170
173
| tolerations |[][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#toleration-v1-core)| Defines tolerations for the pods. |
| dedicatedServiceMonitors |*[DedicatedServiceMonitors](#dedicatedservicemonitors)| Defines dedicated service monitors. |
@@ -185,6 +188,7 @@ The `KubeStateMetricsConfig` resource defines settings for the `kube-state-metri
185
188
| Property | Type | Description |
186
189
| -------- | ---- | ----------- |
187
190
| nodeSelector | map[string]string | Defines the nodes on which the pods are scheduled. |
191
+
| resources |*[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core)| Defines resource requests and limits for the KubeStateMetrics container. |
188
192
| tolerations |[][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#toleration-v1-core)| Defines tolerations for the pods. |
@@ -382,6 +386,7 @@ The `NodeExporterConfig` resource defines settings for the `node-exporter` agent
382
386
| collectors |[NodeExporterCollectorConfig](#nodeexportercollectorconfig)| Defines which collectors are enabled and their additional configuration parameters. |
383
387
| maxProcs | uint32 | The target number of CPUs on which the Node Exporter's process will run. Use this setting to override the default value, which is set either to `4` or to the number of CPUs on the host, whichever is smaller. The default value is computed at runtime and set via the `GOMAXPROCS` environment variable before Node Exporter is launched. If a kernel deadlock occurs or if performance degrades when reading from `sysfs` concurrently, you can change this value to `1`, which limits Node Exporter to running on one CPU. For nodes with a high CPU count, setting the limit to a low number saves resources by preventing Go routines from being scheduled to run on all CPUs. However, I/O performance degrades if the `maxProcs` value is set too low, and there are many metrics to collect. |
384
388
| ignoredNetworkDevices |*[]string | A list of network devices, as regular expressions, to be excluded from the relevant collector configuration such as `netdev` and `netclass`. When not set, the Cluster Monitoring Operator uses a predefined list of devices to be excluded to minimize the impact on memory usage. When set as an empty list, no devices are excluded. If you modify this setting, monitor the `prometheus-k8s` deployment closely for excessive memory usage. |
389
+
| resources |*[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core)| Defines resource requests and limits for the NodeExporter container. |
385
390
386
391
[Back to TOC](#table-of-contents)
387
392
@@ -397,6 +402,7 @@ The `OpenShiftStateMetricsConfig` resource defines settings for the `openshift-s
397
402
| Property | Type | Description |
398
403
| -------- | ---- | ----------- |
399
404
| nodeSelector | map[string]string | Defines the nodes on which the pods are scheduled. |
405
+
| resources |*[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core)| Defines resource requests and limits for the OpenShiftStateMetrics container. |
400
406
| tolerations |[][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#toleration-v1-core)| Defines tolerations for the pods. |
| resources |*[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core)| Defines resource requests and limits for the prometheus-operator-admission-webhook container. |
451
+
452
+
[Back to TOC](#table-of-contents)
453
+
433
454
## PrometheusOperatorConfig
434
455
435
456
#### Description
@@ -443,6 +464,7 @@ The `PrometheusOperatorConfig` resource defines settings for the Prometheus Oper
443
464
| -------- | ---- | ----------- |
444
465
| logLevel | string | Defines the log level settings for Prometheus Operator. The possible values are `error`, `warn`, `info`, and `debug`. The default value is `info`. |
445
466
| nodeSelector | map[string]string | Defines the nodes on which the pods are scheduled. |
467
+
| resources |*[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core)| Defines resource requests and limits for the PrometheusOperator container. |
446
468
| tolerations |[][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#toleration-v1-core)| Defines tolerations for the pods. |
@@ -545,6 +567,7 @@ The `TLSConfig` resource configures the settings for TLS connections.
545
567
| Property | Type | Description |
546
568
| -------- | ---- | ----------- |
547
569
| nodeSelector | map[string]string | Defines the nodes on which the pods are scheduled. |
570
+
| resources |*[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core)| Defines resource requests and limits for the TelemeterClient container. |
548
571
| tolerations |[][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#toleration-v1-core)| Defines tolerations for the pods. |
Copy file name to clipboardExpand all lines: Documentation/openshiftdocs/modules/clustermonitoringconfiguration.adoc
+2
Original file line number
Diff line number
Diff line change
@@ -27,6 +27,8 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
27
27
28
28
|prometheusOperator|*link:prometheusoperatorconfig.adoc[PrometheusOperatorConfig]|`PrometheusOperatorConfig` defines settings for the Prometheus Operator component.
29
29
30
+
|prometheusOperatorAdmissionWebhook|*link:prometheusoperatoradmissionwebhookconfig.adoc[PrometheusOperatorAdmissionWebhookConfig]|`PrometheusOperatorAdmissionWebhookConfig` defines settings for the Prometheus Operator's admission webhook component.
31
+
30
32
|openshiftStateMetrics|*link:openshiftstatemetricsconfig.adoc[OpenShiftStateMetricsConfig]|`OpenShiftMetricsConfig` defines settings for the `openshift-state-metrics` agent.
31
33
32
34
|telemeterClient|*link:telemeterclientconfig.adoc[TelemeterClientConfig]|`TelemeterClientConfig` defines settings for the Telemeter Client component.
|ignoredNetworkDevices|*[]string|A list of network devices, as regular expressions, to be excluded from the relevant collector configuration such as `netdev` and `netclass`. When not set, the Cluster Monitoring Operator uses a predefined list of devices to be excluded to minimize the impact on memory usage. When set as an empty list, no devices are excluded. If you modify this setting, monitor the `prometheus-k8s` deployment closely for excessive memory usage.
26
26
27
+
|resources|*v1.ResourceRequirements|Defines resource requests and limits for the NodeExporter container.
0 commit comments