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

Merge branch 'release-1.0'

Browse source
This commit is contained in:
Fabian Reinartz 2016-07-19 00:51:32 +09:00
parent 0938661db9 e2bb136f4e
commit 42a3cb6172
5 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -1,4 +1,4 @@
## 1.0.0-rc.0 / 2016-07-14 ## 1.0.0 / 2016-07-18
* [CHANGE] Remove deprecated query language keywords * [CHANGE] Remove deprecated query language keywords
* [CHANGE] Change Kubernetes SD to require specifying Kubernetes role * [CHANGE] Change Kubernetes SD to require specifying Kubernetes role

2
VERSION
View file

@ -1 +1 @@
1.0.0-rc.0 1.0.0

4
config/config.go
View file

@ -781,7 +781,7 @@ func (c *MarathonSDConfig) UnmarshalYAML(unmarshal func(interface{}) error) erro
// KubernetesSDConfig is the configuration for Kubernetes service discovery. // KubernetesSDConfig is the configuration for Kubernetes service discovery.
type KubernetesSDConfig struct { type KubernetesSDConfig struct {
APIServers []URL `yaml:"api_servers"` APIServers []URL `yaml:"api_servers"`
Role string `yaml:"role"` Role KubernetesRole `yaml:"role"`
InCluster bool `yaml:"in_cluster,omitempty"` InCluster bool `yaml:"in_cluster,omitempty"`
BasicAuth *BasicAuth `yaml:"basic_auth,omitempty"` BasicAuth *BasicAuth `yaml:"basic_auth,omitempty"`
BearerToken string `yaml:"bearer_token,omitempty"` BearerToken string `yaml:"bearer_token,omitempty"`
@ -813,7 +813,7 @@ func (c *KubernetesRole) UnmarshalYAML(unmarshal func(interface{}) error) error
case KubernetesRoleNode, KubernetesRolePod, KubernetesRoleContainer, KubernetesRoleService, KubernetesRoleEndpoint, KubernetesRoleAPIServer: case KubernetesRoleNode, KubernetesRolePod, KubernetesRoleContainer, KubernetesRoleService, KubernetesRoleEndpoint, KubernetesRoleAPIServer:
return nil return nil
default: default:
return fmt.Errorf("Unknown Kubernetes SD role %q", c) return fmt.Errorf("Unknown Kubernetes SD role %q", *c)
} }
} }

3
config/config_test.go
View file

@ -385,6 +385,9 @@ var expectedErrors = []struct {
}, { }, {
filename: "kubernetes_bearertoken.bad.yml", filename: "kubernetes_bearertoken.bad.yml",
errMsg: "at most one of bearer_token & bearer_token_file must be configured", errMsg: "at most one of bearer_token & bearer_token_file must be configured",
}, {
filename: "kubernetes_role.bad.yml",
errMsg: "role",
}, { }, {
filename: "kubernetes_bearertoken_basicauth.bad.yml", filename: "kubernetes_bearertoken_basicauth.bad.yml",
errMsg: "at most one of basic_auth, bearer_token & bearer_token_file must be configured", errMsg: "at most one of basic_auth, bearer_token & bearer_token_file must be configured",

5
config/testdata/kubernetes_role.bad.yml vendored Normal file
View file

@ -0,0 +1,5 @@
scrape_configs:
- kubernetes_sd_configs:
- api_server: kubernetes:443
role: vacation