kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-05 17:27:51 +00:00
Code Issues Projects Releases Packages Activity Actions

Fixup default config generation to use pod and container instead of pod_name and container_name, those labels have been removed in kubernetes 1.16

Browse source
This commit is contained in:
aackerman 2021-03-23 10:59:40 -05:00
parent dce6abfba9
commit 54cd969594
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cmd/config-gen/utils/default.go
View file

@ -12,50 +12,50 @@ import (
// DefaultConfig returns a configuration equivalent to the former // DefaultConfig returns a configuration equivalent to the former
// pre-advanced-config settings. This means that "normal" series labels // pre-advanced-config settings. This means that "normal" series labels
// will be of the form `<prefix><<.Resource>>`, cadvisor series will be // will be of the form `<prefix><<.Resource>>`, cadvisor series will be
// of the form `container_`, and have the label `pod_name`. Any series ending // of the form `container_`, and have the label `pod`. Any series ending
// in total will be treated as a rate metric. // in total will be treated as a rate metric.
func DefaultConfig(rateInterval time.Duration, labelPrefix string) *MetricsDiscoveryConfig { func DefaultConfig(rateInterval time.Duration, labelPrefix string) *MetricsDiscoveryConfig {
return &MetricsDiscoveryConfig{ return &MetricsDiscoveryConfig{
Rules: []DiscoveryRule{ Rules: []DiscoveryRule{
// container seconds rate metrics // container seconds rate metrics
{ {
SeriesQuery: string(prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container_name", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod_name", ""))), SeriesQuery: string(prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod", ""))),
Resources: ResourceMapping{ Resources: ResourceMapping{
Overrides: map[string]GroupResource{ Overrides: map[string]GroupResource{
"namespace": {Resource: "namespace"}, "namespace": {Resource: "namespace"},
"pod_name": {Resource: "pod"}, "pod": {Resource: "pod"},
}, },
}, },
Name: NameMapping{Matches: "^container_(.*)_seconds_total$"}, Name: NameMapping{Matches: "^container_(.*)_seconds_total$"},
MetricsQuery: fmt.Sprintf(`sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}[%s])) by (<<.GroupBy>>)`, pmodel.Duration(rateInterval).String()), MetricsQuery: fmt.Sprintf(`sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[%s])) by (<<.GroupBy>>)`, pmodel.Duration(rateInterval).String()),
}, },
// container rate metrics // container rate metrics
{ {
SeriesQuery: string(prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container_name", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod_name", ""))), SeriesQuery: string(prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod", ""))),
SeriesFilters: []RegexFilter{{IsNot: "^container_.*_seconds_total$"}}, SeriesFilters: []RegexFilter{{IsNot: "^container_.*_seconds_total$"}},
Resources: ResourceMapping{ Resources: ResourceMapping{
Overrides: map[string]GroupResource{ Overrides: map[string]GroupResource{
"namespace": {Resource: "namespace"}, "namespace": {Resource: "namespace"},
"pod_name": {Resource: "pod"}, "pod": {Resource: "pod"},
}, },
}, },
Name: NameMapping{Matches: "^container_(.*)_total$"}, Name: NameMapping{Matches: "^container_(.*)_total$"},
MetricsQuery: fmt.Sprintf(`sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}[%s])) by (<<.GroupBy>>)`, pmodel.Duration(rateInterval).String()), MetricsQuery: fmt.Sprintf(`sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[%s])) by (<<.GroupBy>>)`, pmodel.Duration(rateInterval).String()),
}, },
// container non-cumulative metrics // container non-cumulative metrics
{ {
SeriesQuery: string(prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container_name", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod_name", ""))), SeriesQuery: string(prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod", ""))),
SeriesFilters: []RegexFilter{{IsNot: "^container_.*_total$"}}, SeriesFilters: []RegexFilter{{IsNot: "^container_.*_total$"}},
Resources: ResourceMapping{ Resources: ResourceMapping{
Overrides: map[string]GroupResource{ Overrides: map[string]GroupResource{
"namespace": {Resource: "namespace"}, "namespace": {Resource: "namespace"},
"pod_name": {Resource: "pod"}, "pod": {Resource: "pod"},
}, },
}, },
Name: NameMapping{Matches: "^container_(.*)$"}, Name: NameMapping{Matches: "^container_(.*)$"},
MetricsQuery: `sum(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}) by (<<.GroupBy>>)`, MetricsQuery: `sum(<<.Series>>{<<.LabelMatchers>>,container!="POD"}) by (<<.GroupBy>>)`,
}, },
// normal non-cumulative metrics // normal non-cumulative metrics
@ -97,11 +97,11 @@ func DefaultConfig(rateInterval time.Duration, labelPrefix string) *MetricsDisco
Resources: ResourceMapping{ Resources: ResourceMapping{
Overrides: map[string]GroupResource{ Overrides: map[string]GroupResource{
"namespace": {Resource: "namespace"}, "namespace": {Resource: "namespace"},
"pod_name": {Resource: "pod"}, "pod": {Resource: "pod"},
"instance": {Resource: "node"}, "instance": {Resource: "node"},
}, },
}, },
ContainerLabel: fmt.Sprintf("%scontainer_name", labelPrefix), ContainerLabel: fmt.Sprintf("%scontainer", labelPrefix),
}, },
Memory: ResourceRule{ Memory: ResourceRule{
ContainerQuery: "sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)", ContainerQuery: "sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)",
@ -109,11 +109,11 @@ func DefaultConfig(rateInterval time.Duration, labelPrefix string) *MetricsDisco
Resources: ResourceMapping{ Resources: ResourceMapping{
Overrides: map[string]GroupResource{ Overrides: map[string]GroupResource{
"namespace": {Resource: "namespace"}, "namespace": {Resource: "namespace"},
"pod_name": {Resource: "pod"}, "pod": {Resource: "pod"},
"instance": {Resource: "node"}, "instance": {Resource: "node"},
}, },
}, },
ContainerLabel: fmt.Sprintf("%scontainer_name", labelPrefix), ContainerLabel: fmt.Sprintf("%scontainer", labelPrefix),
}, },
Window: pmodel.Duration(rateInterval), Window: pmodel.Duration(rateInterval),
}, },