github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-02-09 15:27:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vmalert] improve external url handling

Browse source
This commit is contained in:
kreedom 2020-04-01 22:29:11 +03:00
parent 12fe915b48
commit 298eb0a0f8
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/vmalert/main.go
View file

@ -44,8 +44,7 @@ func main() {
logger.Init()
checkFlags()
ctx, cancel := context.WithCancel(context.Background())
// todo handle secure connection
eu, err := getExternalURL(*externalURL, *httpListenAddr, false)
eu, err := getExternalURL(*externalURL, *httpListenAddr, httpserver.IsTLS())
if err != nil {
logger.Fatalf("can not get external url:%s ", err)
}
@ -60,7 +59,7 @@ func main() {
w := &watchdog{
storage: datasource.NewVMStorage(*datasourceURL, *basicAuthUsername, *basicAuthPassword, &http.Client{}),
alertProvider: provider.NewAlertManager(*providerURL, func(group, name string) string {
return fmt.Sprintf("%s://%s/%s/%s/status", eu.Scheme, eu.Host, group, name)
return strings.Replace(fmt.Sprintf("%s/%s/%s/status", eu, group, name), "//", "/", -1)
}, &http.Client{}),
}
for id := range alertGroups {

5
lib/httpserver/httpserver.go
View file

@ -452,3 +452,8 @@ func isTrivialNetworkError(err error) bool {
}
return false
}
// IsTLS indicates is tls enabled or not
func IsTLS() bool {
return *tlsEnable
}