kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-06 01:38:10 +00:00
Code Issues Projects Releases Packages Activity Actions

pkg/custom-provider: update expected test queries

Browse source
This commit is contained in:
Andy Bursavich 2024-07-25 18:24:57 -07:00
parent 7d895374b0
commit 69ae2d1210
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/custom-provider/series_registry_test.go
View file

@ -164,7 +164,7 @@ var _ = Describe("Series Registry", func() {
resourceNames: []string{"somepod1", "somepod2"}, resourceNames: []string{"somepod1", "somepod2"},
metricSelector: labels.Everything(), metricSelector: labels.Everything(),
expectedQuery: "sum(container_some_usage{namespace=\"somens\",pod=~\"somepod1|somepod2\",container!=\"POD\"}) by (pod)", expectedQuery: "sum(container_some_usage{namespace=\"somens\",pod=~\"somepod[12]\",container!=\"POD\"}) by (pod)",
}, },
{ {
title: "container metrics counter", title: "container metrics counter",
@ -173,7 +173,7 @@ var _ = Describe("Series Registry", func() {
resourceNames: []string{"somepod1", "somepod2"}, resourceNames: []string{"somepod1", "somepod2"},
metricSelector: labels.Everything(), metricSelector: labels.Everything(),
expectedQuery: "sum(rate(container_some_count_total{namespace=\"somens\",pod=~\"somepod1|somepod2\",container!=\"POD\"}[1m])) by (pod)", expectedQuery: "sum(rate(container_some_count_total{namespace=\"somens\",pod=~\"somepod[12]\",container!=\"POD\"}[1m])) by (pod)",
}, },
{ {
title: "container metrics seconds counter", title: "container metrics seconds counter",
@ -182,7 +182,7 @@ var _ = Describe("Series Registry", func() {
resourceNames: []string{"somepod1", "somepod2"}, resourceNames: []string{"somepod1", "somepod2"},
metricSelector: labels.Everything(), metricSelector: labels.Everything(),
expectedQuery: "sum(rate(container_some_time_seconds_total{namespace=\"somens\",pod=~\"somepod1|somepod2\",container!=\"POD\"}[1m])) by (pod)", expectedQuery: "sum(rate(container_some_time_seconds_total{namespace=\"somens\",pod=~\"somepod[12]\",container!=\"POD\"}[1m])) by (pod)",
}, },
// namespaced metrics // namespaced metrics
{ {

6
pkg/naming/metrics_query.go
View file

@ -364,12 +364,6 @@ func compactRegexp(values []string) (string, error) {
return "", ErrMalformedQuery return "", ErrMalformedQuery
} }
} }
if len(values) == 0 {
return "", nil
}
if len(values) == 1 {
return values[0], nil
}
expr := strings.Join(values, "|") expr := strings.Join(values, "|")
re, err := syntax.Parse(expr, syntax.POSIX) re, err := syntax.Parse(expr, syntax.POSIX)
if err != nil { if err != nil {