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

doc(nomad): adjust sections about nomad_sd_config's server

Browse source 
test(nomad): extend TestConfiguredService with more valid/invalid servers configs

fixes https://github.com/prometheus/prometheus/issues/12306

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
This commit is contained in:
machine424 2024-12-03 19:41:45 +01:00
parent 7f26371af8
commit c9f3d9b47f
No known key found for this signature in database
GPG key ID: A4B001A4FDEE017D
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
discovery/nomad/nomad_test.go
View file

@ -127,19 +127,37 @@ func (m *SDMock) HandleServiceHashiCupsGet() {
} }
func TestConfiguredService(t *testing.T) { func TestConfiguredService(t *testing.T) {
conf := &SDConfig{ testCases := []struct {
Server: "http://localhost:4646", name string
server string
acceptedURL bool
}{
{"invalid hostname URL", "http://foo.bar:4646", true},
{"invalid even though accepted by parsing", "foo.bar:4646", true},
{"valid address URL", "http://172.30.29.23:4646", true},
{"invalid URL", "172.30.29.23:4646", false},
} }
reg := prometheus.NewRegistry() for _, tc := range testCases {
refreshMetrics := discovery.NewRefreshMetrics(reg) t.Run(tc.name, func(t *testing.T) {
metrics := conf.NewDiscovererMetrics(reg, refreshMetrics) conf := &SDConfig{
require.NoError(t, metrics.Register()) Server: tc.server,
}
_, err := NewDiscovery(conf, nil, metrics) reg := prometheus.NewRegistry()
require.NoError(t, err) refreshMetrics := discovery.NewRefreshMetrics(reg)
metrics := conf.NewDiscovererMetrics(reg, refreshMetrics)
require.NoError(t, metrics.Register())
defer metrics.Unregister()
metrics.Unregister() _, err := NewDiscovery(conf, nil, metrics)
if tc.acceptedURL {
require.NoError(t, err)
} else {
require.Error(t, err)
}
})
}
} }
func TestNomadSDRefresh(t *testing.T) { func TestNomadSDRefresh(t *testing.T) {

3
docs/configuration/configuration.md
View file

@ -2130,7 +2130,8 @@ The following meta labels are available on targets during [relabeling](#relabel_
[ namespace: <string> | default = default ] [ namespace: <string> | default = default ]
[ refresh_interval: <duration> | default = 60s ] [ refresh_interval: <duration> | default = 60s ]
[ region: <string> | default = global ] [ region: <string> | default = global ]
[ server: <host> ] # The URL to connect to the API.
[ server: <string> ]
[ tag_separator: <string> | default = ,] [ tag_separator: <string> | default = ,]
# HTTP client settings, including authentication methods (such as basic auth and # HTTP client settings, including authentication methods (such as basic auth and