From 0345a886e1d96315eb72e2b477b39f86848e9485 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Mon, 23 Mar 2026 16:31:28 +0100 Subject: [PATCH 1/3] check length of filters for matchers Signed-off-by: Coleen Iona Quadros --- prometheus/sdk/go/variable/label-values/label-values.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/sdk/go/variable/label-values/label-values.go b/prometheus/sdk/go/variable/label-values/label-values.go index 7672a2e8f..fda63d4c8 100644 --- a/prometheus/sdk/go/variable/label-values/label-values.go +++ b/prometheus/sdk/go/variable/label-values/label-values.go @@ -79,7 +79,7 @@ func (b *Builder) ApplyFilters() error { for index, matcher := range b.Matchers { // Add filter if matcher does not already have a metric filter - if !strings.Contains(matcher, "{") { + if !strings.Contains(matcher, "{") && len(filters) > 0 { b.Matchers[index] = fmt.Sprintf("%s{%s}", matcher, strings.Join(filters, ",")) } } From 21635122ea3263ed572726ed86451627f3f65f3c Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Tue, 24 Mar 2026 16:37:10 +0100 Subject: [PATCH 2/3] add calculation to piechart Signed-off-by: Coleen Iona Quadros --- piechart/sdk/go/options.go | 7 +++++++ piechart/sdk/go/pie.go | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/piechart/sdk/go/options.go b/piechart/sdk/go/options.go index 28de90f67..3a3fc8058 100644 --- a/piechart/sdk/go/options.go +++ b/piechart/sdk/go/options.go @@ -15,6 +15,13 @@ package pie import "github.com/perses/perses/go-sdk/common" +func Calculation(calculation common.Calculation) Option { + return func(builder *Builder) error { + builder.Calculation = calculation + return nil + } +} + func WithLegend(legend Legend) Option { return func(builder *Builder) error { builder.Legend = &legend diff --git a/piechart/sdk/go/pie.go b/piechart/sdk/go/pie.go index f29ba9108..04076cd75 100644 --- a/piechart/sdk/go/pie.go +++ b/piechart/sdk/go/pie.go @@ -136,7 +136,11 @@ func create(options ...Option) (Builder, error) { PluginSpec: PluginSpec{}, } - for _, opt := range options { + defaults := []Option{ + Calculation(common.LastCalculation), + } + + for _, opt := range append(defaults, options...) { if err := opt(builder); err != nil { return *builder, err } From 954f40ff97026ecb24421727ae57db7a2756feb4 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Thu, 26 Mar 2026 13:44:41 +0100 Subject: [PATCH 3/3] Revert "add calculation to piechart" This reverts commit cd6e47926e96f13cfb1452305d21809904ff74a0. Signed-off-by: Coleen Iona Quadros --- piechart/sdk/go/options.go | 7 ------- piechart/sdk/go/pie.go | 6 +----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/piechart/sdk/go/options.go b/piechart/sdk/go/options.go index 3a3fc8058..28de90f67 100644 --- a/piechart/sdk/go/options.go +++ b/piechart/sdk/go/options.go @@ -15,13 +15,6 @@ package pie import "github.com/perses/perses/go-sdk/common" -func Calculation(calculation common.Calculation) Option { - return func(builder *Builder) error { - builder.Calculation = calculation - return nil - } -} - func WithLegend(legend Legend) Option { return func(builder *Builder) error { builder.Legend = &legend diff --git a/piechart/sdk/go/pie.go b/piechart/sdk/go/pie.go index 04076cd75..f29ba9108 100644 --- a/piechart/sdk/go/pie.go +++ b/piechart/sdk/go/pie.go @@ -136,11 +136,7 @@ func create(options ...Option) (Builder, error) { PluginSpec: PluginSpec{}, } - defaults := []Option{ - Calculation(common.LastCalculation), - } - - for _, opt := range append(defaults, options...) { + for _, opt := range options { if err := opt(builder); err != nil { return *builder, err }