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 ec6f1b010..e47334fa5 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-07T04:13:59Z" + 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" @@ -254,7 +254,7 @@ spec: - list - watch - apiGroups: - - "" + - events.k8s.io resources: - events verbs: @@ -828,7 +828,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 @@ -847,7 +847,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: @@ -897,7 +897,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 @@ -915,7 +915,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: @@ -940,7 +940,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/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/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= 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, diff --git a/pkg/controllers/uiplugin/components.go b/pkg/controllers/uiplugin/components.go index b42299ff8..7e15354da 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 { @@ -116,9 +116,12 @@ 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, "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),