Add support for proxying user connection to Alertmanager

internal/alertmanager/dedup_test.go

@@ -16,7 +16,8 @@ import (
 func init() {
 	log.SetLevel(log.ErrorLevel)
 	for i, uri := range mock.ListAllMockURIs() {
-		alertmanager.NewAlertmanager(fmt.Sprintf("dedup-mock-%d", i), uri, time.Second)
+		name := fmt.Sprintf("dedup-mock-%d", i)
+		alertmanager.NewAlertmanager(name, uri, alertmanager.WithRequestTimeout(time.Second))
 	}
 }
 

internal/alertmanager/upstream.go

@@ -10,11 +10,15 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+// Option allows to pass functional options to NewAlertmanager()
+type Option func(am *Alertmanager)
+
 var (
 	upstreams = map[string]*Alertmanager{}
 )
 
-func newAlertmanager(name, uri string, timeout time.Duration, proxyRequests bool) error {
+// NewAlertmanager creates a new Alertmanager instance
+func NewAlertmanager(name, uri string, opts ...Option) error {
 	if _, found := upstreams[name]; found {
 		return fmt.Errorf("Alertmanager upstream '%s' already exist", name)
 	}
@@ -25,16 +29,15 @@ func newAlertmanager(name, uri string, timeout time.Duration, proxyRequests bool
 		}
 	}
 
-	upstreams[name] = &Alertmanager{
-		URI:           uri,
-		Timeout:       timeout,
-		Name:          name,
-		ProxyRequests: proxyRequests,
-		lock:          sync.RWMutex{},
-		alertGroups:   []models.AlertGroup{},
-		silences:      map[string]models.Silence{},
-		colors:        models.LabelsColorMap{},
-		autocomplete:  []models.Autocomplete{},
+	am := &Alertmanager{
+		URI:          uri,
+		Timeout:      time.Second * 10,
+		Name:         name,
+		lock:         sync.RWMutex{},
+		alertGroups:  []models.AlertGroup{},
+		silences:     map[string]models.Silence{},
+		colors:       models.LabelsColorMap{},
+		autocomplete: []models.Autocomplete{},
 		metrics: alertmanagerMetrics{
 			errors: map[string]float64{
 				labelValueErrorsAlerts:   0,
@@ -43,21 +46,15 @@ func newAlertmanager(name, uri string, timeout time.Duration, proxyRequests bool
 		},
 	}
 
-	log.Infof("[%s] Configured Alertmanager source at %s", name, uri)
+	for _, opt := range opts {
+		opt(am)
+	}
 
-	return nil
-}
+	upstreams[name] = am
 
-// NewAlertmanager creates a new Alertmanager instance, unsee clients will talk
-// to directly to it without unsee proxying any request
-func NewAlertmanager(name, uri string, timeout time.Duration) error {
-	return newAlertmanager(name, uri, timeout, false)
-}
+	log.Infof("[%s] Configured Alertmanager source at %s", name, uri)
 
-// NewProxiedAlertmanager creates a new proxied Alertmanager instance, unsee
-// clients will talk to it via unsee
-func NewProxiedAlertmanager(name, uri string, timeout time.Duration) error {
-	return newAlertmanager(name, uri, timeout, false)
+	return nil
 }
 
 // GetAlertmanagers returns a list of all defined Alertmanager instances
@@ -78,3 +75,19 @@ func GetAlertmanagerByName(name string) *Alertmanager {
 	}
 	return nil
 }
+
+// WithProxy option can be passed to NewAlertmanager in order to enable request
+// proxying for unsee clients
+func WithProxy(proxied bool) Option {
+	return func(am *Alertmanager) {
+		am.ProxyRequests = proxied
+	}
+}
+
+// WithRequestTimeout option can be passed to NewAlertmanager in order to set
+// a custom timeout for Alertmanager upstream requests
+func WithRequestTimeout(timeout time.Duration) Option {
+	return func(am *Alertmanager) {
+		am.Timeout = timeout
+	}
+}

internal/filters/filter_test.go

@@ -485,7 +485,7 @@ var tests = []filterTest{
 func TestFilters(t *testing.T) {
 	log.SetLevel(log.ErrorLevel)
 
-	err := alertmanager.NewAlertmanager("test", "http://localhost", time.Second)
+	err := alertmanager.NewAlertmanager("test", "http://localhost", alertmanager.WithRequestTimeout(time.Second))
 	am := alertmanager.GetAlertmanagerByName("test")
 	if err != nil {
 		t.Error(err)

main.go

@@ -61,11 +61,7 @@ func setupRouter(router *gin.Engine) {
 func setupUpstreams() {
 	for _, s := range config.Config.Alertmanager.Servers {
 		var err error
-		if s.Proxy {
-			err = alertmanager.NewProxiedAlertmanager(s.Name, s.URI, s.Timeout)
-		} else {
-			err = alertmanager.NewAlertmanager(s.Name, s.URI, s.Timeout)
-		}
+		err = alertmanager.NewAlertmanager(s.Name, s.URI, alertmanager.WithRequestTimeout(s.Timeout), alertmanager.WithProxy(s.Proxy))
 		if err != nil {
 			log.Fatalf("Failed to configure Alertmanager '%s' with URI '%s': %s", s.Name, s.URI, err)
 		}