mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

config: fix Kubernetes config with empty API server (#5256)

Browse source 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
This commit is contained in:
Simon Pasquier 2019-02-22 15:51:47 +01:00 committed by GitHub
parent 362873f72b
commit e72c875e63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/config_test.go
View file

@ -632,6 +632,11 @@ func TestLoadConfigRuleFilesAbsolutePath(t *testing.T) {
testutil.Equals(t, ruleFilesExpectedConf, c) testutil.Equals(t, ruleFilesExpectedConf, c)
} }
func TestKubernetesEmptyAPIServer(t *testing.T) {
_, err := LoadFile("testdata/kubernetes_empty_apiserver.good.yml")
testutil.Ok(t, err)
}
var expectedErrors = []struct { var expectedErrors = []struct {
filename string filename string
errMsg string errMsg string

4
config/testdata/kubernetes_empty_apiserver.good.yml vendored Normal file
View file

@ -0,0 +1,4 @@
scrape_configs:
- job_name: prometheus
kubernetes_sd_configs:
- role: endpoints

1
config/testdata/kubernetes_http_config_without_api_server.bad.yml vendored
View file

@ -1,6 +1,5 @@
scrape_configs: scrape_configs:
- job_name: prometheus - job_name: prometheus
kubernetes_sd_configs: kubernetes_sd_configs:
- role: pod - role: pod
bearer_token: 1234 bearer_token: 1234

2
discovery/kubernetes/kubernetes.go
View file

@ -107,7 +107,7 @@ func (c *SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
if err != nil { if err != nil {
return err return err
} }
if c.APIServer.URL == nil && !reflect.DeepEqual(c.HTTPClientConfig, &config_util.HTTPClientConfig{}) { if c.APIServer.URL == nil && !reflect.DeepEqual(c.HTTPClientConfig, config_util.HTTPClientConfig{}) {
return fmt.Errorf("to use custom HTTP client configuration please provide the 'api_server' URL explicitly") return fmt.Errorf("to use custom HTTP client configuration please provide the 'api_server' URL explicitly")
} }
return nil return nil