Fix namespaced bug of node resource, node resource should be a
non-namespaced resource as the resource namespace.

By doing this fix, node resouce can be accessed as expected, as the issue explains.

Closes issue:[#178](https://github.com/DirectXMan12/k8s-prometheus-adapter/issues/178)
This commit is contained in:
song.chen 2019-03-21 19:56:03 +08:00
parent ab6ada9081
commit 27c3bc1b88
3 changed files with 3 additions and 2 deletions

View file

@ -14,6 +14,7 @@ import (
) )
var nsGroupResource = schema.GroupResource{Resource: "namespaces"} var nsGroupResource = schema.GroupResource{Resource: "namespaces"}
var nodeGroupResource = schema.GroupResource{Resource: "nodes"}
var groupNameSanitizer = strings.NewReplacer(".", "_", "-", "_") var 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

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 { if resource == nsGroupResource || resource == nodeGroupResource {
info.Namespaced = false info.Namespaced = false
} }

View file

@ -177,7 +177,7 @@ func (r *resourceConverter) ResourcesForSeries(series prom.Series) ([]schema.Gro
} }
} }
if groupRes == nsGroupResource { if groupRes != nsGroupResource {
namespaced = true namespaced = true
} }
} }