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

config: rename role 'endpoint' to 'endpoints'

Browse source
This commit is contained in:
Fabian Reinartz 2016-10-17 11:50:54 +02:00
parent ce45040e47
commit 1b6dfa32a9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/config.go
View file

@ -799,7 +799,7 @@ const (
KubernetesRoleNode = "node" KubernetesRoleNode = "node"
KubernetesRolePod = "pod" KubernetesRolePod = "pod"
KubernetesRoleService = "service" KubernetesRoleService = "service"
KubernetesRoleEndpoint = "endpoint" KubernetesRoleEndpoint = "endpoints"
) )
func (c *KubernetesRole) UnmarshalYAML(unmarshal func(interface{}) error) error { func (c *KubernetesRole) UnmarshalYAML(unmarshal func(interface{}) error) error {
@ -839,7 +839,7 @@ func (c *KubernetesSDConfig) UnmarshalYAML(unmarshal func(interface{}) error) er
return err return err
} }
if c.Role == "" { if c.Role == "" {
return fmt.Errorf("role missing (one of: pod, service, endpoint, node)") return fmt.Errorf("role missing (one of: pod, service, endpoints, node)")
} }
if len(c.BearerToken) > 0 && len(c.BearerTokenFile) > 0 { if len(c.BearerToken) > 0 && len(c.BearerTokenFile) > 0 {
return fmt.Errorf("at most one of bearer_token & bearer_token_file must be configured") return fmt.Errorf("at most one of bearer_token & bearer_token_file must be configured")

2
config/testdata/conf.good.yml vendored
View file

@ -115,7 +115,7 @@ scrape_configs:
- job_name: service-kubernetes - job_name: service-kubernetes
kubernetes_sd_configs: kubernetes_sd_configs:
- role: endpoint - role: endpoints
api_server: 'https://localhost:1234' api_server: 'https://localhost:1234'
basic_auth: basic_auth: