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 4 Packages Projects Releases Wiki Activity

Set timeout for marathon_sd

Browse source
This commit is contained in:
bekbulatov 2016-10-24 11:27:08 +01:00
parent c689b35858
commit 2bc12fa2fb
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/config.go
View file

@ -124,6 +124,7 @@ var (
// DefaultMarathonSDConfig is the default Marathon SD configuration. // DefaultMarathonSDConfig is the default Marathon SD configuration.
DefaultMarathonSDConfig = MarathonSDConfig{ DefaultMarathonSDConfig = MarathonSDConfig{
Timeout: model.Duration(30 * time.Second),
RefreshInterval: model.Duration(30 * time.Second), RefreshInterval: model.Duration(30 * time.Second),
} }
@ -776,6 +777,7 @@ func (c *NerveSDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
// MarathonSDConfig is the configuration for services running on Marathon. // MarathonSDConfig is the configuration for services running on Marathon.
type MarathonSDConfig struct { type MarathonSDConfig struct {
Servers []string `yaml:"servers,omitempty"` Servers []string `yaml:"servers,omitempty"`
Timeout model.Duration `yaml:"timeout,omitempty"`
RefreshInterval model.Duration `yaml:"refresh_interval,omitempty"` RefreshInterval model.Duration `yaml:"refresh_interval,omitempty"`
TLSConfig TLSConfig `yaml:"tls_config,omitempty"` TLSConfig TLSConfig `yaml:"tls_config,omitempty"`

1
config/config_test.go
View file

@ -269,6 +269,7 @@ var expectedConf = &Config{
Servers: []string{ Servers: []string{
"https://marathon.example.com:443", "https://marathon.example.com:443",
}, },
Timeout: model.Duration(30 * time.Second),
RefreshInterval: model.Duration(30 * time.Second), RefreshInterval: model.Duration(30 * time.Second),
TLSConfig: TLSConfig{ TLSConfig: TLSConfig{
CertFile: "testdata/valid_cert_file", CertFile: "testdata/valid_cert_file",

1
retrieval/discovery/marathon/marathon.go
View file

@ -87,6 +87,7 @@ func NewDiscovery(conf *config.MarathonSDConfig) (*Discovery, error) {
} }
client := &http.Client{ client := &http.Client{
Timeout: time.Duration(conf.Timeout),
Transport: &http.Transport{ Transport: &http.Transport{
TLSClientConfig: tls, TLSClientConfig: tls,
}, },