Skip to content

Commit 67c9a77

Browse files
faloxmarioferhPeterYurkovichjgbernalpjan--f
authored
sync 1.2 to main (#780)
* Revert "chore(release): 1.2.0 (#741)" This reverts commit c31d6f9. * chore(release): 1.2.0 * feat: update perses operator to v0.1.12 (#773) Signed-off-by: PeterYurkovich <pyurkovi@redhat.com> * fix: use mounted ca for perses operator client (#774) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * fix: remove default value for logging as it affects other plugins (#775) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * fix: ca reference and accelerators dashboard reconciliation (#776) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * feat: reconcile dashboards only when perses is enabled (#786) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * feat: update monitoring and perses images (#787) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * fix: add version to perses CRD (#788) Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * feat: add perses rbac support (#777) * feat: update perses to include rbac Signed-off-by: Gabriel Bernal <gbernal@redhat.com> Signed-off-by: PeterYurkovich <pyurkovi@redhat.com> * fix: perses guest permissions * fix: perses config format * fix: add perses clusterrole and binding * feat: add perses roles * fix: update perses image Signed-off-by: Gabriel Bernal <gbernal@redhat.com> * fix: remove deprecated schema --------- Signed-off-by: Gabriel Bernal <gbernal@redhat.com> Signed-off-by: PeterYurkovich <pyurkovi@redhat.com> Co-authored-by: Gabriel Bernal <gbernal@redhat.com> --------- Signed-off-by: PeterYurkovich <pyurkovi@redhat.com> Signed-off-by: Gabriel Bernal <gbernal@redhat.com> Co-authored-by: Mario Fernandez <mariofer@redhat.com> Co-authored-by: Peter Yurkovich <47438010+PeterYurkovich@users.noreply.github.com> Co-authored-by: Gabriel Bernal <gbernal@redhat.com> Co-authored-by: Jan Fajerski <jan--f@users.noreply.github.com>
1 parent 315b436 commit 67c9a77

35 files changed

+1856
-711
lines changed

CHANGELOG.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,6 @@
22

33
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.
44

5-
## [1.2.0](https://github.com/rhobs/monitoring-stack-operator/commit/) (2025-05-19)
6-
7-
8-
### Features
9-
10-
* Add Perses Flag OU-571 ([#664](https://github.com/rhobs/monitoring-stack-operator/issues/664)) ([c5b39c1](https://github.com/rhobs/monitoring-stack-operator/commit/c5b39c12719896be405f53916c6010d2b500fe13))
11-
* add Incidents backend ([#678](https://github.com/rhobs/monitoring-stack-operator/issues/678)) ([5bcf2db](https://github.com/rhobs/monitoring-stack-operator/commit/5bcf2db7e316faa81fc9143d14b1f75b6fb8a4f5))
12-
* add PatternFly 5 stream for distributed tracing UI plugin ([#736](https://github.com/rhobs/monitoring-stack-operator/issues/736)) ([b3176ac](https://github.com/rhobs/monitoring-stack-operator/commit/b3176ac82e82ba803ff1a6f704534c65a17a5725))
13-
* add perses operator deployment and apis ([#680](https://github.com/rhobs/monitoring-stack-operator/issues/680)) ([5ba0330](https://github.com/rhobs/monitoring-stack-operator/commit/5ba03304119eb2545e277e55bc8cea1441c23d24))
14-
* add schema configuration for logging view plugin ([#733](https://github.com/rhobs/monitoring-stack-operator/issues/733)) ([0124fd8](https://github.com/rhobs/monitoring-stack-operator/commit/0124fd89cab3a6b122e484dd90d396a9b9855ee1))
15-
* add support for multiple images in plugins ([#689](https://github.com/rhobs/monitoring-stack-operator/issues/689)) ([e42e8a8](https://github.com/rhobs/monitoring-stack-operator/commit/e42e8a8e514a5b95e47842148496089e8336ce33))
16-
* deploying COO in place of OBO on SC clusters ([#667](https://github.com/rhobs/monitoring-stack-operator/issues/667)) ([c9eb0e0](https://github.com/rhobs/monitoring-stack-operator/commit/c9eb0e0f1d16d27a13b10d9e2db5fe281e790f0b))
17-
* deploying COO in place of OBO on SC clusters ([#716](https://github.com/rhobs/monitoring-stack-operator/issues/716)) ([dfe4e21](https://github.com/rhobs/monitoring-stack-operator/commit/dfe4e21cefceb2707c88da2faf00f005607844e6))
18-
* discover default lokistack ([#690](https://github.com/rhobs/monitoring-stack-operator/issues/690)) ([648c091](https://github.com/rhobs/monitoring-stack-operator/commit/648c0910237e3491e95b6ddcc77ebb98a0645048))
19-
* drop support for ui monitoring 4.14 ([#688](https://github.com/rhobs/monitoring-stack-operator/issues/688)) ([cd66c38](https://github.com/rhobs/monitoring-stack-operator/commit/cd66c380ea9876c2b3caf1bf5ea2e487fde786e3))
20-
* enable pprof on the operator ([#725](https://github.com/rhobs/monitoring-stack-operator/issues/725)) ([2efed3c](https://github.com/rhobs/monitoring-stack-operator/commit/2efed3cb55452bd946fd87cdc86472a9667462ce))
21-
* log Kubernetes events related to TLS certificate ([#637](https://github.com/rhobs/monitoring-stack-operator/issues/637)) ([a0ff1f3](https://github.com/rhobs/monitoring-stack-operator/commit/a0ff1f3133fb8464af3983518a0cc1d384ebb2e3))
22-
* remove acm-version check for acm-alerting ui feature ([#677](https://github.com/rhobs/monitoring-stack-operator/issues/677)) ([365e30d](https://github.com/rhobs/monitoring-stack-operator/commit/365e30d3392c9ec3114bbc1d1eab3e46c86468e6))
23-
* TLS support for the Thanos web endpoint ([#598](https://github.com/rhobs/monitoring-stack-operator/issues/598)) ([d989f9a](https://github.com/rhobs/monitoring-stack-operator/commit/d989f9ac839c196efc6d8d0146588d780a08ba88))
24-
* update health-analyzer to v0.5.0 ([#738](https://github.com/rhobs/monitoring-stack-operator/issues/738)) ([7831111](https://github.com/rhobs/monitoring-stack-operator/commit/7831111b57f19c2765b2c7916c1a6f468346fcc1))
25-
* update UIPlugin images to prep for COO 1.1 release ([#687](https://github.com/rhobs/monitoring-stack-operator/issues/687)) ([2b6fe6d](https://github.com/rhobs/monitoring-stack-operator/commit/2b6fe6d924843858b1f1d581a9917f5cdd16f182))
26-
27-
28-
### Bug Fixes
29-
30-
* default image for distributed tracing new stream ([#737](https://github.com/rhobs/monitoring-stack-operator/issues/737)) ([be7ed12](https://github.com/rhobs/monitoring-stack-operator/commit/be7ed128aa31bff628ee831e905f4dfc69dc1dc6))
31-
* failed to get metric when install upstream ObO on OCP ([#654](https://github.com/rhobs/monitoring-stack-operator/issues/654)) ([6d7b707](https://github.com/rhobs/monitoring-stack-operator/commit/6d7b70724364dcc5996d3e174ca32414fb9db0b3))
32-
* mktemp command expects a template string that includes a minimum of six X characters on some os ([#650](https://github.com/rhobs/monitoring-stack-operator/issues/650)) ([21f303b](https://github.com/rhobs/monitoring-stack-operator/commit/21f303b0b9a33b2f28a877824006bd5d57bc71ea))
33-
* test script failure when enable OCP feature gate ([#695](https://github.com/rhobs/monitoring-stack-operator/issues/695)) ([79cbdf6](https://github.com/rhobs/monitoring-stack-operator/commit/79cbdf6efb493ccdb467fe778cc20b543e5cc17b))
34-
* update docs with new monitoring UIPlugin schema ([#681](https://github.com/rhobs/monitoring-stack-operator/issues/681)) ([6e9607a](https://github.com/rhobs/monitoring-stack-operator/commit/6e9607a6d6d39298672b606c9abbf5c502b35363))
35-
* web UI case failure in downstream ([#719](https://github.com/rhobs/monitoring-stack-operator/issues/719)) ([08ec7ed](https://github.com/rhobs/monitoring-stack-operator/commit/08ec7ed87e8b23761b5f6d47f773c66333365156))
36-
375
## [1.0.0](https://github.com/rhobs/monitoring-stack-operator/commit/) (2024-12-11)
386

397

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ generate-prom-operator-crds: $(CONTROLLER_GEN)
6060
.PHONY: generate-perses-op-crds
6161
generate-perses-op-crds: $(CONTROLLER_GEN)
6262
$(CONTROLLER_GEN) crd \
63-
paths=github.com/perses/perses-operator/api/... \
63+
paths=github.com/rhobs/perses-operator/api/... \
6464
output:dir=. \
6565
output:crd:dir=./deploy/perses/crds
6666

bundle/manifests/observability-operator.clusterserviceversion.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ metadata:
4242
categories: Monitoring
4343
certified: "false"
4444
containerImage: observability-operator:1.2.0
45-
createdAt: "2025-05-26T07:04:40Z"
45+
createdAt: "2025-06-24T11:30:26Z"
4646
description: A Go based Kubernetes operator to setup and manage highly available
4747
Monitoring Stack using Prometheus, Alertmanager and Thanos Querier.
4848
operatorframework.io/cluster-monitoring: "true"
@@ -80,13 +80,19 @@ spec:
8080
kind: MonitoringStack
8181
name: monitoringstacks.monitoring.rhobs
8282
version: v1alpha1
83-
- kind: Perses
83+
- description: Perses is the Schema for the perses API
84+
displayName: Perses
85+
kind: Perses
8486
name: perses.perses.dev
8587
version: v1alpha1
86-
- kind: PersesDashboard
88+
- description: A Perses Dashboard
89+
displayName: Perses Dashboard
90+
kind: PersesDashboard
8791
name: persesdashboards.perses.dev
8892
version: v1alpha1
89-
- kind: PersesDatasource
93+
- description: A Perses Datasource
94+
displayName: Perses Datasource
95+
kind: PersesDatasource
9096
name: persesdatasources.perses.dev
9197
version: v1alpha1
9298
- description: PodMonitor defines monitoring for a set of pods
@@ -658,6 +664,7 @@ spec:
658664
resources:
659665
- services
660666
- configmaps
667+
- secrets
661668
verbs:
662669
- get
663670
- patch
@@ -922,7 +929,7 @@ spec:
922929
- --images=alertmanager=quay.io/prometheus/alertmanager:v0.26.0
923930
- --images=prometheus=quay.io/prometheus/prometheus:v2.49.1
924931
- --images=thanos=quay.io/thanos/thanos:v0.33.0
925-
- --images=perses=quay.io/persesdev/perses:v0.50.3
932+
- --images=perses=quay.io/openshift-observability-ui/perses:v0.51.1-go-1.23
926933
env:
927934
- name: NAMESPACE
928935
valueFrom:
@@ -999,7 +1006,7 @@ spec:
9991006
operator: Exists
10001007
weight: 1
10011008
containers:
1002-
- image: quay.io/persesdev/perses-operator:v0.1.10
1009+
- image: quay.io/openshift-observability-ui/perses-operator:v0.2-go-1.23
10031010
livenessProbe:
10041011
httpGet:
10051012
path: /healthz
@@ -1038,7 +1045,7 @@ spec:
10381045
- configMap:
10391046
items:
10401047
- key: service-ca.crt
1041-
path: ca.crt
1048+
path: service-ca.crt
10421049
name: openshift-service-ca.crt
10431050
optional: true
10441051
name: openshift-service-ca

bundle/manifests/observability.openshift.io_uiplugins.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,10 @@ spec:
129129
type: object
130130
x-kubernetes-map-type: atomic
131131
schema:
132-
default: viaq
133132
description: |-
134133
Schema is the schema to use for logs querying and display.
135134
136-
Defatults to "viaq" if not specified.
135+
Defatults to "viaq" if not specified, "select" is used to allow users to select the schema from the UI.
137136
enum:
138137
- viaq
139138
- otel

0 commit comments

Comments
 (0)