From 6b5034bc0cffa5e79bef88712dddc4806f958cf7 Mon Sep 17 00:00:00 2001 From: lihongyan1 Date: Fri, 31 Oct 2025 16:18:17 +0800 Subject: [PATCH 1/8] 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 * 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](https://github.com/grafana/tempo-operator/compare/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] 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 * 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 Signed-off-by: dependabot[bot] Co-authored-by: Jan Fajerski 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 Co-authored-by: Alan Conway --- .github/workflows/pr-checks.yaml | 3 ++ Makefile | 4 --- cmd/operator/main.go | 2 +- docs/user-guides/observability-ui-plugins.md | 19 +++++----- go.mod | 2 +- go.sum | 4 +-- .../uiplugin/compatibility_matrix.go | 4 +-- .../uiplugin/compatibility_matrix_test.go | 35 +++++++++++++++++++ pkg/controllers/uiplugin/monitoring_test.go | 6 ++++ 9 files changed, 60 insertions(+), 19 deletions(-) diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml index 168e76091..f5b7a778e 100644 --- a/.github/workflows/pr-checks.yaml +++ b/.github/workflows/pr-checks.yaml @@ -43,6 +43,9 @@ jobs: - name: Lint Shell scripts run: make lint-shell + - name: Check for linter changes + run: git diff --exit-code + generate: name: Verify generated code runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index edd63c143..78b6f62c2 100644 --- a/Makefile +++ b/Makefile @@ -31,10 +31,6 @@ lint: lint-golang lint-shell lint-golang: $(GOLANGCI_LINT) $(GOLANGCI_LINT) run ./... --fix -# TODO(simonpasquier): remove this after #629 merges. -.PHONY: lint-jsonnet fmt-jsonnet -lint-jsonnet fmt-jsonnet: - .PHONY: lint-shell lint-shell: $(SHELLCHECK) find -name "*.sh" -print0 | xargs --null $(SHELLCHECK) diff --git a/cmd/operator/main.go b/cmd/operator/main.go index 2196a1fba..d31ad6f90 100644 --- a/cmd/operator/main.go +++ b/cmd/operator/main.go @@ -46,7 +46,7 @@ var defaultImages = map[string]string{ "ui-distributed-tracing": "quay.io/openshift-observability-ui/distributed-tracing-console-plugin:v1.0.1", "ui-logging-pf4": "quay.io/openshift-observability-ui/logging-view-plugin:v6.0.1", "ui-logging": "quay.io/openshift-observability-ui/logging-view-plugin:v6.1.2", - "korrel8r": "quay.io/korrel8r/korrel8r:release-coo-1.2", + "korrel8r": "quay.io/korrel8r/korrel8r:0.8.4", "health-analyzer": "quay.io/openshiftanalytics/cluster-health-analyzer:v1.0.0", "ui-monitoring-pf5": "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.4.3", "ui-monitoring": "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.5.2", diff --git a/docs/user-guides/observability-ui-plugins.md b/docs/user-guides/observability-ui-plugins.md index b2aa589fd..8d30fe4c3 100644 --- a/docs/user-guides/observability-ui-plugins.md +++ b/docs/user-guides/observability-ui-plugins.md @@ -146,9 +146,9 @@ The plugin adds monitoring related UI features to the OpenShift web console, rel To deploy ACM related features the `acm-alerting` configuration must be enabled. In the UIPlugin Custom Resource (CR) you must pass the Alertmanager and ThanosQuerier Service endpoint (e.g. `https://alertmanager.open-cluster-management-observability.svc:9095` and `https://rbac-query-proxy.open-cluster-management-observability.svc:8443`). See the example in the next section `Plugin Creation.` -To deploy the Incidents feature, the `incidents` configuration must be enabled. See the example in the next section, `Plugin Creation.` +To deploy the Incidents feature, the `incidents` configuration must be enabled. See the example in the next section, `Plugin Creation.` -To deploy the Perses dashboard feature, the `perses-dashboards` configuration must be enabled. In the UIPlugin CR, you can optionally pass the service name and namespace of your Perses instance (e.g., `serviceName: perses-api-http` and `namespace: perses`). If these fields are left blank and `spec.monitoring.perses.enabled: true`, then default values will be assigned. These default values are `serviceName: perses-api-http` and `namespace: perses`. See the example in the next section, `Plugin Creation.` +To deploy the Perses dashboard feature, the `perses-dashboards` configuration must be enabled. In the UIPlugin CR, you can optionally pass the service name and namespace of your Perses instance (e.g., `serviceName: perses-api-http` and `namespace: perses`). If these fields are left blank and `spec.monitoring.perses.enabled: true`, then default values will be assigned. These default values are `serviceName: perses-api-http` and `namespace: perses`. See the example in the next section, `Plugin Creation.` Besides, when `spec.monitoring.perses.enabled: true`, Accelerator Perses dashboard and Accelerator Perses datasource are both created. ObO/COO operator creates the following roles: @@ -219,7 +219,7 @@ roleRef: kind: ClusterRole name: persesdatasource-editor-role ``` - + Other pages which are typically distributed with the monitoring-plugin, such as `Admin > Observe > Dashboards`, are only available in the monitoring-plugin when deployed through [CMO](https://github.com/openshift/cluster-monitoring-operator). #### Plugin Creation @@ -248,11 +248,11 @@ spec: #### Feature List -| __Feature__ | __Description__ | __Support Level__ | -| ------------------- | ------------------------------------------------------------------------------------------------------------------------ | ----------------- | -| `acm-alerting` | Adds alerting UI to multi-cluster view. Configures proxies to connect with any alertmanager and thanos-querier. | Dev Preview | -| `incidents` | Adds incidents UI to `Observe` section of OpenShift Console Platform. Deploys the [Cluster Health Analyzer](https://github.com/openshift/cluster-health-analyzer) and configures proxies in the plugin to connect with it. | Tech Preview | -| `perses-dashboards` | Adds perses UI to `Observe` section of OpenShift Console Platform. Configures proxies to connect with a Perses instance. Installs Accelerator Perses Dashboard and Accelerator Perses Datasource. See details [here](./perses-dashboards.md) | Dev Preview | +| __Feature__ | __Description__ | __Support Level__ | +| ------------------- | ------------------------------------------------------------------------------------------------------------------------ | ----------------- | +| `acm-alerting` | Adds alerting UI to multi-cluster view. Configures proxies to connect with any alertmanager and thanos-querier. | Dev Preview | +| `incidents` | Adds incidents UI to `Observe` section of OpenShift Console Platform. Deploys the [Cluster Health Analyzer](https://github.com/openshift/cluster-health-analyzer) and configures proxies in the plugin to connect with it. | General Availability | +| `perses-dashboards` | Adds perses UI to `Observe` section of OpenShift Console Platform. Configures proxies to connect with a Perses instance. Installs Accelerator Perses Dashboard and Accelerator Perses Datasource. See details [here](./perses-dashboards.md) | Dev Preview | #### Feature Matrix @@ -261,4 +261,5 @@ spec: | --------------- | ------------------- | --------------------------------- | | 1.0.0+ | 4.14+ | `acm-alerting` | | 1.1.0+ | 4.15+ | `acm-alerting, perses-dashboards` | -| 1.2.0+ | 4.19+ | `acm-alerting, perses-dashboards, incidents` | +| 1.2.0 | 4.19+ | `acm-alerting, perses-dashboards, incidents (Tech Preview)` | +| 1.3.0+ | 4.19+ | `acm-alerting, perses-dashboards, incidents (General Availability)` | diff --git a/go.mod b/go.mod index 919e58795..d380b8bb5 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-logr/logr v1.4.3 github.com/goccy/go-yaml v1.18.0 github.com/google/go-cmp v0.7.0 - github.com/grafana/tempo-operator v0.16.0 + github.com/grafana/tempo-operator v0.18.0 github.com/open-telemetry/opentelemetry-operator v0.135.0 github.com/openshift/api v3.9.0+incompatible // PINNED: newer versions remove console/v1alpha1 API needed for OpenShift <4.17 compatibility github.com/operator-framework/api v0.34.0 diff --git a/go.sum b/go.sum index 0c2d5c3f0..4a58e641c 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5T github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 h1:cLN4IBkmkYZNnk7EAJ0BHIethd+J6LqxFNw5mSiI2bM= github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= -github.com/grafana/tempo-operator v0.16.0 h1:/HLVmdC1mnEZMFjWCo1GJWS3DxzTdfjvyXAvq/dXURU= -github.com/grafana/tempo-operator v0.16.0/go.mod h1:h3hQBqqiohdYhqltyj0DqLtkAbvEnkwo9Lp323zl3Bo= +github.com/grafana/tempo-operator v0.18.0 h1:ihXddVx2/I9EbMTkPBnbnN0Uc19sjxAFDx2BqublXqQ= +github.com/grafana/tempo-operator v0.18.0/go.mod h1:xt66ENn9wlMOqj0OAtoiNm3w+JIah4LAeX/XZgdsLsU= github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU= github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs= github.com/hashicorp/consul/api v1.32.0 h1:5wp5u780Gri7c4OedGEPzmlUEzi0g2KyiPphSr6zjVg= diff --git a/pkg/controllers/uiplugin/compatibility_matrix.go b/pkg/controllers/uiplugin/compatibility_matrix.go index 98ce6abe2..ef608a9c4 100644 --- a/pkg/controllers/uiplugin/compatibility_matrix.go +++ b/pkg/controllers/uiplugin/compatibility_matrix.go @@ -50,7 +50,7 @@ var compatibilityMatrix = []CompatibilityEntry{ MinClusterVersion: "v4.16", MaxClusterVersion: "", ImageKey: "ui-troubleshooting-panel", - SupportLevel: TechPreview, + SupportLevel: GeneralAvailability, Features: []string{}, }, { @@ -145,7 +145,7 @@ var compatibilityMatrix = []CompatibilityEntry{ MinClusterVersion: "v4.19", MaxClusterVersion: "", ImageKey: "ui-monitoring", - SupportLevel: TechPreview, + SupportLevel: GeneralAvailability, // feature flags for montioring are dynamically injected // based on the cluster version and and UIPlugin CR configurations Features: []string{}, diff --git a/pkg/controllers/uiplugin/compatibility_matrix_test.go b/pkg/controllers/uiplugin/compatibility_matrix_test.go index 6bdec8cc6..c28f5a992 100644 --- a/pkg/controllers/uiplugin/compatibility_matrix_test.go +++ b/pkg/controllers/uiplugin/compatibility_matrix_test.go @@ -50,24 +50,28 @@ func TestLookupImageAndFeatures(t *testing.T) { expectedKey string expectedErr error expectedFeatures []string + supportLevel SupportLevel }{ { pluginType: uiv1alpha1.TypeDashboards, clusterVersion: "4.10", expectedKey: "", expectedErr: fmt.Errorf("dynamic plugins not supported before 4.11"), + supportLevel: "", }, { pluginType: uiv1alpha1.TypeDashboards, clusterVersion: "4.11", expectedKey: "ui-dashboards", expectedErr: nil, + supportLevel: DevPreview, }, { pluginType: uiv1alpha1.TypeDashboards, clusterVersion: "4.24.0-0.nightly-2024-03-11-200348", expectedKey: "ui-dashboards", expectedErr: nil, + supportLevel: DevPreview, }, { pluginType: uiv1alpha1.TypeLogging, @@ -78,6 +82,7 @@ func TestLookupImageAndFeatures(t *testing.T) { "dev-console", "alerts", }, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeLogging, @@ -88,6 +93,7 @@ func TestLookupImageAndFeatures(t *testing.T) { "dev-console", "alerts", }, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeLogging, @@ -99,6 +105,7 @@ func TestLookupImageAndFeatures(t *testing.T) { "alerts", "dev-alerts", }, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeLogging, @@ -110,6 +117,7 @@ func TestLookupImageAndFeatures(t *testing.T) { "alerts", "dev-alerts", }, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeLogging, @@ -121,6 +129,7 @@ func TestLookupImageAndFeatures(t *testing.T) { "alerts", "dev-alerts", }, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeLogging, @@ -132,6 +141,7 @@ func TestLookupImageAndFeatures(t *testing.T) { "alerts", "dev-alerts", }, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeLogging, @@ -143,6 +153,7 @@ func TestLookupImageAndFeatures(t *testing.T) { "alerts", "dev-alerts", }, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeLogging, @@ -154,12 +165,14 @@ func TestLookupImageAndFeatures(t *testing.T) { "alerts", "dev-alerts", }, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeLogging, clusterVersion: "4.11", expectedKey: "ui-logging-pf4", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeTroubleshootingPanel, @@ -168,96 +181,112 @@ func TestLookupImageAndFeatures(t *testing.T) { clusterVersion: "4.15", expectedKey: "", expectedErr: fmt.Errorf("plugin %q: no compatible image found for cluster version %q", uiv1alpha1.TypeTroubleshootingPanel, "v4.15"), + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeTroubleshootingPanel, clusterVersion: "4.16", expectedKey: "ui-troubleshooting-panel", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeTroubleshootingPanel, clusterVersion: "4.24.0-0.nightly-2024-03-11-200348", expectedKey: "ui-troubleshooting-panel", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "4.10", expectedKey: "", expectedErr: fmt.Errorf("dynamic plugins not supported before 4.11"), + supportLevel: "", }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "4.11", expectedKey: "ui-distributed-tracing-pf4", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "4.14", expectedKey: "ui-distributed-tracing-pf4", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "4.15", expectedKey: "ui-distributed-tracing-pf5", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "v4.15.0-0.nightly-2024-06-06-064349", expectedKey: "ui-distributed-tracing-pf5", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "v4.15.46", expectedKey: "ui-distributed-tracing-pf5", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "4.18", expectedKey: "ui-distributed-tracing-pf5", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "4.19", expectedKey: "ui-distributed-tracing", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "4.24.0-0.nightly-2024-03-11-200348", expectedKey: "ui-distributed-tracing", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeDistributedTracing, clusterVersion: "4.16.0-rc.3", expectedKey: "ui-distributed-tracing-pf5", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: "non-existent-plugin", clusterVersion: "4.24.0-0.nightly-2024-03-11-200348", expectedKey: "", expectedErr: fmt.Errorf(`plugin "non-existent-plugin": no compatible image found for cluster version "v4.24.0-0.nightly-2024-03-11-200348"`), + supportLevel: "", }, { pluginType: uiv1alpha1.TypeTroubleshootingPanel, clusterVersion: "v4.16.0-0.nightly-2024-06-06-064349", expectedKey: "ui-troubleshooting-panel", expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeMonitoring, clusterVersion: "v4.14", expectedKey: "ui-monitoring", expectedErr: fmt.Errorf("plugin %q: no compatible image found for cluster version %q", uiv1alpha1.TypeMonitoring, "v4.14"), + supportLevel: TechPreview, }, { pluginType: uiv1alpha1.TypeMonitoring, @@ -265,6 +294,7 @@ func TestLookupImageAndFeatures(t *testing.T) { expectedKey: "ui-monitoring-pf5", expectedFeatures: []string{}, expectedErr: nil, + supportLevel: TechPreview, }, { pluginType: uiv1alpha1.TypeMonitoring, @@ -272,6 +302,7 @@ func TestLookupImageAndFeatures(t *testing.T) { expectedKey: "ui-monitoring-pf5", expectedFeatures: []string{}, expectedErr: nil, + supportLevel: TechPreview, }, { pluginType: uiv1alpha1.TypeMonitoring, @@ -279,6 +310,7 @@ func TestLookupImageAndFeatures(t *testing.T) { expectedKey: "ui-monitoring", expectedFeatures: []string{}, expectedErr: nil, + supportLevel: GeneralAvailability, }, { pluginType: uiv1alpha1.TypeMonitoring, @@ -286,6 +318,7 @@ func TestLookupImageAndFeatures(t *testing.T) { expectedKey: "ui-monitoring", expectedFeatures: []string{}, expectedErr: nil, + supportLevel: GeneralAvailability, }, } { t.Run(fmt.Sprintf("%s/%s", tc.pluginType, tc.clusterVersion), func(t *testing.T) { @@ -301,6 +334,8 @@ func TestLookupImageAndFeatures(t *testing.T) { t.Logf("%s == %s", tc.expectedKey, info.ImageKey) assert.Equal(t, tc.expectedKey, info.ImageKey) + assert.Equal(t, tc.supportLevel, info.SupportLevel) + if tc.expectedFeatures != nil { assert.DeepEqual(t, tc.expectedFeatures, info.Features) } diff --git a/pkg/controllers/uiplugin/monitoring_test.go b/pkg/controllers/uiplugin/monitoring_test.go index b593b69c9..a29e8c3ff 100644 --- a/pkg/controllers/uiplugin/monitoring_test.go +++ b/pkg/controllers/uiplugin/monitoring_test.go @@ -485,6 +485,12 @@ func TestCreateMonitoringPluginInfo(t *testing.T) { t.Run("Test validateIncidentsConfig() with valid and invalid clusterVersion formats", func(t *testing.T) { // should not throw an error because all these are valid formats for clusterVersion + assert.Assert(t, validateIncidentsConfig(pluginConfigIncidents.Spec.Monitoring, "v4.21.0-0.nightly-2024-06-06-064349") == true) + assert.Assert(t, validateIncidentsConfig(pluginConfigIncidents.Spec.Monitoring, "4.21.0-0.nightly-2024-06-06-064349") == true) + assert.Assert(t, validateIncidentsConfig(pluginConfigIncidents.Spec.Monitoring, "v4.21") == true) + assert.Assert(t, validateIncidentsConfig(pluginConfigIncidents.Spec.Monitoring, "v4.21.0") == true) + assert.Assert(t, validateIncidentsConfig(pluginConfigIncidents.Spec.Monitoring, "4.21.0") == true) + assert.Assert(t, validateIncidentsConfig(pluginConfigIncidents.Spec.Monitoring, "v4.20.0-0.nightly-2024-06-06-064349") == true) assert.Assert(t, validateIncidentsConfig(pluginConfigIncidents.Spec.Monitoring, "4.20.0-0.nightly-2024-06-06-064349") == true) assert.Assert(t, validateIncidentsConfig(pluginConfigIncidents.Spec.Monitoring, "v4.20") == true) From 4314833cb5a13cc6c53a919e1dfba2324c3dce62 Mon Sep 17 00:00:00 2001 From: Tomas Remes Date: Mon, 3 Nov 2025 16:00:47 +0100 Subject: [PATCH 2/8] fix: reconcile incident related resources only in 4.19+ (#921) --- pkg/controllers/uiplugin/components.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/controllers/uiplugin/components.go b/pkg/controllers/uiplugin/components.go index b42299ff8..a6a4c3cf6 100644 --- a/pkg/controllers/uiplugin/components.go +++ b/pkg/controllers/uiplugin/components.go @@ -116,7 +116,10 @@ func pluginComponentReconcilers(plugin *uiv1alpha1.UIPlugin, pluginInfo UIPlugin if plugin.Spec.Type == uiv1alpha1.TypeMonitoring { monitoringConfig := plugin.Spec.Monitoring serviceAccountName := plugin.Name + serviceAccountSuffix - incidentsEnabled := monitoringConfig != nil && monitoringConfig.Incidents != nil && monitoringConfig.Incidents.Enabled + incidentsEnabled := monitoringConfig != nil && + monitoringConfig.Incidents != nil && + monitoringConfig.Incidents.Enabled && + pluginInfo.HealthAnalyzerImage != "" components = append(components, reconciler.NewOptionalUpdater(newClusterRoleBinding(namespace, serviceAccountName, "cluster-monitoring-view", "cluster-monitoring-view"), plugin, incidentsEnabled), reconciler.NewOptionalUpdater(newClusterRoleBinding(namespace, serviceAccountName, "system:auth-delegator", serviceAccountName+"-system-auth-delegator"), plugin, incidentsEnabled), From 79cb0eac6dc0cd111189ebde37428331200f531f Mon Sep 17 00:00:00 2001 From: Gabriel Bernal Date: Tue, 4 Nov 2025 20:52:57 +0100 Subject: [PATCH 3/8] fix: reconcile korrel8r backend only for troubleshooting plugin (#922) Signed-off-by: Gabriel Bernal --- pkg/controllers/uiplugin/components.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controllers/uiplugin/components.go b/pkg/controllers/uiplugin/components.go index a6a4c3cf6..dbab5c904 100644 --- a/pkg/controllers/uiplugin/components.go +++ b/pkg/controllers/uiplugin/components.go @@ -102,7 +102,7 @@ func pluginComponentReconcilers(plugin *uiv1alpha1.UIPlugin, pluginInfo UIPlugin } } - if pluginInfo.Korrel8rImage != "" { + if plugin.Spec.Type == uiv1alpha1.TypeTroubleshootingPanel && pluginInfo.Korrel8rImage != "" { components = append(components, reconciler.NewUpdater(newKorrel8rService(korrel8rName, namespace), plugin)) korrel8rCm, err := newKorrel8rConfigMap(korrel8rName, namespace, pluginInfo) if err == nil && korrel8rCm != nil { From b6f6396bf1dc8f1280bbd85620c6517c8e7fec82 Mon Sep 17 00:00:00 2001 From: Gabriel Bernal Date: Fri, 7 Nov 2025 15:40:22 +0100 Subject: [PATCH 4/8] feat: drop korrel8r and troubleshooting panel support before 4.19 (#929) Signed-off-by: Gabriel Bernal --- docs/user-guides/observability-ui-plugins.md | 10 ++++------ pkg/controllers/uiplugin/compatibility_matrix.go | 7 ++----- pkg/controllers/uiplugin/compatibility_matrix_test.go | 9 ++++++++- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/docs/user-guides/observability-ui-plugins.md b/docs/user-guides/observability-ui-plugins.md index 8d30fe4c3..ac9e07c86 100644 --- a/docs/user-guides/observability-ui-plugins.md +++ b/docs/user-guides/observability-ui-plugins.md @@ -11,12 +11,10 @@ Using the Observability UI, you can install and manage plugins that extend the o | __COO Version__ | __OCP Versions__ | __Dashboards__ | __Distributed Tracing__ | __Logging__ | __Troubleshooting Panel__ | __Monitoring__ | | --------------- | ------------------- | -------------- | ----------------------- | ----------- | ------------------------- | ---------------| -| 0.2.0 | 4.11 | ✔ | ✘ | ✘ | ✘ | ✘ | -| 0.3.0 - 0.4.0 | 4.11 - 4.15 | ✔ | ✔ | ✔ | ✘ | ✘ | -| 0.3.0 - 0.4.0 | 4.16+ | ✔ | ✔ | ✔ | ✔ | ✘ | -| 1.0.0+ | 4.11 - 4.14 | ✔ | ✔ | ✔ | ✘ | ✘ | +| 0.2.0 | 4.12 | ✔ | ✘ | ✘ | ✘ | ✘ | +| 0.3.0+ | 4.12 - 4.14 | ✔ | ✔ | ✔ | ✘ | ✘ | | 1.0.0+ | 4.15 | ✔ | ✔ | ✔ | ✘ | ✔ | -| 1.0.0+ | 4.16+ | ✔ | ✔ | ✔ | ✔ | ✔ | +| 1.3.0+ | 4.19+ | ✔ | ✔ | ✔ | ✔ | ✔ | Some plugin offer additional features that are available dependant on the cluster version. COO will always deploy all features available for the cluster it is running on. @@ -66,7 +64,7 @@ spec: | __COO Version__ | __OCP Versions__ | __Features__ | | --------------- | ------------------- | ----------------------------------------------------- | -| 0.3.0+ | 4.16+ | _No features configuration, just core functionality_ | +| 1.3.0+ | 4.19+ | _No features configuration, just core functionality_ | ### Distributed Tracing diff --git a/pkg/controllers/uiplugin/compatibility_matrix.go b/pkg/controllers/uiplugin/compatibility_matrix.go index ef608a9c4..c4714acc9 100644 --- a/pkg/controllers/uiplugin/compatibility_matrix.go +++ b/pkg/controllers/uiplugin/compatibility_matrix.go @@ -43,11 +43,8 @@ var compatibilityMatrix = []CompatibilityEntry{ SupportLevel: DevPreview, }, { - PluginType: uiv1alpha1.TypeTroubleshootingPanel, - // This plugin requires the monitoring-plugin from OpenShift 4.16 (at - // least) to render the "Troubleshooting Panel" button on the alert - // details page. - MinClusterVersion: "v4.16", + PluginType: uiv1alpha1.TypeTroubleshootingPanel, + MinClusterVersion: "v4.19", MaxClusterVersion: "", ImageKey: "ui-troubleshooting-panel", SupportLevel: GeneralAvailability, diff --git a/pkg/controllers/uiplugin/compatibility_matrix_test.go b/pkg/controllers/uiplugin/compatibility_matrix_test.go index c28f5a992..329508002 100644 --- a/pkg/controllers/uiplugin/compatibility_matrix_test.go +++ b/pkg/controllers/uiplugin/compatibility_matrix_test.go @@ -187,6 +187,13 @@ func TestLookupImageAndFeatures(t *testing.T) { pluginType: uiv1alpha1.TypeTroubleshootingPanel, clusterVersion: "4.16", expectedKey: "ui-troubleshooting-panel", + expectedErr: fmt.Errorf(`plugin "TroubleshootingPanel": no compatible image found for cluster version "v4.16"`), + supportLevel: GeneralAvailability, + }, + { + pluginType: uiv1alpha1.TypeTroubleshootingPanel, + clusterVersion: "4.19", + expectedKey: "ui-troubleshooting-panel", expectedErr: nil, supportLevel: GeneralAvailability, }, @@ -276,7 +283,7 @@ func TestLookupImageAndFeatures(t *testing.T) { }, { pluginType: uiv1alpha1.TypeTroubleshootingPanel, - clusterVersion: "v4.16.0-0.nightly-2024-06-06-064349", + clusterVersion: "v4.19.0-0.nightly-2024-06-06-064349", expectedKey: "ui-troubleshooting-panel", expectedErr: nil, supportLevel: GeneralAvailability, From a65bc546d7fcb25bd1b5bdec3c175d1570a1adb9 Mon Sep 17 00:00:00 2001 From: Gabriel Bernal Date: Fri, 7 Nov 2025 15:43:12 +0100 Subject: [PATCH 5/8] 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. --- pkg/controllers/uiplugin/accelerators.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/controllers/uiplugin/accelerators.go b/pkg/controllers/uiplugin/accelerators.go index 7587918b2..97fb315c8 100644 --- a/pkg/controllers/uiplugin/accelerators.go +++ b/pkg/controllers/uiplugin/accelerators.go @@ -106,10 +106,10 @@ func newAcceleratorsDashboard(namespace string) *persesv1alpha1.PersesDashboard "0_0": getPanel("GPU Utilization", "accelerator_gpu_utilization"), "0_1": getPanel("Memory Used Bytes", "accelerator_memory_used_bytes"), "0_2": getPanel("Memory Total Bytes", "accelerator_memory_total_bytes"), - "0_3": getPanel("Power Usage (watts)", "accelerator_power_usage_watts"), - "0_4": getPanel("Temperature (celcius)", "accelerator_temperature_celcius"), - "0_5": getPanel("SM Clock(hertz)", "accelerator_sm_clock_hertz"), - "0_6": getPanel("Memory Clock(hertz)", "accelerator_memory_clock_hertz"), + "0_3": getPanel("Power Usage (Watts)", "accelerator_power_usage_watts"), + "0_4": getPanel("Temperature (Celsius)", "accelerator_temperature_celsius"), + "0_5": getPanel("SM Clock (Hertz)", "accelerator_sm_clock_hertz"), + "0_6": getPanel("Memory Clock (Hertz)", "accelerator_memory_clock_hertz"), }, Layouts: []dashboard.Layout{ { From 11766483d7fc1b90b35915e3700f4c4a47b928b1 Mon Sep 17 00:00:00 2001 From: Tomas Remes Date: Mon, 10 Nov 2025 09:51:34 +0100 Subject: [PATCH 6/8] fix: rename clusterrolebinding used for monitoring plugin to avoid clash (#931) --- pkg/controllers/uiplugin/components.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controllers/uiplugin/components.go b/pkg/controllers/uiplugin/components.go index dbab5c904..7e15354da 100644 --- a/pkg/controllers/uiplugin/components.go +++ b/pkg/controllers/uiplugin/components.go @@ -121,7 +121,7 @@ func pluginComponentReconcilers(plugin *uiv1alpha1.UIPlugin, pluginInfo UIPlugin monitoringConfig.Incidents.Enabled && pluginInfo.HealthAnalyzerImage != "" components = append(components, - reconciler.NewOptionalUpdater(newClusterRoleBinding(namespace, serviceAccountName, "cluster-monitoring-view", "cluster-monitoring-view"), plugin, incidentsEnabled), + reconciler.NewOptionalUpdater(newClusterRoleBinding(namespace, serviceAccountName, "cluster-monitoring-view", plugin.Name+"cluster-monitoring-view"), plugin, incidentsEnabled), reconciler.NewOptionalUpdater(newClusterRoleBinding(namespace, serviceAccountName, "system:auth-delegator", serviceAccountName+"-system-auth-delegator"), plugin, incidentsEnabled), reconciler.NewOptionalUpdater(newAlertManagerViewRoleBinding(serviceAccountName, namespace), plugin, incidentsEnabled), reconciler.NewOptionalUpdater(newHealthAnalyzerPrometheusRole(namespace), plugin, incidentsEnabled), From c2d52a4c7061d5372b8e3e970581503676dced0c Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Mon, 10 Nov 2025 17:32:12 +0100 Subject: [PATCH 7/8] 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 * 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](https://github.com/grafana/tempo-operator/compare/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] 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 * 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 Signed-off-by: dependabot[bot] 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 Co-authored-by: Alan Conway --- CHANGELOG.md | 43 +++++++++++++++++++ VERSION | 2 +- ...bility-operator.clusterserviceversion.yaml | 10 ++--- deploy/olm/kustomization.yaml | 2 +- .../operator/kustomization.yaml | 2 +- 5 files changed, 51 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c7c62c4d..acbb7fb80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,49 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.3.0](https://github.com/rhobs/monitoring-stack-operator/commit/) (2025-11-03) + + +### Features + +* add cluster-health-analyzer v0.5.1 ([#785](https://github.com/rhobs/monitoring-stack-operator/issues/785)) ([315b436](https://github.com/rhobs/monitoring-stack-operator/commit/315b43660968fe0e4a8e66e33a1fc4eb4643f9ea)) +* add clusterobservability spec for tracing and opentelemetry ([#754](https://github.com/rhobs/monitoring-stack-operator/issues/754)) ([84abac4](https://github.com/rhobs/monitoring-stack-operator/commit/84abac4afca3c5bf24f2874d15298ff81f44b0b0)) +* add controller for clusterobservability ([#793](https://github.com/rhobs/monitoring-stack-operator/issues/793)) ([#836](https://github.com/rhobs/monitoring-stack-operator/issues/836)) ([2aa3284](https://github.com/rhobs/monitoring-stack-operator/commit/2aa32846c0591dabf68795eddcc5747ebe2d67f5)) +* add CRD scaffolding for cluster observability / signal manager ([#748](https://github.com/rhobs/monitoring-stack-operator/issues/748)) ([a942029](https://github.com/rhobs/monitoring-stack-operator/commit/a9420299b75cc9a48dea3aaa3ebb671e92117af7)) +* add monitoring-plugin stream 0.4 and 0.5 ([#747](https://github.com/rhobs/monitoring-stack-operator/issues/747)) ([a3d2d47](https://github.com/rhobs/monitoring-stack-operator/commit/a3d2d4754de1f3c69a52479287d3ec4f13d9ddd0)) +* create ClusterRoleBIndings based on API field ([#888](https://github.com/rhobs/monitoring-stack-operator/issues/888)) ([01ad960](https://github.com/rhobs/monitoring-stack-operator/commit/01ad96036f8df6004b0981fcaf42bfa62e45a780)) +* deploying COO in place of OBO on MC clusters ([#792](https://github.com/rhobs/monitoring-stack-operator/issues/792)) ([99aa26d](https://github.com/rhobs/monitoring-stack-operator/commit/99aa26d20846925a10cbe25efe6be0665c3e245a)) +* enable deployment of common accelerator perses dashboard ([#744](https://github.com/rhobs/monitoring-stack-operator/issues/744)) ([f9a161e](https://github.com/rhobs/monitoring-stack-operator/commit/f9a161e531043f61b792adbeedede8c63522884c)) +* new Go module for the API ([#801](https://github.com/rhobs/monitoring-stack-operator/issues/801)) ([32736be](https://github.com/rhobs/monitoring-stack-operator/commit/32736be06093ceec8c926508557f578ffbe7df4d)) +* remove unnecessary API dependency ([#797](https://github.com/rhobs/monitoring-stack-operator/issues/797)) ([932eb15](https://github.com/rhobs/monitoring-stack-operator/commit/932eb1598c4407d5c10b58eeee50fb694ad16b3d)) +* TRACING-5214: Add APM dashboard ([#837](https://github.com/rhobs/monitoring-stack-operator/issues/837)) ([ed8af0f](https://github.com/rhobs/monitoring-stack-operator/commit/ed8af0fe8b525fc42d08a8289a2767c32cde5bf3)) +* update components for new health-analyzer version ([#896](https://github.com/rhobs/monitoring-stack-operator/issues/896)) ([aadd616](https://github.com/rhobs/monitoring-stack-operator/commit/aadd6167e6445b2c50f4cf6a83003d3987350104)) +* update image versions ([#913](https://github.com/rhobs/monitoring-stack-operator/issues/913)) ([db9ad5c](https://github.com/rhobs/monitoring-stack-operator/commit/db9ad5c840bcf4366b638251f3443b369f1ef54c)) + + +### Bug Fixes + +* Update main.go korrel8r tag to release-coo-1.2 ([#746](https://github.com/rhobs/monitoring-stack-operator/issues/746)) ([053872d](https://github.com/rhobs/monitoring-stack-operator/commit/053872d2632999e8b1ce9bbffae92e8d693e4c6c)) +* add CreateClusterRoleBindings field to MonitoringStack ([#886](https://github.com/rhobs/monitoring-stack-operator/issues/886)) ([149f81e](https://github.com/rhobs/monitoring-stack-operator/commit/149f81e7d08eff4e8d4048bcf8496ffd15c26fc9)) +* add datasource variable ([#883](https://github.com/rhobs/monitoring-stack-operator/issues/883)) ([e6c0ecb](https://github.com/rhobs/monitoring-stack-operator/commit/e6c0ecb9b315c0e104f30450d489e70b06b4c294)) +* add default value to logs schema ([#751](https://github.com/rhobs/monitoring-stack-operator/issues/751)) ([f0448d8](https://github.com/rhobs/monitoring-stack-operator/commit/f0448d800bbfbc2b852c375a16492a7ed4e2dc46)) +* allow to create a logging plugin without a loki stack ([#743](https://github.com/rhobs/monitoring-stack-operator/issues/743)) ([9bf3c3e](https://github.com/rhobs/monitoring-stack-operator/commit/9bf3c3e9cc9be6c415c9b196ca624c2754072e27)) +* check lokistack value on lokistack discovery ([#753](https://github.com/rhobs/monitoring-stack-operator/issues/753)) ([cfb7a04](https://github.com/rhobs/monitoring-stack-operator/commit/cfb7a043d4be1b8f7367b439f83030205583c39a)) +* fix linter issues and add CI check for linter changes ([#887](https://github.com/rhobs/monitoring-stack-operator/issues/887)) ([670f2d9](https://github.com/rhobs/monitoring-stack-operator/commit/670f2d9dcf7ba7eeff8fac722eb0919c262567b2)) +* fix version of prometheus-operator client ([#875](https://github.com/rhobs/monitoring-stack-operator/issues/875)) ([ca66822](https://github.com/rhobs/monitoring-stack-operator/commit/ca668229e74bf68c09e3503b32eb35044f1788c8)) +* further fix github action olm publish failure ([#742](https://github.com/rhobs/monitoring-stack-operator/issues/742)) ([e2e2383](https://github.com/rhobs/monitoring-stack-operator/commit/e2e23834a650f7b2e83045620f8a5dffe203e248)) +* improve obsinstaller validation ([#905](https://github.com/rhobs/monitoring-stack-operator/issues/905)) ([6e9572d](https://github.com/rhobs/monitoring-stack-operator/commit/6e9572d91cddb0e60cff54787f2d367b072cd299)) +* logging plugin korrel8r proxy for missing service ([#898](https://github.com/rhobs/monitoring-stack-operator/issues/898)) ([ef8d92a](https://github.com/rhobs/monitoring-stack-operator/commit/ef8d92a6924f9760a06451b26416e2422e031926)) +* observabilityinstaller fix AWS STS config ([#903](https://github.com/rhobs/monitoring-stack-operator/issues/903)) ([1ea0b6b](https://github.com/rhobs/monitoring-stack-operator/commit/1ea0b6b4b78aab7e9c5acf2465d865db26d0e61f)) +* remove replace command after introducing API module ([#806](https://github.com/rhobs/monitoring-stack-operator/issues/806)) ([e41d1d3](https://github.com/rhobs/monitoring-stack-operator/commit/e41d1d386c9347fea0d6548c06eebc4ed8551e5c)) +* reverting - add cluster-health-analyzer v0.5.1 ([#785](https://github.com/rhobs/monitoring-stack-operator/issues/785)) ([#812](https://github.com/rhobs/monitoring-stack-operator/issues/812)) ([#834](https://github.com/rhobs/monitoring-stack-operator/issues/834)) ([0eb65b6](https://github.com/rhobs/monitoring-stack-operator/commit/0eb65b688a2d75a0fb16c97543be1428c0ffbc63)) +* server conflict error when enable OCP in test script ([#822](https://github.com/rhobs/monitoring-stack-operator/issues/822)) ([51591f3](https://github.com/rhobs/monitoring-stack-operator/commit/51591f316536444e92fdc40aa33d2076cebf03e4)) +* set 4.19 as GA for incidents ([#917](https://github.com/rhobs/monitoring-stack-operator/issues/917)) ([51d4408](https://github.com/rhobs/monitoring-stack-operator/commit/51d44085f28b698e1e47facdb2961e93506c4113)) +* sync Perses CRD with perses-operator ([#884](https://github.com/rhobs/monitoring-stack-operator/issues/884)) ([6bf1ec9](https://github.com/rhobs/monitoring-stack-operator/commit/6bf1ec98fbe831c0738ce287de78d9190244ce69)) +* test script for ocp ([#860](https://github.com/rhobs/monitoring-stack-operator/issues/860)) ([3abbf21](https://github.com/rhobs/monitoring-stack-operator/commit/3abbf21cc560d8f2c87ed0499796b850081f119b)) +* update uiplugin status errors and handle resource clean-up ([#873](https://github.com/rhobs/monitoring-stack-operator/issues/873)) ([aaea154](https://github.com/rhobs/monitoring-stack-operator/commit/aaea1548d53ac1de608d3fb784af411dffb477d8)) +* use apiReader for correct ui plugin registration ([#889](https://github.com/rhobs/monitoring-stack-operator/issues/889)) ([0545b00](https://github.com/rhobs/monitoring-stack-operator/commit/0545b0060570be10cc96573de339141c5c25d521)) + ## [1.0.0](https://github.com/rhobs/monitoring-stack-operator/commit/) (2024-12-11) diff --git a/VERSION b/VERSION index 867e52437..589268e6f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.0 \ No newline at end of file +1.3.0 \ No newline at end of file diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml index ac53ab95c..c993f3673 100644 --- a/bundle/manifests/observability-operator.clusterserviceversion.yaml +++ b/bundle/manifests/observability-operator.clusterserviceversion.yaml @@ -41,8 +41,8 @@ metadata: capabilities: Basic Install categories: Monitoring certified: "false" - containerImage: observability-operator:1.2.0 - createdAt: "2025-10-16T07:15:08Z" + containerImage: observability-operator:1.3.0 + createdAt: "2025-11-03T09:23:49Z" description: A Go based Kubernetes operator to setup and manage highly available Monitoring Stack using Prometheus, Alertmanager and Thanos Querier. operatorframework.io/cluster-monitoring: "true" @@ -58,7 +58,7 @@ metadata: ] operators.operatorframework.io/project_layout: unknown repository: https://github.com/rhobs/observability-operator - name: observability-operator.v1.2.0 + name: observability-operator.v1.3.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -1000,7 +1000,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: observability-operator:1.2.0 + image: observability-operator:1.3.0 imagePullPolicy: Always livenessProbe: httpGet: @@ -1140,7 +1140,7 @@ spec: maturity: alpha provider: name: Red Hat - version: 1.2.0 + version: 1.3.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/deploy/olm/kustomization.yaml b/deploy/olm/kustomization.yaml index 43623ded1..4d990fbd6 100644 --- a/deploy/olm/kustomization.yaml +++ b/deploy/olm/kustomization.yaml @@ -13,7 +13,7 @@ resources: images: - name: observability-operator newName: observability-operator - newTag: 1.2.0 + newTag: 1.3.0 patches: - patch: |- diff --git a/deploy/package-operator/operator/kustomization.yaml b/deploy/package-operator/operator/kustomization.yaml index d2d548d0e..a7607e393 100644 --- a/deploy/package-operator/operator/kustomization.yaml +++ b/deploy/package-operator/operator/kustomization.yaml @@ -4,7 +4,7 @@ namespace: observability-operator images: - name: observability-operator newName: observability-operator - newTag: 1.2.0 + newTag: 1.3.0 commonAnnotations: package-operator.run/phase: operator resources: From f62b7f33ab14d3ea7e70132c71f2730be607eda6 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Fri, 14 Nov 2025 13:20:02 +0100 Subject: [PATCH 8/8] chore: bumpt to prometheus-operator 0.86.2 (#933) Signed-off-by: Jan Fajerski --- .../monitoring.rhobs_alertmanagerconfigs.yaml | 2 +- .../monitoring.rhobs_alertmanagers.yaml | 2 +- .../monitoring.rhobs_podmonitors.yaml | 2 +- bundle/manifests/monitoring.rhobs_probes.yaml | 2 +- .../monitoring.rhobs_prometheusagents.yaml | 2 +- .../monitoring.rhobs_prometheuses.yaml | 2 +- .../monitoring.rhobs_prometheusrules.yaml | 2 +- .../monitoring.rhobs_scrapeconfigs.yaml | 2 +- .../monitoring.rhobs_servicemonitors.yaml | 2 +- .../monitoring.rhobs_thanosrulers.yaml | 2 +- ...webhook_policy_v1_poddisruptionbudget.yaml | 2 +- ...operator-admission-webhook_v1_service.yaml | 2 +- .../obo-prometheus-operator_v1_service.yaml | 2 +- ...bility-operator.clusterserviceversion.yaml | 14 +++---- deploy/dependencies/kustomization.yaml | 38 +++++++++---------- go.mod | 8 ++-- go.sum | 16 ++++---- 17 files changed, 51 insertions(+), 51 deletions(-) diff --git a/bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml b/bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml index fcfcb0d44..211db3627 100644 --- a/bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml +++ b/bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: TechPreview - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/monitoring.rhobs_alertmanagers.yaml b/bundle/manifests/monitoring.rhobs_alertmanagers.yaml index e585fbf51..f83ea462e 100644 --- a/bundle/manifests/monitoring.rhobs_alertmanagers.yaml +++ b/bundle/manifests/monitoring.rhobs_alertmanagers.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: Experimental-SSA - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/monitoring.rhobs_podmonitors.yaml b/bundle/manifests/monitoring.rhobs_podmonitors.yaml index a4948d324..af3a2ef83 100644 --- a/bundle/manifests/monitoring.rhobs_podmonitors.yaml +++ b/bundle/manifests/monitoring.rhobs_podmonitors.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: TechPreview - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/monitoring.rhobs_probes.yaml b/bundle/manifests/monitoring.rhobs_probes.yaml index 4a82ec88e..da952c197 100644 --- a/bundle/manifests/monitoring.rhobs_probes.yaml +++ b/bundle/manifests/monitoring.rhobs_probes.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: TechPreview - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/monitoring.rhobs_prometheusagents.yaml b/bundle/manifests/monitoring.rhobs_prometheusagents.yaml index 9124df4bf..9bc80e6b8 100644 --- a/bundle/manifests/monitoring.rhobs_prometheusagents.yaml +++ b/bundle/manifests/monitoring.rhobs_prometheusagents.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: TechPreview - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/monitoring.rhobs_prometheuses.yaml b/bundle/manifests/monitoring.rhobs_prometheuses.yaml index 2925f81a0..b9997e151 100644 --- a/bundle/manifests/monitoring.rhobs_prometheuses.yaml +++ b/bundle/manifests/monitoring.rhobs_prometheuses.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: Experimental-SSA - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/monitoring.rhobs_prometheusrules.yaml b/bundle/manifests/monitoring.rhobs_prometheusrules.yaml index 890d41a07..667fc4242 100644 --- a/bundle/manifests/monitoring.rhobs_prometheusrules.yaml +++ b/bundle/manifests/monitoring.rhobs_prometheusrules.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: TechPreview - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/monitoring.rhobs_scrapeconfigs.yaml b/bundle/manifests/monitoring.rhobs_scrapeconfigs.yaml index 2dc7e63d0..749a1fcd7 100644 --- a/bundle/manifests/monitoring.rhobs_scrapeconfigs.yaml +++ b/bundle/manifests/monitoring.rhobs_scrapeconfigs.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: TechPreview - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/monitoring.rhobs_servicemonitors.yaml b/bundle/manifests/monitoring.rhobs_servicemonitors.yaml index 08c310114..8b9bd273a 100644 --- a/bundle/manifests/monitoring.rhobs_servicemonitors.yaml +++ b/bundle/manifests/monitoring.rhobs_servicemonitors.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: TechPreview - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/monitoring.rhobs_thanosrulers.yaml b/bundle/manifests/monitoring.rhobs_thanosrulers.yaml index 8482c842b..c2b1b8133 100644 --- a/bundle/manifests/monitoring.rhobs_thanosrulers.yaml +++ b/bundle/manifests/monitoring.rhobs_thanosrulers.yaml @@ -4,7 +4,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 observability.openshift.io/api-support: TechPreview - operator.prometheus.io/version: 0.86.1-rhobs1 + operator.prometheus.io/version: 0.86.2-rhobs1 creationTimestamp: null labels: app.kubernetes.io/part-of: observability-operator diff --git a/bundle/manifests/obo-prometheus-operator-admission-webhook_policy_v1_poddisruptionbudget.yaml b/bundle/manifests/obo-prometheus-operator-admission-webhook_policy_v1_poddisruptionbudget.yaml index 2db1a3a43..daa326649 100644 --- a/bundle/manifests/obo-prometheus-operator-admission-webhook_policy_v1_poddisruptionbudget.yaml +++ b/bundle/manifests/obo-prometheus-operator-admission-webhook_policy_v1_poddisruptionbudget.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook app.kubernetes.io/part-of: observability-operator - app.kubernetes.io/version: 0.86.1-rhobs1 + app.kubernetes.io/version: 0.86.2-rhobs1 name: obo-prometheus-operator-admission-webhook spec: minAvailable: 1 diff --git a/bundle/manifests/obo-prometheus-operator-admission-webhook_v1_service.yaml b/bundle/manifests/obo-prometheus-operator-admission-webhook_v1_service.yaml index 25b1a3cb0..2d8caaad8 100644 --- a/bundle/manifests/obo-prometheus-operator-admission-webhook_v1_service.yaml +++ b/bundle/manifests/obo-prometheus-operator-admission-webhook_v1_service.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook app.kubernetes.io/part-of: observability-operator - app.kubernetes.io/version: 0.86.1-rhobs1 + app.kubernetes.io/version: 0.86.2-rhobs1 name: obo-prometheus-operator-admission-webhook spec: ports: diff --git a/bundle/manifests/obo-prometheus-operator_v1_service.yaml b/bundle/manifests/obo-prometheus-operator_v1_service.yaml index 4ccb865eb..baf691655 100644 --- a/bundle/manifests/obo-prometheus-operator_v1_service.yaml +++ b/bundle/manifests/obo-prometheus-operator_v1_service.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: observability-operator - app.kubernetes.io/version: 0.86.1-rhobs1 + app.kubernetes.io/version: 0.86.2-rhobs1 name: obo-prometheus-operator spec: clusterIP: None diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml index c993f3673..482e0c371 100644 --- a/bundle/manifests/observability-operator.clusterserviceversion.yaml +++ b/bundle/manifests/observability-operator.clusterserviceversion.yaml @@ -42,7 +42,7 @@ metadata: categories: Monitoring certified: "false" containerImage: observability-operator:1.3.0 - createdAt: "2025-11-03T09:23:49Z" + createdAt: "2025-11-14T10:13:10Z" description: A Go based Kubernetes operator to setup and manage highly available Monitoring Stack using Prometheus, Alertmanager and Thanos Querier. operatorframework.io/cluster-monitoring: "true" @@ -251,7 +251,7 @@ spec: - list - watch - apiGroups: - - "" + - events.k8s.io resources: - events verbs: @@ -825,7 +825,7 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: observability-operator - app.kubernetes.io/version: 0.86.1-rhobs1 + app.kubernetes.io/version: 0.86.2-rhobs1 name: obo-prometheus-operator spec: replicas: 1 @@ -844,7 +844,7 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: observability-operator - app.kubernetes.io/version: 0.86.1-rhobs1 + app.kubernetes.io/version: 0.86.2-rhobs1 spec: affinity: nodeAffinity: @@ -894,7 +894,7 @@ spec: - label: app.kubernetes.io/name: prometheus-operator-admission-webhook app.kubernetes.io/part-of: observability-operator - app.kubernetes.io/version: 0.86.1-rhobs1 + app.kubernetes.io/version: 0.86.2-rhobs1 name: obo-prometheus-operator-admission-webhook spec: replicas: 2 @@ -912,7 +912,7 @@ spec: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook app.kubernetes.io/part-of: observability-operator - app.kubernetes.io/version: 0.86.1-rhobs1 + app.kubernetes.io/version: 0.86.2-rhobs1 spec: affinity: nodeAffinity: @@ -937,7 +937,7 @@ spec: - --web.enable-tls=true - --web.cert-file=/tmp/k8s-webhook-server/serving-certs/tls.crt - --web.key-file=/tmp/k8s-webhook-server/serving-certs/tls.key - image: quay.io/rhobs/obo-admission-webhook:v0.86.1-rhobs1 + image: quay.io/rhobs/obo-admission-webhook:v0.86.2-rhobs1 name: prometheus-operator-admission-webhook ports: - containerPort: 8443 diff --git a/deploy/dependencies/kustomization.yaml b/deploy/dependencies/kustomization.yaml index 57064f05a..c98995453 100644 --- a/deploy/dependencies/kustomization.yaml +++ b/deploy/dependencies/kustomization.yaml @@ -3,25 +3,25 @@ kind: Kustomization resources: -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_alertmanagers.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_podmonitors.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_probes.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_prometheuses.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_prometheusrules.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_servicemonitors.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_thanosrulers.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_prometheusagents.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_alertmanagerconfigs.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_scrapeconfigs.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/rbac/prometheus-operator/prometheus-operator-service.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/admission-webhook/deployment.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/admission-webhook/service-account.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/admission-webhook/service.yaml -- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.1-rhobs1/example/admission-webhook/pod-disruption-budget.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_alertmanagers.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_podmonitors.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_probes.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_prometheuses.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_prometheusrules.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_servicemonitors.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_thanosrulers.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_prometheusagents.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_alertmanagerconfigs.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/prometheus-operator-crd/monitoring.rhobs_scrapeconfigs.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/rbac/prometheus-operator/prometheus-operator-service.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/admission-webhook/deployment.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/admission-webhook/service-account.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/admission-webhook/service.yaml +- https://raw.githubusercontent.com/rhobs/obo-prometheus-operator/v0.86.2-rhobs1/example/admission-webhook/pod-disruption-budget.yaml # NOTE: a service although automatically created by OLM for webhooks still # requires admission-webhook/service as the port generated by OLM uses 443 # but assumes targetPort to be 443 as opposed to "https" port of webhook - 8443 diff --git a/go.mod b/go.mod index d380b8bb5..46fff224b 100644 --- a/go.mod +++ b/go.mod @@ -12,10 +12,10 @@ require ( github.com/openshift/api v3.9.0+incompatible // PINNED: newer versions remove console/v1alpha1 API needed for OpenShift <4.17 compatibility github.com/operator-framework/api v0.34.0 github.com/pkg/errors v0.9.1 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.1 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.2 github.com/prometheus/common v0.67.1 - github.com/rhobs/obo-prometheus-operator v0.86.1-rhobs1 - github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.86.1-rhobs1 + github.com/rhobs/obo-prometheus-operator v0.86.2-rhobs1 + github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.86.2-rhobs1 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 golang.org/x/mod v0.28.0 @@ -129,7 +129,7 @@ require ( github.com/prometheus/otlptranslator v0.0.2 // indirect github.com/prometheus/procfs v0.17.0 // indirect github.com/prometheus/prometheus v0.305.1-0.20250818080900-0a40df33fb4e // indirect - github.com/rhobs/obo-prometheus-operator/pkg/client v0.86.1-rhobs1 // indirect + github.com/rhobs/obo-prometheus-operator/pkg/client v0.86.2-rhobs1 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.10.1 // indirect diff --git a/go.sum b/go.sum index 4a58e641c..6f0fc0b14 100644 --- a/go.sum +++ b/go.sum @@ -403,8 +403,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus-community/prom-label-proxy v0.12.1 h1:vJ6tGz4NMge140Ua3T/zh3HO0CA3bmnCsfkWK/cujG0= github.com/prometheus-community/prom-label-proxy v0.12.1/go.mod h1:/tZNtOMcbPbE1VFcY8b48mPqT1bb2jVpXx2WdjjM8TY= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.1 h1:j/GvU9UxlK5nuUKOWYOY0LRqcfHZl1ffTOa46+00Cys= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.1/go.mod h1:nPk0OteXBkbT0CRCa2oZQL1jRLW6RJ2fuIijHypeJdk= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.2 h1:VRXUgbGmpmjZgFYiUnTwlC+JjfCUs5KKFsorJhI1ZKQ= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.2/go.mod h1:nPk0OteXBkbT0CRCa2oZQL1jRLW6RJ2fuIijHypeJdk= github.com/prometheus/alertmanager v0.28.1 h1:BK5pCoAtaKg01BYRUJhEDV1tqJMEtYBGzPw8QdvnnvA= github.com/prometheus/alertmanager v0.28.1/go.mod h1:0StpPUDDHi1VXeM7p2yYfeZgLVi/PPlt39vo9LQUHxM= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -432,12 +432,12 @@ github.com/prometheus/prometheus v0.305.1-0.20250818080900-0a40df33fb4e h1:HcaG1 github.com/prometheus/prometheus v0.305.1-0.20250818080900-0a40df33fb4e/go.mod h1:uxFMhGI+u8QK+W7Zr/oZGvf2lkHgnjbBmAEEnoymLyg= github.com/prometheus/sigv4 v0.2.0 h1:qDFKnHYFswJxdzGeRP63c4HlH3Vbn1Yf/Ao2zabtVXk= github.com/prometheus/sigv4 v0.2.0/go.mod h1:D04rqmAaPPEUkjRQxGqjoxdyJuyCh6E0M18fZr0zBiE= -github.com/rhobs/obo-prometheus-operator v0.86.1-rhobs1 h1:HGxed6HguZl8zDtBYh0j33aEcRMHg2pdJEwQWI4JoK0= -github.com/rhobs/obo-prometheus-operator v0.86.1-rhobs1/go.mod h1:llR/jE81G/P+dPkKjNmTrkgJ26eA9fPHLhLRxsQ3FCo= -github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.86.1-rhobs1 h1:TRSAAEQ8xZgBYnq7GY1WpfToU3OjBv/hDuzmI8IRF38= -github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.86.1-rhobs1/go.mod h1:l986kUrEUzfrbYEsqRvSAJThNbF4SUKkM5eZR+L3uf0= -github.com/rhobs/obo-prometheus-operator/pkg/client v0.86.1-rhobs1 h1:hKGd+NRtZkrTBFcoApy/3IkKJJprjwE3zsF4bZZxG7Y= -github.com/rhobs/obo-prometheus-operator/pkg/client v0.86.1-rhobs1/go.mod h1:Ad3ru/JHiOZNEwAsaPMxzUq5Ft/qRs2kzBQXhw/9yJc= +github.com/rhobs/obo-prometheus-operator v0.86.2-rhobs1 h1:QGR5xr9DJO4StwEvzorhbie2nnRHPcWloJMdJyTzmM8= +github.com/rhobs/obo-prometheus-operator v0.86.2-rhobs1/go.mod h1:QFDNkYTYaR2NlRr7PoM2kH8tp1xUxI3fElU4hpceQLA= +github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.86.2-rhobs1 h1:4VkQnCtdwBzrMP7x5+7KhViipa2ARmEOHip6ULVm14U= +github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.86.2-rhobs1/go.mod h1:l986kUrEUzfrbYEsqRvSAJThNbF4SUKkM5eZR+L3uf0= +github.com/rhobs/obo-prometheus-operator/pkg/client v0.86.2-rhobs1 h1:xHFPnhTfQ1JNtHfqveI3MRdk7FREgkY3s2pTjoFL3Bw= +github.com/rhobs/obo-prometheus-operator/pkg/client v0.86.2-rhobs1/go.mod h1:a2jQ6UDlAqTT573SpRc548JwIK1rvMh6RKvSI/749HA= github.com/rhobs/observability-operator/pkg/apis v0.0.0-20251009091129-76135c924ed6 h1:f+J6l48RMDomN9YrDxd0cZVo7+L+a/TCzH6ycat5tMI= github.com/rhobs/observability-operator/pkg/apis v0.0.0-20251009091129-76135c924ed6/go.mod h1:bNP815/mCv8ydNQ2Q3a9gqlx9b2XouWa6hws9vthq78= github.com/rhobs/perses v0.0.0-20250612171017-5d7686af9ae4 h1:IxpxGJ/fbnRkZZYFm17NMedFyEuOKuf4TS23g+6jMvU=