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

Merge pull request #196 from s-urbaniak/external-metric-name

Browse source 
pkg/external-provider: set metric name for scalar values
This commit is contained in:
Sergiusz Urbaniak 2019-05-17 14:40:42 +02:00 • committed by GitHub
commit 4b695d4e06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pkg/external-provider/metric_converter.go
View file

@ -18,6 +18,7 @@ import (
"fmt" "fmt"
prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client"
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -27,7 +28,7 @@ import (
// MetricConverter provides a unified interface for converting the results of // MetricConverter provides a unified interface for converting the results of
// Prometheus queries into external metric types. // Prometheus queries into external metric types.
type MetricConverter interface { type MetricConverter interface {
Convert(queryResult prom.QueryResult) (*external_metrics.ExternalMetricValueList, error) Convert(info provider.ExternalMetricInfo, queryResult prom.QueryResult) (*external_metrics.ExternalMetricValueList, error)
} }
type metricConverter struct { type metricConverter struct {
@ -39,23 +40,23 @@ func NewMetricConverter() MetricConverter {
return &metricConverter{} return &metricConverter{}
} }
func (c *metricConverter) Convert(queryResult prom.QueryResult) (*external_metrics.ExternalMetricValueList, error) { func (c *metricConverter) Convert(info provider.ExternalMetricInfo, queryResult prom.QueryResult) (*external_metrics.ExternalMetricValueList, error) {
if queryResult.Type == model.ValScalar { if queryResult.Type == model.ValScalar {
return c.convertScalar(queryResult) return c.convertScalar(info, queryResult)
} }
if queryResult.Type == model.ValVector { if queryResult.Type == model.ValVector {
return c.convertVector(queryResult) return c.convertVector(info, queryResult)
} }
return nil, errors.New("encountered an unexpected query result type") return nil, errors.New("encountered an unexpected query result type")
} }
func (c *metricConverter) convertSample(sample *model.Sample) (*external_metrics.ExternalMetricValue, error) { func (c *metricConverter) convertSample(info provider.ExternalMetricInfo, sample *model.Sample) (*external_metrics.ExternalMetricValue, error) {
labels := c.convertLabels(sample.Metric) labels := c.convertLabels(sample.Metric)
singleMetric := external_metrics.ExternalMetricValue{ singleMetric := external_metrics.ExternalMetricValue{
MetricName: string(sample.Metric[model.LabelName("__name__")]), MetricName: info.Metric,
Timestamp: metav1.Time{ Timestamp: metav1.Time{
sample.Timestamp.Time(), sample.Timestamp.Time(),
}, },
@ -76,7 +77,7 @@ func (c *metricConverter) convertLabels(inLabels model.Metric) map[string]string
return outLabels return outLabels
} }
func (c *metricConverter) convertVector(queryResult prom.QueryResult) (*external_metrics.ExternalMetricValueList, error) { func (c *metricConverter) convertVector(info provider.ExternalMetricInfo, queryResult prom.QueryResult) (*external_metrics.ExternalMetricValueList, error) {
if queryResult.Type != model.ValVector { if queryResult.Type != model.ValVector {
return nil, errors.New("incorrect query result type") return nil, errors.New("incorrect query result type")
} }
@ -98,7 +99,7 @@ func (c *metricConverter) convertVector(queryResult prom.QueryResult) (*external
} }
for _, val := range toConvert { for _, val := range toConvert {
singleMetric, err := c.convertSample(val) singleMetric, err := c.convertSample(info, val)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to convert vector: %v", err) return nil, fmt.Errorf("unable to convert vector: %v", err)
@ -113,7 +114,7 @@ func (c *metricConverter) convertVector(queryResult prom.QueryResult) (*external
return &metricValueList, nil return &metricValueList, nil
} }
func (c *metricConverter) convertScalar(queryResult prom.QueryResult) (*external_metrics.ExternalMetricValueList, error) { func (c *metricConverter) convertScalar(info provider.ExternalMetricInfo, queryResult prom.QueryResult) (*external_metrics.ExternalMetricValueList, error) {
if queryResult.Type != model.ValScalar { if queryResult.Type != model.ValScalar {
return nil, errors.New("scalarConverter can only convert scalar query results") return nil, errors.New("scalarConverter can only convert scalar query results")
} }
@ -127,6 +128,7 @@ func (c *metricConverter) convertScalar(queryResult prom.QueryResult) (*external
result := external_metrics.ExternalMetricValueList{ result := external_metrics.ExternalMetricValueList{
Items: []external_metrics.ExternalMetricValue{ Items: []external_metrics.ExternalMetricValue{
{ {
MetricName: info.Metric,
Timestamp: metav1.Time{ Timestamp: metav1.Time{
toConvert.Timestamp.Time(), toConvert.Timestamp.Time(),
}, },

2
pkg/external-provider/provider.go
View file

@ -59,7 +59,7 @@ func (p *externalPrometheusProvider) GetExternalMetric(namespace string, metricS
// don't leak implementation details to the user // don't leak implementation details to the user
return nil, apierr.NewInternalError(fmt.Errorf("unable to fetch metrics")) return nil, apierr.NewInternalError(fmt.Errorf("unable to fetch metrics"))
} }
return p.metricConverter.Convert(queryResults) return p.metricConverter.Convert(info, queryResults)
} }
func (p *externalPrometheusProvider) ListAllExternalMetrics() []provider.ExternalMetricInfo { func (p *externalPrometheusProvider) ListAllExternalMetrics() []provider.ExternalMetricInfo {

7
pkg/naming/metrics_query_test.go
View file

@ -341,17 +341,16 @@ func TestBuildExternalSelector(t *testing.T) {
), ),
}, },
{ {
name: "multiple LabelValuesByName", name: "single LabelValuesByName with multiple selectors",
mq: mustNewQuery(`<<.LabelValuesByName>>`, false), mq: mustNewQuery(`<<.LabelValuesByName>>`, false),
metricSelector: labels.NewSelector().Add( metricSelector: labels.NewSelector().Add(
*mustNewLabelRequirement("foo", selection.Equals, []string{"bar"}), *mustNewLabelRequirement("foo", selection.In, []string{"bar", "baz"}),
*mustNewLabelRequirement("qux", selection.In, []string{"bar", "baz"}),
), ),
check: checks( check: checks(
hasError(nil), hasError(nil),
hasSelector("map[foo:bar qux:bar|baz]"), hasSelector("map[foo:bar|baz]"),
), ),
}, },
} }