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

Adds Support for Cross-Namespace Metrics

Browse source
This commit is contained in:
AshMenhennett 2019-11-01 10:28:30 +11:00
parent 03bc47e9fb
commit 718cb2400e
4 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

34
pkg/naming/metrics_query_test.go
View file

@ -21,6 +21,7 @@ import (
"testing"
prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client"
"github.com/directxman12/k8s-prometheus-adapter/pkg/config"
pmodel "github.com/prometheus/common/model"
labels "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -261,6 +262,7 @@ func TestBuildExternalSelector(t *testing.T) {
groupBy string
groupBySlice []string
metricSelector labels.Selector
options config.Options
check checkFunc
}{
@ -340,6 +342,36 @@ func TestBuildExternalSelector(t *testing.T) {
hasSelector(`foo="bar",namespaces="default"`),
),
},
{
name: "single LabelMatchers value with namespace - detached namespace",
mq: mustNewQuery(`<<.LabelMatchers>>`),
namespace: "default",
options: config.Options{DetatchFromNamespace: true},
metricSelector: labels.NewSelector().Add(
*mustNewLabelRequirement("foo", selection.Equals, []string{"bar"}),
),
check: checks(
hasError(nil),
hasSelector(`foo="bar"`),
),
},
{
name: "single LabelMatchers value with namespace - explicit attached namespace",
mq: mustNewQuery(`<<.LabelMatchers>>`),
namespace: "default",
options: config.Options{DetatchFromNamespace: false},
metricSelector: labels.NewSelector().Add(
*mustNewLabelRequirement("foo", selection.Equals, []string{"bar"}),
),
check: checks(
hasError(nil),
hasSelector(`foo="bar",namespaces="default"`),
),
},
{
name: "multiple LabelMatchers value",
@ -384,7 +416,7 @@ func TestBuildExternalSelector(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
selector, err := tc.mq.BuildExternal(tc.series, tc.namespace, tc.groupBy, tc.groupBySlice, tc.metricSelector)
selector, err := tc.mq.BuildExternal(tc.series, tc.namespace, tc.groupBy, tc.groupBySlice, tc.metricSelector, tc.options)
t.Logf("selector: '%v'", selector)
if err := tc.check(selector, err); err != nil {