Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

COO-713: fix: Add missing perses schemas #711

Merged
merged 1 commit into from
Mar 17, 2025
Merged

COO-713: fix: Add missing perses schemas #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundle/manifests/observability-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ metadata:
categories: Monitoring
certified: "false"
containerImage: observability-operator:1.1.0
createdAt: "2025-03-13T16:50:00Z"
createdAt: "2025-03-17T11:01:43Z"
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"
Expand Down Expand Up @@ -989,7 +989,7 @@ spec:
operator: Exists
weight: 1
containers:
- image: quay.io/persesdev/perses-operator:v0.1.8
- image: quay.io/persesdev/perses-operator:v0.1.9
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion deploy/perses/perses-operator-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
spec:
containers:
- name: perses-operator
image: quay.io/persesdev/perses-operator:v0.1.8
image: quay.io/persesdev/perses-operator:v0.1.9
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/google/go-cmp v0.7.0
github.com/openshift/api v0.0.0-20240404200104-96ed2d49b255
github.com/perses/perses v0.51.0-beta.0
github.com/perses/perses-operator v0.1.8
github.com/perses/perses-operator v0.1.9
github.com/pkg/errors v0.9.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1
github.com/prometheus/common v0.62.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ github.com/perses/common v0.27.0 h1:MtqDz/qzkKcj0T1DkTMS2+pJEjw2gw4Bac6n4C2OCNQ=
github.com/perses/common v0.27.0/go.mod h1:d7uE0LIysDf7bor9/g6exyFEg8nfRqbCxrezBUYXo2I=
github.com/perses/perses v0.51.0-beta.0 h1:KsHVMZfVSQDHsChedE2sLTxgu8QJDOP0uF0JWD1HXwI=
github.com/perses/perses v0.51.0-beta.0/go.mod h1:MeZVIMJaGcLRAxrxXCWrZbDb8pmvSIOSsKXKJGS+ofw=
github.com/perses/perses-operator v0.1.8 h1:5pRa+m5yAGwzPXCJbqfnowgLjenv66sL/hraptQv10c=
github.com/perses/perses-operator v0.1.8/go.mod h1:7pA2q/0kFpLmc5YPizabOtqQJvTtIbLeWQIc/ipvTbI=
github.com/perses/perses-operator v0.1.9 h1:EJyG2Mm54md3zQq7G7+tg6AduwWOqxFLOTJ6rjgoCTA=
github.com/perses/perses-operator v0.1.9/go.mod h1:7pA2q/0kFpLmc5YPizabOtqQJvTtIbLeWQIc/ipvTbI=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down
9 changes: 9 additions & 0 deletions pkg/controllers/uiplugin/monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package uiplugin
import (
"fmt"
"strings"
"time"

osv1 "github.com/openshift/api/console/v1"
osv1alpha1 "github.com/openshift/api/console/v1alpha1"
Expand All @@ -13,6 +14,7 @@ import (

persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
persesconfig "github.com/perses/perses/pkg/model/api/config"
"github.com/perses/perses/pkg/model/api/v1/common"
uiv1alpha1 "github.com/rhobs/observability-operator/pkg/apis/uiplugin/v1alpha1"
)

Expand Down Expand Up @@ -288,6 +290,13 @@ func newPerses(namespace string, persesImage string) *persesv1alpha1.Perses {
Extension: persesconfig.YAMLExtension,
},
},
Schemas: &persesconfig.Schemas{
PanelsPath: "/etc/perses/cue/schemas/panels",
QueriesPath: "/etc/perses/cue/schemas/queries",
DatasourcesPath: "/etc/perses/cue/schemas/datasources",
VariablesPath: "/etc/perses/cue/schemas/variables",
Interval: common.Duration(time.Hour * 6),
},
},
},
Image: persesImage,
Expand Down
Loading