Skip to content

Commit af7e68c

Browse files
authored
fix: include perses schema configuration (#711)
1 parent 09b8e94 commit af7e68c

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

bundle/manifests/observability-operator.clusterserviceversion.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ metadata:
4242
categories: Monitoring
4343
certified: "false"
4444
containerImage: observability-operator:1.1.0
45-
createdAt: "2025-03-13T16:50:00Z"
45+
createdAt: "2025-03-17T11:01:43Z"
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"
@@ -989,7 +989,7 @@ spec:
989989
operator: Exists
990990
weight: 1
991991
containers:
992-
- image: quay.io/persesdev/perses-operator:v0.1.8
992+
- image: quay.io/persesdev/perses-operator:v0.1.9
993993
livenessProbe:
994994
httpGet:
995995
path: /healthz

deploy/perses/perses-operator-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
spec:
2525
containers:
2626
- name: perses-operator
27-
image: quay.io/persesdev/perses-operator:v0.1.8
27+
image: quay.io/persesdev/perses-operator:v0.1.9
2828
securityContext:
2929
allowPrivilegeEscalation: false
3030
capabilities:

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/google/go-cmp v0.7.0
1010
github.com/openshift/api v0.0.0-20240404200104-96ed2d49b255
1111
github.com/perses/perses v0.51.0-beta.0
12-
github.com/perses/perses-operator v0.1.8
12+
github.com/perses/perses-operator v0.1.9
1313
github.com/pkg/errors v0.9.1
1414
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1
1515
github.com/prometheus/common v0.62.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ github.com/perses/common v0.27.0 h1:MtqDz/qzkKcj0T1DkTMS2+pJEjw2gw4Bac6n4C2OCNQ=
232232
github.com/perses/common v0.27.0/go.mod h1:d7uE0LIysDf7bor9/g6exyFEg8nfRqbCxrezBUYXo2I=
233233
github.com/perses/perses v0.51.0-beta.0 h1:KsHVMZfVSQDHsChedE2sLTxgu8QJDOP0uF0JWD1HXwI=
234234
github.com/perses/perses v0.51.0-beta.0/go.mod h1:MeZVIMJaGcLRAxrxXCWrZbDb8pmvSIOSsKXKJGS+ofw=
235-
github.com/perses/perses-operator v0.1.8 h1:5pRa+m5yAGwzPXCJbqfnowgLjenv66sL/hraptQv10c=
236-
github.com/perses/perses-operator v0.1.8/go.mod h1:7pA2q/0kFpLmc5YPizabOtqQJvTtIbLeWQIc/ipvTbI=
235+
github.com/perses/perses-operator v0.1.9 h1:EJyG2Mm54md3zQq7G7+tg6AduwWOqxFLOTJ6rjgoCTA=
236+
github.com/perses/perses-operator v0.1.9/go.mod h1:7pA2q/0kFpLmc5YPizabOtqQJvTtIbLeWQIc/ipvTbI=
237237
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
238238
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
239239
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

pkg/controllers/uiplugin/monitoring.go

+9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package uiplugin
33
import (
44
"fmt"
55
"strings"
6+
"time"
67

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

1415
persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
1516
persesconfig "github.com/perses/perses/pkg/model/api/config"
17+
"github.com/perses/perses/pkg/model/api/v1/common"
1618
uiv1alpha1 "github.com/rhobs/observability-operator/pkg/apis/uiplugin/v1alpha1"
1719
)
1820

@@ -288,6 +290,13 @@ func newPerses(namespace string, persesImage string) *persesv1alpha1.Perses {
288290
Extension: persesconfig.YAMLExtension,
289291
},
290292
},
293+
Schemas: &persesconfig.Schemas{
294+
PanelsPath: "/etc/perses/cue/schemas/panels",
295+
QueriesPath: "/etc/perses/cue/schemas/queries",
296+
DatasourcesPath: "/etc/perses/cue/schemas/datasources",
297+
VariablesPath: "/etc/perses/cue/schemas/variables",
298+
Interval: common.Duration(time.Hour * 6),
299+
},
291300
},
292301
},
293302
Image: persesImage,

0 commit comments

Comments
 (0)