Skip to content

Sync main #960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
lihongyan1 merged 33 commits into from
Dec 8, 2025
Merged

Sync main #960

lihongyan1 merged 33 commits into from
Dec 8, 2025

Conversation

@jan--f
Copy link
Collaborator

@jan--f jan--f commented Dec 5, 2025

to prepare release 1.3.1.

jan--f and others added 30 commits October 29, 2025 13:14
@jan--f
fix: fix linter issues and add CI check for linter changes (rhobs#887)
670f2d9 
Since we call `golang-lint --fix` we should check if the linter has
fixed anything.

Signed-off-by: Jan Fajerski <[email protected]>
@dependabot
build(deps): bump github.com/grafana/tempo-operator (rhobs#915)
497478a 
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@PeterYurkovich @falox
OU-964: update incidents and TP to GA (rhobs#912)
d41cb22 
* 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 <[email protected]>
@PeterYurkovich
fix: set 4.19 as GA for incidents (rhobs#917)
51d4408
@alanconway
chore: update korrel8r image to 0.8.4 for COO 1.3 (rhobs#908)
eeaf79f
@jan--f
chore(release): 1.3.0 (rhobs#920)
9a4dc0f
@empovit
fix: [COO-1304] Fix misspelled labels of accelerator metrics (rhobs#925)
3358246 
Fix misspelled labels in the common accelerator metrics dashboard.
@empovit
fix: [COO-1305] Fix misspelled metric name in accelerators (rhobs#926)
e38a3f6 
Fix the spelling of units of the accellerator temperature.
@IshwarKanse
fix: [COO-1313] Add missing description for ObservabilityInstaller in…
d2b4b9d 
… OpenShift console (rhobs#928)

🤖 Assisted by Claude Code
@tremes @lihongyan1
@jan--f @dependabot @PeterYurkovich @falox @alanconway @jgbernalp @empovit
sync 1.3 to main (rhobs#935)
cb47218 
* sync code changes from main to release-1.3 (rhobs#918)

* fix: fix linter issues and add CI check for linter changes (rhobs#887)

Since we call `golang-lint --fix` we should check if the linter has
fixed anything.

Signed-off-by: Jan Fajerski <[email protected]>

* build(deps): bump github.com/grafana/tempo-operator (rhobs#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* OU-964: update incidents and TP to GA (rhobs#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 <[email protected]>

* fix: set 4.19 as GA for incidents (rhobs#917)

* chore: update korrel8r image to 0.8.4 for COO 1.3 (rhobs#908)

---------

Signed-off-by: Jan Fajerski <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Jan Fajerski <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Yurkovich <[email protected]>
Co-authored-by: Alberto Falossi <[email protected]>
Co-authored-by: Alan Conway <[email protected]>

* fix: reconcile incident related resources only in 4.19+ (rhobs#921)

* fix: reconcile korrel8r backend only for troubleshooting plugin (rhobs#922)

Signed-off-by: Gabriel Bernal <[email protected]>

* feat: drop korrel8r and troubleshooting panel support before 4.19 (rhobs#929)

Signed-off-by: Gabriel Bernal <[email protected]>

* Sync accelerators fixes (rhobs#930)

* fix: [COO-1304] Fix misspelled labels of accelerator metrics (rhobs#925)

Fix misspelled labels in the common accelerator metrics dashboard.

* fix: [COO-1305] Fix misspelled metric name in accelerators (rhobs#926)

Fix the spelling of units of the accellerator temperature.

---------

Co-authored-by: Vitaly E. <[email protected]>

* fix: rename clusterrolebinding used for monitoring plugin to avoid clash (rhobs#931)

* Sync release tag (rhobs#927)

* fix: fix linter issues and add CI check for linter changes (rhobs#887)

Since we call `golang-lint --fix` we should check if the linter has
fixed anything.

Signed-off-by: Jan Fajerski <[email protected]>

* build(deps): bump github.com/grafana/tempo-operator (rhobs#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* OU-964: update incidents and TP to GA (rhobs#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 <[email protected]>

* fix: set 4.19 as GA for incidents (rhobs#917)

* chore: update korrel8r image to 0.8.4 for COO 1.3 (rhobs#908)

* chore(release): 1.3.0 (rhobs#920)

---------

Signed-off-by: Jan Fajerski <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Yurkovich <[email protected]>
Co-authored-by: Alberto Falossi <[email protected]>
Co-authored-by: Alan Conway <[email protected]>

* chore: bumpt to prometheus-operator 0.86.2 (rhobs#933)

Signed-off-by: Jan Fajerski <[email protected]>

---------

Signed-off-by: Jan Fajerski <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Gabriel Bernal <[email protected]>
Co-authored-by: lihongyan1 <[email protected]>
Co-authored-by: Jan Fajerski <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Yurkovich <[email protected]>
Co-authored-by: Alberto Falossi <[email protected]>
Co-authored-by: Alan Conway <[email protected]>
Co-authored-by: Gabriel Bernal <[email protected]>
Co-authored-by: Vitaly E. <[email protected]>
@dependabot
build(deps): bump golang.org/x/crypto from 0.42.0 to 0.45.0 (rhobs#934)
210528d 
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@simonpasquier
docs: fix a few typos in the Thanos Querier guide (rhobs#936)
c25cf24 
Signed-off-by: Simon Pasquier <[email protected]>
@tremes
fix: fix & rename health-analyzer and korrel8r clusterrolebindings (r…
42301f7 
…hobs#937)
@simonpasquier
docs: update UI plugins documentation (rhobs#940)
1d6245b
@simonpasquier
feat: allow to set replicas number for Alertmanager (rhobs#941)
e7a45ee 
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 <[email protected]>
@jgbernalp
fix: set correct references for perses CR for correct cleanup (rhobs#942
8627d46 
)

Signed-off-by: Gabriel Bernal <[email protected]>
@dependabot
build(deps): bump actions/checkout from 5 to 6 (rhobs#939)
46ccb54 
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@simonpasquier
feat: enable watch-referenced-objects-in-all-namespaces in Prometheus…
340137c 
… operator (rhobs#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 <[email protected]>
@dependabot
build(deps): bump k8s.io/apiserver from 0.34.0 to 0.34.1 (rhobs#872)
6ec4de7 
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@simonpasquier
feat: support size-based retention for MonitoringStack (rhobs#946)
b13d7b2 
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 <[email protected]>
@simonpasquier
fix: disable unmanaged Prometheus configuration (rhobs#944)
5ef4238 
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 rhobs#932

Signed-off-by: Simon Pasquier <[email protected]>
@jgbernalp
fix: [COO-1325] fix logging model field documentation (rhobs#938)
d638618 
Signed-off-by: Gabriel Bernal <[email protected]>
@dependabot
build(deps): bump k8s.io/apiextensions-apiserver from 0.34.1 to 0.34.2 (
e9a673c 
rhobs#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump go.uber.org/zap from 1.27.0 to 1.27.1 (rhobs#947)
828a2d8 
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@IshwarKanse
fix: set logger warning and image ref (rhobs#924)
fd5645c
@lihongyan1
test: automation to cover nill resource selector (rhobs#955)
9ac8ef9 
The auto covered upstream issue
https://github.com/prometheus-operator/prometheus-operator/issue/6018
@too-common-name
COO-1384: fix(monitoringstack): correctly configure OTLP receiver (rh…
3c84569 
…obs#943)

* fix(monitoringstack): change how EnableOTLP is passed to Prometheus

* chore: remove version inference
@jan--f
chore: bump p-o to v0.87.0 (rhobs#950)
02e37c9 
* chore: bump p-o to v0.87.0

Signed-off-by: Jan Fajerski <[email protected]>

* fix: use monv1.Scheme struct instead of strings

Signed-off-by: Jan Fajerski <[email protected]>

---------

Signed-off-by: Jan Fajerski <[email protected]>
@lihongyan1
fix: github action workflow release failure (rhobs#957)
3878301 
rhobs#956
@jan--f
Improve prometheus-operator updates (rhobs#959)
829d511 
* build: centralize p-o image names and tags in kustomization.yaml

Signed-off-by: Jan Fajerski <[email protected]>

* chore: add script to update p-o refs

Signed-off-by: Jan Fajerski <[email protected]>

---------

Signed-off-by: Jan Fajerski <[email protected]>
dependabot bot added 2 commits December 5, 2025 11:11
@dependabot
build(deps): bump github.com/operator-framework/api (rhobs#953)
e6efc6e 
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/goccy/go-yaml from 1.18.0 to 1.19.0 (rho…
ac4e4df 
…bs#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@openshift-ci openshift-ci bot added the approved label Dec 5, 2025
@jan--f
chore: Merge branch 'main' into sync-main
461e47c 
Conflicts resolved by picking changes from `main`.

Signed-off-by: Jan Fajerski <[email protected]>
@danielmellado
Copy link
Contributor

danielmellado commented Dec 5, 2025

/lgtm some commit lint errors but that's to be expected in this case

@openshift-ci openshift-ci bot added the lgtm label Dec 5, 2025
@openshift-ci
Copy link

openshift-ci bot commented Dec 5, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan--f, jgbernalp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@lihongyan1 lihongyan1 merged commit c01a7bf into rhobs:release-1.3 Dec 8, 2025
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jgbernalp jgbernalp jgbernalp approved these changes

@pavolloffay pavolloffay Awaiting requested review from pavolloffay

Assignees

@jgbernalp jgbernalp

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.