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

Amend for PR:[#179], relevant issue:[#178]

Browse source 
Fix namespaced bug of node resource && pv resource
By doing this fix, the CI can pass
This commit is contained in:
song.chen 2019-03-22 10:13:33 +08:00
parent 27c3bc1b88
commit 918954bd5e
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pkg/custom-provider/metric_namer.go
View file

@ -13,9 +13,12 @@ import (
"github.com/directxman12/k8s-prometheus-adapter/pkg/naming" "github.com/directxman12/k8s-prometheus-adapter/pkg/naming"
) )
var nsGroupResource = schema.GroupResource{Resource: "namespaces"} var (
var nodeGroupResource = schema.GroupResource{Resource: "nodes"} nsGroupResource = schema.GroupResource{Resource: "namespaces"}
var groupNameSanitizer = strings.NewReplacer(".", "_", "-", "_") nodeGroupResource = schema.GroupResource{Resource: "nodes"}
pvGroupResource = schema.GroupResource{Resource: "persistentvolumes"}
groupNameSanitizer = strings.NewReplacer(".", "_", "-", "_")
)
// MetricNamer knows how to convert Prometheus series names and label names to // MetricNamer knows how to convert Prometheus series names and label names to
// metrics API resources, and vice-versa. MetricNamers should be safe to access // metrics API resources, and vice-versa. MetricNamers should be safe to access

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

@ -99,7 +99,7 @@ func (r *basicSeriesRegistry) SetSeries(newSeriesSlices [][]prom.Series, namers
} }
// namespace metrics aren't counted as namespaced // namespace metrics aren't counted as namespaced
if resource == nsGroupResource || resource == nodeGroupResource { if resource == nsGroupResource || resource == nodeGroupResource || resource == pvGroupResource {
info.Namespaced = false info.Namespaced = false
} }

4
pkg/naming/resource_converter.go
View file

@ -20,6 +20,8 @@ import (
var ( var (
groupNameSanitizer = strings.NewReplacer(".", "_", "-", "_") groupNameSanitizer = strings.NewReplacer(".", "_", "-", "_")
nsGroupResource = schema.GroupResource{Resource: "namespaces"} nsGroupResource = schema.GroupResource{Resource: "namespaces"}
nodeGroupResource = schema.GroupResource{Resource: "nodes"}
pvGroupResource = schema.GroupResource{Resource: "persistentvolumes"}
) )
// ResourceConverter knows the relationship between Kubernetes group-resources and Prometheus labels, // ResourceConverter knows the relationship between Kubernetes group-resources and Prometheus labels,
@ -177,7 +179,7 @@ func (r *resourceConverter) ResourcesForSeries(series prom.Series) ([]schema.Gro
} }
} }
if groupRes != nsGroupResource { if groupRes != nsGroupResource && groupRes != nodeGroupResource && groupRes != pvGroupResource {
namespaced = true namespaced = true
} }
} }