RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uyuni: Use default HTTP client and set relative paths (#10814) 

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
This commit is contained in:
Julien Pivotto 2022-06-08 11:29:44 +02:00 committed by GitHub
parent eef02a0334
commit e4a09f2b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/config_test.go
View File

@ -989,12 +989,13 @@ var expectedConf = &Config{
Scheme: DefaultScrapeConfig.Scheme, Scheme: DefaultScrapeConfig.Scheme,
ServiceDiscoveryConfigs: discovery.Configs{ ServiceDiscoveryConfigs: discovery.Configs{
&uyuni.SDConfig{ &uyuni.SDConfig{
Server: "https://localhost:1234", Server: "https://localhost:1234",
Username: "gopher", Username: "gopher",
Password: "hole", Password: "hole",
Entitlement: "monitoring_entitled", Entitlement: "monitoring_entitled",
Separator: ",", Separator: ",",
RefreshInterval: model.Duration(60 * time.Second), RefreshInterval: model.Duration(60 * time.Second),
HTTPClientConfig: config.DefaultHTTPClientConfig,
}, },
}, },
}, },

12
discovery/uyuni/uyuni.go
View File

@ -52,9 +52,10 @@ const (
// DefaultSDConfig is the default Uyuni SD configuration. // DefaultSDConfig is the default Uyuni SD configuration.
var DefaultSDConfig = SDConfig{ var DefaultSDConfig = SDConfig{
Entitlement: "monitoring_entitled", Entitlement: "monitoring_entitled",
Separator: ",", Separator: ",",
RefreshInterval: model.Duration(1 * time.Minute), RefreshInterval: model.Duration(1 * time.Minute),
HTTPClientConfig: config.DefaultHTTPClientConfig,
} }
func init() { func init() {
@ -117,6 +118,11 @@ func (c *SDConfig) NewDiscoverer(opts discovery.DiscovererOptions) (discovery.Di
return NewDiscovery(c, opts.Logger) return NewDiscovery(c, opts.Logger)
} }
// SetDirectory joins any relative file paths with dir.
func (c *SDConfig) SetDirectory(dir string) {
c.HTTPClientConfig.SetDirectory(dir)
}
// UnmarshalYAML implements the yaml.Unmarshaler interface. // UnmarshalYAML implements the yaml.Unmarshaler interface.
func (c *SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error { func (c *SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
*c = DefaultSDConfig *c = DefaultSDConfig