diff --git a/pkg/custom-provider/series_registry.go b/pkg/custom-provider/series_registry.go index d4a021ff..8d1bb897 100644 --- a/pkg/custom-provider/series_registry.go +++ b/pkg/custom-provider/series_registry.go @@ -99,8 +99,8 @@ func (r *basicSeriesRegistry) SetSeries(newSeriesSlices [][]prom.Series, namers Metric: name, } - // namespace metrics aren't counted as namespaced - if resource == naming.NsGroupResource { + // some metrics aren't counted as namespaced + if resource == naming.NsGroupResource || resource == naming.NodeGroupResource || resource == naming.PVGroupResource { info.Namespaced = false } diff --git a/pkg/naming/resource_converter.go b/pkg/naming/resource_converter.go index 4e536cfe..50d60333 100644 --- a/pkg/naming/resource_converter.go +++ b/pkg/naming/resource_converter.go @@ -36,6 +36,8 @@ import ( var ( GroupNameSanitizer = strings.NewReplacer(".", "_", "-", "_") 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, @@ -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 } }