diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c4cfc9ae5..8e2df248bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Note: This CHANGELOG is only for the monitoring team to track all monitoring related changes. Please see OpenShift release notes for official changes. +## 4.16 + +- [#2302](https://github.com/openshift/cluster-monitoring-operator/issues/2302) Enable feature `extra-scrape-metrics` in Prometheus user-workload + ## 4.15 - [#2022](https://github.com/openshift/cluster-monitoring-operator/pull/2022) Add support to switch to metrics server from prometheus-adapter when the `MetricsServer` feature gate is enabled. diff --git a/assets/prometheus-user-workload/prometheus.yaml b/assets/prometheus-user-workload/prometheus.yaml index f6317dcc0e..18fc956811 100644 --- a/assets/prometheus-user-workload/prometheus.yaml +++ b/assets/prometheus-user-workload/prometheus.yaml @@ -165,7 +165,8 @@ spec: name: secret-grpc-tls - name: prometheus terminationMessagePolicy: FallbackToLogsOnError - enableFeatures: [] + enableFeatures: + - extra-scrape-metrics enforcedNamespaceLabel: namespace externalLabels: {} ignoreNamespaceSelectors: true diff --git a/jsonnet/components/prometheus-user-workload.libsonnet b/jsonnet/components/prometheus-user-workload.libsonnet index 9e247b3f91..5a7fed24b6 100644 --- a/jsonnet/components/prometheus-user-workload.libsonnet +++ b/jsonnet/components/prometheus-user-workload.libsonnet @@ -292,6 +292,8 @@ function(params) prometheus+: { spec+: { + // Enable experimental additional scrape metrics feature + enableFeatures+: ['extra-scrape-metrics'], overrideHonorTimestamps: true, overrideHonorLabels: true, ignoreNamespaceSelectors: true, diff --git a/test/e2e/config_test.go b/test/e2e/config_test.go index 25ee44dea6..474cbf66e4 100644 --- a/test/e2e/config_test.go +++ b/test/e2e/config_test.go @@ -654,7 +654,7 @@ func TestUserWorkloadMonitorPrometheusK8Config(t *testing.T) { expectCatchAllToleration(), expectMatchingRequests(podName, containerName, mem, cpu), // Set by default. - expectContainerArg("--enable-feature=exemplar-storage", containerName), + expectContainerArg("--enable-feature=extra-scrape-metrics,exemplar-storage", containerName), // Set via the config above. expectContainerArg("--log.level=debug", containerName), expectContainerArg("--storage.tsdb.retention.time=10h", containerName),