mirror of
https://github.com/prometheus/prometheus.git
synced 2025-07-03 11:03:25 +00:00
discovery/kubernetes: expose label_selector and field_selector
Close #6807 Co-authored-by @shuttie Signed-off-by: Aleksandra Gacek <algacek@google.com>
This commit is contained in:
Aleksandra Gacek
Julien Pivotto
parent
b4445ff03f
commit
8e53c19f9c
15 changed files with 168 additions and 86 deletions
|
|
@ -16,6 +16,7 @@ package kubernetes
|
|||
import (
|
||||
"context"
|
||||
"reflect"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
|
|
@ -28,6 +29,7 @@ import (
|
|||
apiv1 "k8s.io/api/core/v1"
|
||||
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/fields"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
"k8s.io/client-go/kubernetes"
|
||||
|
|
@ -91,22 +93,28 @@ type SDConfig struct {
|
|||
Role Role `yaml:"role"`
|
||||
HTTPClientConfig config_util.HTTPClientConfig `yaml:",inline"`
|
||||
NamespaceDiscovery NamespaceDiscovery `yaml:"namespaces,omitempty"`
|
||||
Selectors RoleSelectorConfig `yaml:"selectors,omitempty"`
|
||||
Selectors []SelectorConfig `yaml:"selectors,omitempty"`
|
||||
}
|
||||
|
||||
type RoleSelectorConfig struct {
|
||||
Node ResourceSelectorConfig `yaml:"node,omitempty"`
|
||||
Pod ResourceSelectorConfig `yaml:"pod,omitempty"`
|
||||
Service ResourceSelectorConfig `yaml:"service,omitempty"`
|
||||
Endpoints ResourceSelectorConfig `yaml:"endpoints,omitempty"`
|
||||
Ingress ResourceSelectorConfig `yaml:"ingress,omitempty"`
|
||||
type roleSelector struct {
|
||||
node resourceSelector
|
||||
pod resourceSelector
|
||||
service resourceSelector
|
||||
endpoints resourceSelector
|
||||
ingress resourceSelector
|
||||
}
|
||||
|
||||
type ResourceSelectorConfig struct {
|
||||
type SelectorConfig struct {
|
||||
Role Role `yaml:"role,omitempty"`
|
||||
Label string `yaml:"label,omitempty"`
|
||||
Field string `yaml:"field,omitempty"`
|
||||
}
|
||||
|
||||
type resourceSelector struct {
|
||||
label string
|
||||
field string
|
||||
}
|
||||
|
||||
// UnmarshalYAML implements the yaml.Unmarshaler interface.
|
||||
func (c *SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
||||
*c = SDConfig{}
|
||||
|
|
@ -115,6 +123,9 @@ func (c *SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if c.Role == "" {
|
||||
return errors.Errorf("role missing (one of: pod, service, endpoints, node, ingress)")
|
||||
}
|
||||
err = c.HTTPClientConfig.Validate()
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -122,29 +133,45 @@ func (c *SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
|||
if c.APIServer.URL == nil && !reflect.DeepEqual(c.HTTPClientConfig, config_util.HTTPClientConfig{}) {
|
||||
return errors.Errorf("to use custom HTTP client configuration please provide the 'api_server' URL explicitly")
|
||||
}
|
||||
switch c.Role {
|
||||
case "pod":
|
||||
if len(c.Selectors.Service.Field) > 0 || len(c.Selectors.Endpoints.Field) > 0 || len(c.Selectors.Ingress.Field) > 0 || len(c.Selectors.Node.Field) > 0 {
|
||||
return errors.Errorf("pod role supports only pod selectors")
|
||||
|
||||
foundSelectorRoles := make(map[Role]struct{})
|
||||
allowedSelectors := map[Role][]string{
|
||||
RolePod: {string(RolePod)},
|
||||
RoleService: {string(RoleService)},
|
||||
RoleEndpoint: {string(RolePod), string(RoleService), string(RoleEndpoint)},
|
||||
RoleNode: {string(RoleNode)},
|
||||
RoleIngress: {string(RoleIngress)},
|
||||
}
|
||||
|
||||
for _, selector := range c.Selectors {
|
||||
if _, ok := foundSelectorRoles[selector.Role]; ok {
|
||||
return errors.Errorf("duplicated selector role: %s", selector.Role)
|
||||
}
|
||||
case "service":
|
||||
if len(c.Selectors.Pod.Field) > 0 || len(c.Selectors.Endpoints.Field) > 0 || len(c.Selectors.Ingress.Field) > 0 || len(c.Selectors.Node.Field) > 0 {
|
||||
return errors.Errorf("service role supports only service selectors")
|
||||
foundSelectorRoles[selector.Role] = struct{}{}
|
||||
|
||||
if _, ok := allowedSelectors[c.Role]; !ok {
|
||||
return errors.Errorf("invalid role: %q, expecting one of: pod, service, endpoints, node or ingress", c.Role)
|
||||
}
|
||||
case "endpoints":
|
||||
if len(c.Selectors.Ingress.Field) > 0 || len(c.Selectors.Node.Field) > 0 {
|
||||
return errors.Errorf("endpoints role supports only pod, service and endpoints selectors")
|
||||
var allowed bool
|
||||
for _, role := range allowedSelectors[c.Role] {
|
||||
if role == string(selector.Role) {
|
||||
allowed = true
|
||||
break
|
||||
}
|
||||
}
|
||||
case "node":
|
||||
if len(c.Selectors.Service.Field) > 0 || len(c.Selectors.Endpoints.Field) > 0 || len(c.Selectors.Ingress.Field) > 0 || len(c.Selectors.Pod.Field) > 0 {
|
||||
return errors.Errorf("node role supports only node selectors")
|
||||
|
||||
if !allowed {
|
||||
return errors.Errorf("%s role supports only %s selectors", c.Role, strings.Join(allowedSelectors[c.Role], ", "))
|
||||
}
|
||||
case "ingress":
|
||||
if len(c.Selectors.Service.Field) > 0 || len(c.Selectors.Endpoints.Field) > 0 || len(c.Selectors.Node.Field) > 0 || len(c.Selectors.Pod.Field) > 0 {
|
||||
return errors.Errorf("ingress role supports only ingress selectors")
|
||||
|
||||
_, err := fields.ParseSelector(selector.Field)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = fields.ParseSelector(selector.Label)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
default:
|
||||
return errors.Errorf("role missing (one of: pod, service, endpoints, node, ingress)")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -196,7 +223,7 @@ type Discovery struct {
|
|||
logger log.Logger
|
||||
namespaceDiscovery *NamespaceDiscovery
|
||||
discoverers []discoverer
|
||||
selectors RoleSelectorConfig
|
||||
selectors roleSelector
|
||||
}
|
||||
|
||||
func (d *Discovery) getNamespaces() []string {
|
||||
|
|
@ -247,10 +274,34 @@ func New(l log.Logger, conf *SDConfig) (*Discovery, error) {
|
|||
role: conf.Role,
|
||||
namespaceDiscovery: &conf.NamespaceDiscovery,
|
||||
discoverers: make([]discoverer, 0),
|
||||
selectors: conf.Selectors,
|
||||
selectors: mapSelector(conf.Selectors),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func mapSelector(rawSelector []SelectorConfig) roleSelector {
|
||||
rs := roleSelector{}
|
||||
for _, resourceSelectorRaw := range rawSelector {
|
||||
switch resourceSelectorRaw.Role {
|
||||
case RoleEndpoint:
|
||||
rs.endpoints.field = resourceSelectorRaw.Field
|
||||
rs.endpoints.label = resourceSelectorRaw.Label
|
||||
case RoleIngress:
|
||||
rs.ingress.field = resourceSelectorRaw.Field
|
||||
rs.ingress.label = resourceSelectorRaw.Label
|
||||
case RoleNode:
|
||||
rs.node.field = resourceSelectorRaw.Field
|
||||
rs.node.label = resourceSelectorRaw.Label
|
||||
case RolePod:
|
||||
rs.pod.field = resourceSelectorRaw.Field
|
||||
rs.pod.label = resourceSelectorRaw.Label
|
||||
case RoleService:
|
||||
rs.service.field = resourceSelectorRaw.Field
|
||||
rs.service.label = resourceSelectorRaw.Label
|
||||
}
|
||||
}
|
||||
return rs
|
||||
}
|
||||
|
||||
const resyncPeriod = 10 * time.Minute
|
||||
|
||||
// Run implements the discoverer interface.
|
||||
|
|
@ -264,39 +315,39 @@ func (d *Discovery) Run(ctx context.Context, ch chan<- []*targetgroup.Group) {
|
|||
e := d.client.CoreV1().Endpoints(namespace)
|
||||
elw := &cache.ListWatch{
|
||||
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
|
||||
options.FieldSelector = d.selectors.Endpoints.Field
|
||||
options.LabelSelector = d.selectors.Endpoints.Label
|
||||
options.FieldSelector = d.selectors.endpoints.field
|
||||
options.LabelSelector = d.selectors.endpoints.label
|
||||
return e.List(options)
|
||||
},
|
||||
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
|
||||
options.FieldSelector = d.selectors.Endpoints.Field
|
||||
options.LabelSelector = d.selectors.Endpoints.Label
|
||||
options.FieldSelector = d.selectors.endpoints.field
|
||||
options.LabelSelector = d.selectors.endpoints.label
|
||||
return e.Watch(options)
|
||||
},
|
||||
}
|
||||
s := d.client.CoreV1().Services(namespace)
|
||||
slw := &cache.ListWatch{
|
||||
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
|
||||
options.FieldSelector = d.selectors.Service.Field
|
||||
options.LabelSelector = d.selectors.Service.Label
|
||||
options.FieldSelector = d.selectors.service.field
|
||||
options.LabelSelector = d.selectors.service.label
|
||||
return s.List(options)
|
||||
},
|
||||
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
|
||||
options.FieldSelector = d.selectors.Service.Field
|
||||
options.LabelSelector = d.selectors.Service.Label
|
||||
options.FieldSelector = d.selectors.service.field
|
||||
options.LabelSelector = d.selectors.service.label
|
||||
return s.Watch(options)
|
||||
},
|
||||
}
|
||||
p := d.client.CoreV1().Pods(namespace)
|
||||
plw := &cache.ListWatch{
|
||||
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
|
||||
options.FieldSelector = d.selectors.Pod.Field
|
||||
options.LabelSelector = d.selectors.Pod.Label
|
||||
options.FieldSelector = d.selectors.pod.field
|
||||
options.LabelSelector = d.selectors.pod.label
|
||||
return p.List(options)
|
||||
},
|
||||
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
|
||||
options.FieldSelector = d.selectors.Pod.Field
|
||||
options.LabelSelector = d.selectors.Pod.Label
|
||||
options.FieldSelector = d.selectors.pod.field
|
||||
options.LabelSelector = d.selectors.pod.label
|
||||
return p.Watch(options)
|
||||
},
|
||||
}
|
||||
|
|
@ -316,13 +367,13 @@ func (d *Discovery) Run(ctx context.Context, ch chan<- []*targetgroup.Group) {
|
|||
p := d.client.CoreV1().Pods(namespace)
|
||||
plw := &cache.ListWatch{
|
||||
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
|
||||
options.FieldSelector = d.selectors.Pod.Field
|
||||
options.LabelSelector = d.selectors.Pod.Label
|
||||
options.FieldSelector = d.selectors.pod.field
|
||||
options.LabelSelector = d.selectors.pod.label
|
||||
return p.List(options)
|
||||
},
|
||||
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
|
||||
options.FieldSelector = d.selectors.Pod.Field
|
||||
options.LabelSelector = d.selectors.Pod.Label
|
||||
options.FieldSelector = d.selectors.pod.field
|
||||
options.LabelSelector = d.selectors.pod.label
|
||||
return p.Watch(options)
|
||||
},
|
||||
}
|
||||
|
|
@ -338,13 +389,13 @@ func (d *Discovery) Run(ctx context.Context, ch chan<- []*targetgroup.Group) {
|
|||
s := d.client.CoreV1().Services(namespace)
|
||||
slw := &cache.ListWatch{
|
||||
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
|
||||
options.FieldSelector = d.selectors.Service.Field
|
||||
options.LabelSelector = d.selectors.Service.Label
|
||||
options.FieldSelector = d.selectors.service.field
|
||||
options.LabelSelector = d.selectors.service.label
|
||||
return s.List(options)
|
||||
},
|
||||
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
|
||||
options.FieldSelector = d.selectors.Service.Field
|
||||
options.LabelSelector = d.selectors.Service.Label
|
||||
options.FieldSelector = d.selectors.service.field
|
||||
options.LabelSelector = d.selectors.service.label
|
||||
return s.Watch(options)
|
||||
},
|
||||
}
|
||||
|
|
@ -360,13 +411,13 @@ func (d *Discovery) Run(ctx context.Context, ch chan<- []*targetgroup.Group) {
|
|||
i := d.client.ExtensionsV1beta1().Ingresses(namespace)
|
||||
ilw := &cache.ListWatch{
|
||||
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
|
||||
options.FieldSelector = d.selectors.Ingress.Field
|
||||
options.LabelSelector = d.selectors.Ingress.Label
|
||||
options.FieldSelector = d.selectors.ingress.field
|
||||
options.LabelSelector = d.selectors.ingress.label
|
||||
return i.List(options)
|
||||
},
|
||||
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
|
||||
options.FieldSelector = d.selectors.Ingress.Field
|
||||
options.LabelSelector = d.selectors.Ingress.Label
|
||||
options.FieldSelector = d.selectors.ingress.field
|
||||
options.LabelSelector = d.selectors.ingress.label
|
||||
return i.Watch(options)
|
||||
},
|
||||
}
|
||||
|
|
@ -380,13 +431,13 @@ func (d *Discovery) Run(ctx context.Context, ch chan<- []*targetgroup.Group) {
|
|||
case RoleNode:
|
||||
nlw := &cache.ListWatch{
|
||||
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
|
||||
options.FieldSelector = d.selectors.Node.Field
|
||||
options.LabelSelector = d.selectors.Node.Label
|
||||
options.FieldSelector = d.selectors.node.field
|
||||
options.LabelSelector = d.selectors.node.label
|
||||
return d.client.CoreV1().Nodes().List(options)
|
||||
},
|
||||
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
|
||||
options.FieldSelector = d.selectors.Node.Field
|
||||
options.LabelSelector = d.selectors.Node.Label
|
||||
options.FieldSelector = d.selectors.node.field
|
||||
options.LabelSelector = d.selectors.node.label
|
||||
return d.client.CoreV1().Nodes().Watch(options)
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue