mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 05:34:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

discovery/kubernetes: fix selectors validation for role pod

Browse source 
Signed-off-by: Haley Wang <haley@victoriametrics.com>
This commit is contained in:
Haley Wang 2024-01-18 20:47:59 +08:00
parent 0524b880e7
commit 086fcef42b
No known key found for this signature in database
GPG key ID: C6299A8A1D6CC50C
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/testdata/kubernetes_selectors_pod.good.yml vendored
View file

@ -7,7 +7,9 @@ scrape_configs:
label: "foo=bar" label: "foo=bar"
field: "metadata.status=Running" field: "metadata.status=Running"
- role: pod - role: pod
attach_metadata:
node: true
selectors: selectors:
- role: "pod" - role: "node"
label: "foo in (bar,baz)" label: "foo=bar"
field: "metadata.status=Running" field: "metadata.status=Running"

4
discovery/kubernetes/kubernetes.go
View file

@ -222,6 +222,10 @@ func (c *SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
break break
} }
} }
// The pod role supports node selectors when configured with `attach_metadata: {node: true}`.
if !allowed && selector.Role == RoleNode && c.Role == RolePod && c.AttachMetadata.Node {
allowed = true
}
if !allowed { if !allowed {
return fmt.Errorf("%s role supports only %s selectors", c.Role, strings.Join(allowedSelectors[c.Role], ", ")) return fmt.Errorf("%s role supports only %s selectors", c.Role, strings.Join(allowedSelectors[c.Role], ", "))