feat: support size-based retention for MonitoringStack #946
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
simonpasquier
force-pushed
the
fix-890
branch
from
a262527 to
aadfe1b
Compare
simonpasquier
force-pushed
the
fix-890
branch
2 times, most recently
from
a9f12ee to
c7b7a38
Compare
jan--f
reviewed
Nov 28, 2025
jan--f
reviewed
Nov 28, 2025
Collaborator
jan--f
left a comment
jan--f
left a comment
There was a problem hiding this comment.
Just one comment, but other than that this looks good!
This commit exposes a new `retentionSize` field in the MonitoringStack CRD which mimics the API already present in the Prometheus CRD. Closes rhobs#890 Signed-off-by: Simon Pasquier <spasquie@redhat.com>
simonpasquier
force-pushed
the
fix-890
branch
from
c7b7a38 to
9d2f876
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jan--f, simonpasquier The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
lihongyan1
added a commit
that referenced
this pull request
Dec 8, 2025
* fix: fix linter issues and add CI check for linter changes (#887) Since we call `golang-lint --fix` we should check if the linter has fixed anything. Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * build(deps): bump github.com/grafana/tempo-operator (#915) Bumps [github.com/grafana/tempo-operator](https://github.com/grafana/tempo-operator) from 0.16.0 to 0.18.0. - [Release notes](https://github.com/grafana/tempo-operator/releases) - [Changelog](https://github.com/grafana/tempo-operator/blob/main/CHANGELOG.md) - [Commits](grafana/tempo-operator@v0.16.0...v0.18.0) --- updated-dependencies: - dependency-name: github.com/grafana/tempo-operator dependency-version: 0.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * OU-964: update incidents and TP to GA (#912) * feat: update min version for incident feature to 4.20 * feat: update incidents and tp to GA in matrix * fix: re-enable incidents on 4.19 --------- Co-authored-by: Alberto Falossi <afalossi@redhat.com> * fix: set 4.19 as GA for incidents (#917) * chore: update korrel8r image to 0.8.4 for COO 1.3 (#908) * chore(release): 1.3.0 (#920) * fix: [COO-1304] Fix misspelled labels of accelerator metrics (#925) Fix misspelled labels in the common accelerator metrics dashboard. * fix: [COO-1305] Fix misspelled metric name in accelerators (#926) Fix the spelling of units of the accellerator temperature. * fix: [COO-1313] Add missing description for ObservabilityInstaller in OpenShift console (#928) 🤖 Assisted by Claude Code * sync 1.3 to main (#935) * sync code changes from main to release-1.3 (#918) * fix: fix linter issues and add CI check for linter changes (#887) Since we call `golang-lint --fix` we should check if the linter has fixed anything. Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * build(deps): bump github.com/grafana/tempo-operator (#915) Bumps [github.com/grafana/tempo-operator](https://github.com/grafana/tempo-operator) from 0.16.0 to 0.18.0. - [Release notes](https://github.com/grafana/tempo-operator/releases) - [Changelog](https://github.com/grafana/tempo-operator/blob/main/CHANGELOG.md) - [Commits](grafana/tempo-operator@v0.16.0...v0.18.0) --- updated-dependencies: - dependency-name: github.com/grafana/tempo-operator dependency-version: 0.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * OU-964: update incidents and TP to GA (#912) * feat: update min version for incident feature to 4.20 * feat: update incidents and tp to GA in matrix * fix: re-enable incidents on 4.19 --------- Co-authored-by: Alberto Falossi <afalossi@redhat.com> * fix: set 4.19 as GA for incidents (#917) * chore: update korrel8r image to 0.8.4 for COO 1.3 (#908) --------- Signed-off-by: Jan Fajerski <jfajersk@redhat.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Jan Fajerski <jan--f@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Yurkovich <47438010+PeterYurkovich@users.noreply.github.com> Co-authored-by: Alberto Falossi <afalossi@redhat.com> Co-authored-by: Alan Conway <aconway@redhat.com> * fix: reconcile incident related resources only in 4.19+ (#921) * fix: reconcile korrel8r backend only for troubleshooting plugin (#922) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * feat: drop korrel8r and troubleshooting panel support before 4.19 (#929) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * Sync accelerators fixes (#930) * fix: [COO-1304] Fix misspelled labels of accelerator metrics (#925) Fix misspelled labels in the common accelerator metrics dashboard. * fix: [COO-1305] Fix misspelled metric name in accelerators (#926) Fix the spelling of units of the accellerator temperature. --------- Co-authored-by: Vitaly E. <vemporop@redhat.com> * fix: rename clusterrolebinding used for monitoring plugin to avoid clash (#931) * Sync release tag (#927) * fix: fix linter issues and add CI check for linter changes (#887) Since we call `golang-lint --fix` we should check if the linter has fixed anything. Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * build(deps): bump github.com/grafana/tempo-operator (#915) Bumps [github.com/grafana/tempo-operator](https://github.com/grafana/tempo-operator) from 0.16.0 to 0.18.0. - [Release notes](https://github.com/grafana/tempo-operator/releases) - [Changelog](https://github.com/grafana/tempo-operator/blob/main/CHANGELOG.md) - [Commits](grafana/tempo-operator@v0.16.0...v0.18.0) --- updated-dependencies: - dependency-name: github.com/grafana/tempo-operator dependency-version: 0.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * OU-964: update incidents and TP to GA (#912) * feat: update min version for incident feature to 4.20 * feat: update incidents and tp to GA in matrix * fix: re-enable incidents on 4.19 --------- Co-authored-by: Alberto Falossi <afalossi@redhat.com> * fix: set 4.19 as GA for incidents (#917) * chore: update korrel8r image to 0.8.4 for COO 1.3 (#908) * chore(release): 1.3.0 (#920) --------- Signed-off-by: Jan Fajerski <jfajersk@redhat.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Yurkovich <47438010+PeterYurkovich@users.noreply.github.com> Co-authored-by: Alberto Falossi <afalossi@redhat.com> Co-authored-by: Alan Conway <aconway@redhat.com> * chore: bumpt to prometheus-operator 0.86.2 (#933) Signed-off-by: Jan Fajerski <jfajersk@redhat.com> --------- Signed-off-by: Jan Fajerski <jfajersk@redhat.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Gabriel Bernal <gbernal@redhat.com> Co-authored-by: lihongyan1 <hongyli@redhat.com> Co-authored-by: Jan Fajerski <jan--f@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Yurkovich <47438010+PeterYurkovich@users.noreply.github.com> Co-authored-by: Alberto Falossi <afalossi@redhat.com> Co-authored-by: Alan Conway <aconway@redhat.com> Co-authored-by: Gabriel Bernal <gbernal@redhat.com> Co-authored-by: Vitaly E. <vemporop@redhat.com> * build(deps): bump golang.org/x/crypto from 0.42.0 to 0.45.0 (#934) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.42.0 to 0.45.0. - [Commits](golang/crypto@v0.42.0...v0.45.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.45.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * docs: fix a few typos in the Thanos Querier guide (#936) Signed-off-by: Simon Pasquier <spasquie@redhat.com> * fix: fix & rename health-analyzer and korrel8r clusterrolebindings (#937) * docs: update UI plugins documentation (#940) * feat: allow to set replicas number for Alertmanager (#941) This commit introduces a new `replicas` field in the Alertmanager configuration to the `MonitoringStack` CRD. This makes it consistent with the Prometheus configuration and allows to run Alertmanager on single-node clusters. It also adds a `replace` directive in `go.mod` to use the local copy of `github.com/rhobs/observability-operator/pkg/apis` which simplifies the development of API changes. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * fix: set correct references for perses CR for correct cleanup (#942) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * build(deps): bump actions/checkout from 5 to 6 (#939) Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: enable watch-referenced-objects-in-all-namespaces in Prometheus operator (#945) This commit enables the `--watch-referenced-objects-in-all-namespaces` flag in the Prometheus operator deployment to ensure that the operator reconciles configurations when a secret/configmap referenced by a custom resource gets an update. Upstream issue: https://github.com/prometheus-operator/prometheus-operator/issue/6018 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump k8s.io/apiserver from 0.34.0 to 0.34.1 (#872) Bumps [k8s.io/apiserver](https://github.com/kubernetes/apiserver) from 0.34.0 to 0.34.1. - [Commits](kubernetes/apiserver@v0.34.0...v0.34.1) --- updated-dependencies: - dependency-name: k8s.io/apiserver dependency-version: 0.34.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: support size-based retention for MonitoringStack (#946) This commit exposes a new `retentionSize` field in the MonitoringStack CRD which mimics the API already present in the Prometheus CRD. Closes #890 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * fix: disable unmanaged Prometheus configuration (#944) This commit adds the `--disable-unmanaged-prometheus-configuration=true` argument to the Prometheus operator deployment. Without this change and in case of a null resource selector, the Prometheus pods fail to become ready because the Prometheus configuration is left empty while the Thanos sidecar expects to find external labels. The "unmanaged configuration" mode is an old upstream "hack" which allowed users to provide their own custom Prometheus configuration for cases where it couldn't be implemented with `ServiceMonitor`. The new approach is to use the `ScrapeConfig` CRD. When a `MonitoringStack` resource is created with a null resource selector, the Prometheus configuration will contain no scrape configuration and no rules. One possible use case is to deploy a Prometheus which only ingests metrics via remote-write and/or OTLP. Closes #932 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * fix: [COO-1325] fix logging model field documentation (#938) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * build(deps): bump k8s.io/apiextensions-apiserver from 0.34.1 to 0.34.2 (#949) Bumps [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) from 0.34.1 to 0.34.2. - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.34.1...v0.34.2) --- updated-dependencies: - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.34.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump go.uber.org/zap from 1.27.0 to 1.27.1 (#947) Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.27.0 to 1.27.1. - [Release notes](https://github.com/uber-go/zap/releases) - [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md) - [Commits](uber-go/zap@v1.27.0...v1.27.1) --- updated-dependencies: - dependency-name: go.uber.org/zap dependency-version: 1.27.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: set logger warning and image ref (#924) * test: automation to cover nill resource selector (#955) The auto covered upstream issue https://github.com/prometheus-operator/prometheus-operator/issue/6018 * COO-1384: fix(monitoringstack): correctly configure OTLP receiver (#943) * fix(monitoringstack): change how EnableOTLP is passed to Prometheus * chore: remove version inference * chore: bump p-o to v0.87.0 (#950) * chore: bump p-o to v0.87.0 Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * fix: use monv1.Scheme struct instead of strings Signed-off-by: Jan Fajerski <jfajersk@redhat.com> --------- Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * fix: github action workflow release failure (#957) #956 * Improve prometheus-operator updates (#959) * build: centralize p-o image names and tags in kustomization.yaml Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * chore: add script to update p-o refs Signed-off-by: Jan Fajerski <jfajersk@redhat.com> --------- Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * build(deps): bump github.com/operator-framework/api (#953) Bumps [github.com/operator-framework/api](https://github.com/operator-framework/api) from 0.34.0 to 0.36.0. - [Release notes](https://github.com/operator-framework/api/releases) - [Changelog](https://github.com/operator-framework/api/blob/master/RELEASE.md) - [Commits](operator-framework/api@v0.34.0...v0.36.0) --- updated-dependencies: - dependency-name: github.com/operator-framework/api dependency-version: 0.36.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/goccy/go-yaml from 1.18.0 to 1.19.0 (#952) Bumps [github.com/goccy/go-yaml](https://github.com/goccy/go-yaml) from 1.18.0 to 1.19.0. - [Release notes](https://github.com/goccy/go-yaml/releases) - [Changelog](https://github.com/goccy/go-yaml/blob/master/CHANGELOG.md) - [Commits](goccy/go-yaml@v1.18.0...v1.19.0) --- updated-dependencies: - dependency-name: github.com/goccy/go-yaml dependency-version: 1.19.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: Jan Fajerski <jfajersk@redhat.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Gabriel Bernal <gbernal@redhat.com> Signed-off-by: Simon Pasquier <spasquie@redhat.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Yurkovich <47438010+PeterYurkovich@users.noreply.github.com> Co-authored-by: Alberto Falossi <afalossi@redhat.com> Co-authored-by: Alan Conway <aconway@redhat.com> Co-authored-by: Vitaly E. <vemporop@redhat.com> Co-authored-by: Ishwar Kanse <ishwar.kanse@zohomail.in> Co-authored-by: Tomas Remes <tremes@users.noreply.github.com> Co-authored-by: lihongyan1 <hongyli@redhat.com> Co-authored-by: Gabriel Bernal <gbernal@redhat.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> Co-authored-by: Ishwar Kanse <ikanse@redhat.com> Co-authored-by: Daniele Rossi <drossi@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit exposes a new
retentionSizefield in the MonitoringStack CRD which mimics the API already present in the Prometheus CRD.Closes #890