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

pkg/naming: add non-namespace resources

Browse source 
This is a merge commit back-porting PR #179
This commit is contained in:
Sergiusz Urbaniak 2019-03-28 13:26:58 +01:00 • committed by John Delivuk
parent e103a8eed2
commit d447eb1ec2
No known key found for this signature in database
GPG key ID: 8597474A0655625E
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -99,8 +99,8 @@ func (r *basicSeriesRegistry) SetSeries(newSeriesSlices [][]prom.Series, namers
Metric: name, Metric: name,
} }
// namespace metrics aren't counted as namespaced // some metrics aren't counted as namespaced
if resource == naming.NsGroupResource { if resource == naming.NsGroupResource || resource == naming.NodeGroupResource || resource == naming.PVGroupResource {
info.Namespaced = false info.Namespaced = false
} }

4
pkg/naming/resource_converter.go
View file

@ -36,6 +36,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,
@ -193,7 +195,7 @@ func (r *resourceConverter) ResourcesForSeries(series prom.Series) ([]schema.Gro
} }
} }
if groupRes == NsGroupResource { if groupRes != NsGroupResource && groupRes != NodeGroupResource && groupRes != PVGroupResource {
namespaced = true namespaced = true
} }
} }