From 6aec8bf5d1551e8d12dad70b09ed2ee71e50b6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sat, 6 Jan 2018 17:35:02 -0800 Subject: [PATCH] Cleanup path setup a bit --- proxy.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/proxy.go b/proxy.go index e563e8cb4..e11f83d3d 100644 --- a/proxy.go +++ b/proxy.go @@ -17,6 +17,10 @@ func proxyPathPrefix(name string) string { return fmt.Sprintf("%sproxy/alertmanager/%s", config.Config.Listen.Prefix, name) } +func proxyPath(name, path string) string { + return fmt.Sprintf("%s%s", proxyPathPrefix(name), path) +} + // NewAlertmanagerProxy creates a proxy instance for given alertmanager instance func NewAlertmanagerProxy(alertmanager *alertmanager.Alertmanager) (*httputil.ReverseProxy, error) { upstreamURL, err := url.Parse(alertmanager.URI) @@ -49,10 +53,10 @@ func setupRouterProxyHandlers(router *gin.Engine, alertmanager *alertmanager.Ale return err } router.POST( - fmt.Sprintf("%s/api/v1/silences", proxyPathPrefix(alertmanager.Name)), + proxyPath(alertmanager.Name, "/api/v1/silences"), gin.WrapH(http.StripPrefix(proxyPathPrefix(alertmanager.Name), proxy))) router.DELETE( - fmt.Sprintf("%s/api/v1/silence/*id", proxyPathPrefix(alertmanager.Name)), + proxyPath(alertmanager.Name, "/api/v1/silence/*id"), gin.WrapH(http.StripPrefix(proxyPathPrefix(alertmanager.Name), proxy))) return nil }