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

Fixing some silly errors.

Browse source 
Always verify your builds before you push, kids. 👎
This commit is contained in:
Tony Compton 2018-06-29 12:11:30 -04:00
parent ce6f83da6b
commit 277734dcdb
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/custom-provider/external_metric_query_builder.go
View file

@ -40,7 +40,7 @@ func (p *externalMetricQueryBuilder) BuildPrometheusQuery(namespace string, metr
//I'm guessing that SeriesRegistry might store the metric type, but I haven't looked yet. //I'm guessing that SeriesRegistry might store the metric type, but I haven't looked yet.
aggregation := queryMetadata.Aggregation aggregation := queryMetadata.Aggregation
window := queryMetadata.WindowInSeconds window := queryMetadata.WindowInSeconds
return fmt.Sprintf("%s(%s{%s}[%ss])", aggregation, metricName, joinedLabels, window) return fmt.Sprintf("%s(%s{%s}[%ds])", aggregation, metricName, joinedLabels, window)
} }
func (p *externalMetricQueryBuilder) makeLabelFilter(labelName string, operator string, targetValue string) string { func (p *externalMetricQueryBuilder) makeLabelFilter(labelName string, operator string, targetValue string) string {

13
pkg/custom-provider/external_metric_query_builder_test.go
View file

@ -3,6 +3,7 @@ package provider
import ( import (
"testing" "testing"
conv "github.com/directxman12/k8s-prometheus-adapter/pkg/custom-provider/metric-converter"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/selection"
) )
@ -11,12 +12,18 @@ var queryBuilder = NewExternalMetricQueryBuilder()
func TestBuildPrometheusQuery(t *testing.T) { func TestBuildPrometheusQuery(t *testing.T) {
fakeSelector := labels.NewSelector() fakeSelector := labels.NewSelector()
requirement, _ := labels.NewRequirement("queue_name", selection.Equals, []string{"processing"}) metricName := "queue_name"
requirement, _ := labels.NewRequirement(metricName, selection.Equals, []string{"processing"})
fakeSelector = fakeSelector.Add(*requirement) fakeSelector = fakeSelector.Add(*requirement)
meta := conv.QueryMetadata{
Aggregation: "rate",
MetricName: metricName,
WindowInSeconds: 120,
}
result := queryBuilder.BuildPrometheusQuery("default", "queue_length", fakeSelector) result := queryBuilder.BuildPrometheusQuery("default", "queue_length", fakeSelector, meta)
expectedResult := "queue_length{namespace=\"default\", queue_name=\"processing\"}" expectedResult := "rate(queue_length{queue_name=\"processing\"}[120s])"
if result != expectedResult { if result != expectedResult {
t.Errorf("Incorrect query generated. Expected: %s | Actual %s", result, expectedResult) t.Errorf("Incorrect query generated. Expected: %s | Actual %s", result, expectedResult)
} }