Skip to content

Conversation

@jan--f
Copy link
Collaborator

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

No description provided.

@jan--f jan--f requested a review from simonpasquier December 2, 2025 13:20
@openshift-ci openshift-ci bot requested a review from lihongyan1 December 2, 2025 13:20
@openshift-ci
Copy link

openshift-ci bot commented Dec 2, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@machine424
Copy link

/lgtm

@jan--f
Copy link
Collaborator Author

jan--f commented Dec 2, 2025

/retest

1 similar comment
@jan--f
Copy link
Collaborator Author

jan--f commented Dec 2, 2025

/retest

@lihongyan1
Copy link
Contributor

lihongyan1 commented Dec 4, 2025

By pre-merge testing with the PR, figured out the root cause of failure case TestOperatorMetrics/metrics_ingested_in_Prometheus.

2025-12-04T06:29:09Z	ERROR	Reconciler error	{"controller": "observability-operator", "controllerGroup": "", "controllerKind": "Service", "Service": {"name":"observability-operator","namespace":"coo"}, "namespace": "coo", "name": "observability-operator", "reconcileID": "4d1d14b1-ff17-42a5-a59b-6822d7d47eca", "error": "coo/observability-operator (monitoring.coreos.com/v1, Kind=ServiceMonitor): updater failed to patch: ServiceMonitor.monitoring.coreos.com \"observability-operator\" is invalid: spec.endpoints[0].scheme: Unsupported value: \"HTTP\": supported values: \"http\", \"https\""}

From the above operator error log, may need perform the following change

  • Scheme: ptr.To(monv1.SchemeHTTP),
  • Scheme: ptr.To(monv1.Scheme("http")),

Files Modified:

  • pkg/controllers/operator/components.go:48
  • pkg/controllers/uiplugin/health_analyzer.go:200

Signed-off-by: Jan Fajerski <[email protected]>
@openshift-ci openshift-ci bot removed the lgtm label Dec 4, 2025
@jan--f
Copy link
Collaborator Author

jan--f commented Dec 4, 2025

  • Scheme: ptr.To(monv1.SchemeHTTP),

  • Scheme: ptr.To(monv1.Scheme("http")),

Afaiu using the contstant monv1.SchemeHTTP should work the same 🤔

@simonpasquier
Copy link
Contributor

I think that only the v0.87.0 CRDs will support both "http" and "HTTP". Older CRDs only allow "http".

Copy link
Contributor

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Dec 4, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 02e37c9 into rhobs:main Dec 4, 2025
11 checks passed
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 <[email protected]>

* 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] <[email protected]>
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 <[email protected]>

* 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 <[email protected]>

* 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] <[email protected]>
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 <[email protected]>

* 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 <[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+ (#921)

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

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

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

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

* 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. <[email protected]>

* 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 <[email protected]>

* 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] <[email protected]>
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 <[email protected]>

* 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 <[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 (#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]>

* 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] <[email protected]>
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 <[email protected]>

* 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 <[email protected]>

* fix: set correct references for perses CR for correct cleanup (#942)

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

* 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] <[email protected]>
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 <[email protected]>

* 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] <[email protected]>
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 <[email protected]>

* 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 <[email protected]>

* fix: [COO-1325] fix logging model field documentation (#938)

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

* 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] <[email protected]>
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] <[email protected]>
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 <[email protected]>

* fix: use monv1.Scheme struct instead of strings

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

---------

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

* 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 <[email protected]>

* chore: add script to update p-o refs

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

---------

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

* 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] <[email protected]>
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: Jan Fajerski <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Gabriel Bernal <[email protected]>
Signed-off-by: Simon Pasquier <[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: Vitaly E. <[email protected]>
Co-authored-by: Ishwar Kanse <[email protected]>
Co-authored-by: Tomas Remes <[email protected]>
Co-authored-by: lihongyan1 <[email protected]>
Co-authored-by: Gabriel Bernal <[email protected]>
Co-authored-by: Simon Pasquier <[email protected]>
Co-authored-by: Ishwar Kanse <[email protected]>
Co-authored-by: Daniele Rossi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants