Skip to content

Commit e3d94d6

Browse files
committed
MON-3500: Enable sending exemplars over RW in UWM
1 parent 4bdf151 commit e3d94d6

File tree

5 files changed

+12
-0
lines changed

5 files changed

+12
-0
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Note: This CHANGELOG is only for the monitoring team to track all monitoring related changes. Please see OpenShift release notes for official changes.
22

3+
## 4.15
4+
5+
- [#2161](https://github.com/openshift/cluster-monitoring-operator/pull/2161) Add `PrometheusRestrictedConfig.RemoteWrite[].SendExemplars`.
6+
37
## 4.14
48

59
- [#1937](https://github.com/openshift/cluster-monitoring-operator/pull/1937) Disables btrfs collector

Documentation/api.md

+1
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ The `RemoteWriteSpec` resource defines the settings for remote write storage.
525525
| proxyUrl | string | Defines an optional proxy URL. |
526526
| queueConfig | *[monv1.QueueConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.66.0/Documentation/api.md#queueconfig) | Allows tuning configuration for remote write queue parameters. |
527527
| remoteTimeout | string | Defines the timeout value for requests to the remote write endpoint. |
528+
| sendExemplars | *bool | Enables sending of exemplars over remote write. Note that exemplar-storage itself must be enabled using the `spec.enableFeature` option for exemplars to be scraped in the first place. |
528529
| sigv4 | *monv1.Sigv4 | Defines AWS Signature Version 4 authentication settings. |
529530
| tlsConfig | *[monv1.SafeTLSConfig](https://github.com/prometheus-operator/prometheus-operator/blob/v0.66.0/Documentation/api.md#safetlsconfig) | Defines TLS authentication settings for the remote write endpoint. |
530531
| url | string | Defines the URL of the remote write endpoint to which samples will be sent. |

Documentation/openshiftdocs/modules/remotewritespec.adoc

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ link:prometheusrestrictedconfig.adoc[PrometheusRestrictedConfig]
4141

4242
|remoteTimeout|string|Defines the timeout value for requests to the remote write endpoint.
4343

44+
|sendExemplars|*bool|Enables sending of exemplars over remote write. Note that exemplar-storage itself must be enabled using the `spec.enableFeature` option for exemplars to be scraped in the first place.
45+
4446
|sigv4|*monv1.Sigv4|Defines AWS Signature Version 4 authentication settings.
4547

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

pkg/manifests/manifests.go

+1
Original file line numberDiff line numberDiff line change
@@ -3622,6 +3622,7 @@ func addRemoteWriteConfigs(clusterID string, rw []monv1.RemoteWriteSpec, rwTarge
36223622
ProxyURL: target.ProxyURL,
36233623
MetadataConfig: target.MetadataConfig,
36243624
OAuth2: target.OAuth2,
3625+
SendExemplars: target.SendExemplars,
36253626
}
36263627
if target.TLSConfig != nil {
36273628
rwConf.TLSConfig = &monv1.TLSConfig{

pkg/manifests/types.go

+4
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,10 @@ type RemoteWriteSpec struct {
753753
QueueConfig *monv1.QueueConfig `json:"queueConfig,omitempty"`
754754
// Defines the timeout value for requests to the remote write endpoint.
755755
RemoteTimeout string `json:"remoteTimeout,omitempty"`
756+
// Enables sending of exemplars over remote write. Note that
757+
// exemplar-storage itself must be enabled using the `spec.enableFeature`
758+
// option for exemplars to be scraped in the first place.
759+
SendExemplars *bool `json:"sendExemplars,omitempty"`
756760
// Defines AWS Signature Version 4 authentication settings.
757761
Sigv4 *monv1.Sigv4 `json:"sigv4,omitempty"`
758762
// Defines TLS authentication settings for the remote write endpoint.

0 commit comments

Comments
 (0)