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

Moving metric naming to it's own package

Browse source
This commit is contained in:
John Delivuk 2019-02-10 15:58:55 -05:00
parent c2e176bb23
commit 6030912cc0
No known key found for this signature in database
GPG key ID: 8597474A0655625E
12 changed files with 93 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkg/external-provider/series_converter.go
View file

@ -49,7 +49,7 @@ type seriesConverter struct {
resourceConverter naming.ResourceConverter
queryBuilder QueryBuilder
seriesFilterer SeriesFilterer
metricNamer MetricNamer
metricNamer naming.MetricNamer
mapper apimeta.RESTMapper
}
@ -122,7 +122,7 @@ func (c *seriesConverter) buildNamespaceQueryPartForSeries(namespace string) (qu
// If we've been given a namespace, then we need to set up
// the label requirements to target that namespace.
if namespace != "default" {
namespaceLbl, err := c.resourceConverter.LabelForResource(nsGroupResource)
namespaceLbl, err := c.resourceConverter.LabelForResource(naming.NsGroupResource)
if err != nil {
return result, err
}
@ -226,7 +226,7 @@ func converterFromRule(rule config.DiscoveryRule, mapper apimeta.RESTMapper) (Se
}
}
metricNamer, err := NewMetricNamer(rule.Name)
metricNamer, err := naming.NewMetricNamer(rule.Name)
if err != nil {
return nil, fmt.Errorf("unable to create a MetricNamer associated with series query %q: %v", rule.SeriesQuery, err)
}
@ -242,7 +242,7 @@ func converterFromRule(rule config.DiscoveryRule, mapper apimeta.RESTMapper) (Se
}
func (c *seriesConverter) buildNamespaceQueryPartForExternalSeries(namespace string) (queryPart, error) {
namespaceLbl, _ := c.metricNamer.LabelForResource(nsGroupResource)
namespaceLbl, _ := c.metricNamer.LabelForResource(naming.NsGroupResource)
return queryPart{
labelName: string(namespaceLbl),