Fix alertmanager APIs

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

Author: Ganesh Vernekar

pkg/alertmanager/alertmanager.go

@@ -1,6 +1,7 @@
 package alertmanager
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -23,8 +24,6 @@ import (
 	"github.com/prometheus/alertmanager/ui"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/route"
-	"github.com/prometheus/prometheus/pkg/labels"
-	"github.com/weaveworks/mesh"
 )
 
 const notificationLogMaintenancePeriod = 15 * time.Minute
@@ -68,9 +67,6 @@ func New(cfg *Config) (*Alertmanager, error) {
 	nflogID := fmt.Sprintf("nflog:%s", cfg.UserID)
 	var err error
 	am.nflog, err = nflog.New(
-		nflog.WithMesh(func(g mesh.Gossiper) mesh.Gossip {
-			return cfg.MeshRouter.newGossip(nflogID, g)
-		}),
 		nflog.WithRetention(cfg.Retention),
 		nflog.WithSnapshot(filepath.Join(cfg.DataDir, nflogID)),
 		nflog.WithMaintenance(notificationLogMaintenancePeriod, am.stop, am.wg.Done),
@@ -84,7 +80,7 @@ func New(cfg *Config) (*Alertmanager, error) {
 		return nil, fmt.Errorf("failed to create notification log: %v", err)
 	}
 
-	am.marker = types.NewMarker()
+	am.marker = types.NewMarker(nil)
 
 	silencesID := fmt.Sprintf("silences:%s", cfg.UserID)
 	am.silences, err = silence.New(silence.Options{
@@ -95,9 +91,6 @@ func New(cfg *Config) (*Alertmanager, error) {
 		// For now, these metrics are ignored, as we can't register the same
 		// metric twice with a single registry.
 		Metrics: prometheus.NewRegistry(),
-		Gossip: func(g mesh.Gossiper) mesh.Gossip {
-			return cfg.MeshRouter.newGossip(silencesID, g)
-		},
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create silences: %v", err)
@@ -109,22 +102,18 @@ func New(cfg *Config) (*Alertmanager, error) {
 		am.wg.Done()
 	}()
 
-	marker := types.NewMarker()
-	am.alerts, err = mem.NewAlerts(marker, 30*time.Minute)
+	marker := types.NewMarker(nil)
+	am.alerts, err = mem.NewAlerts(context.Background(), marker, 30*time.Minute, am.logger)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create alerts: %v", err)
 	}
 
-	am.api, err = api.New(
-		am.alerts,
-		am.silences,
-		func(matchers []*labels.Matcher) dispatch.AlertOverview {
-			return am.dispatcher.Groups(matchers)
-		},
-		marker.Status,
-		nil, // Passing a nil mesh router since we don't show mesh router information in Cortex anyway.
-		log.With(am.logger, "component", "api"),
-	)
+	am.api, err = api.New(api.Options{
+		Alerts:     am.alerts,
+		Silences:   am.silences,
+		StatusFunc: marker.Status,
+		Logger:     log.With(am.logger, "component", "api"),
+	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create api: %v", err)
 	}
@@ -133,7 +122,7 @@ func New(cfg *Config) (*Alertmanager, error) {
 
 	webReload := make(chan chan error)
 	ui.Register(am.router.WithPrefix(am.cfg.ExternalURL.Path), webReload, log.With(am.logger, "component", "ui"))
-	am.api.Register(am.router.WithPrefix(path.Join(am.cfg.ExternalURL.Path, "/api")))
+	am.api.Register(am.router, path.Join(am.cfg.ExternalURL.Path, "/api"))
 
 	go func() {
 		for {
@@ -171,10 +160,7 @@ func (am *Alertmanager) ApplyConfig(userID string, conf *config.Config) error {
 	}
 	tmpl.ExternalURL = am.cfg.ExternalURL
 
-	err = am.api.Update(conf, time.Duration(conf.Global.ResolveTimeout))
-	if err != nil {
-		return err
-	}
+	am.api.Update(conf, nil)
 
 	am.inhibitor.Stop()
 	am.dispatcher.Stop()
@@ -194,9 +180,9 @@ func (am *Alertmanager) ApplyConfig(userID string, conf *config.Config) error {
 		tmpl,
 		waitFunc,
 		am.inhibitor,
-		am.silences,
+		silence.NewSilencer(am.silences, am.marker, am.logger),
 		am.nflog,
-		am.marker,
+		nil,
 		log.With(am.logger, "component", "pipeline"),
 	)
 	am.dispatcher = dispatch.NewDispatcher(

pkg/alertmanager/multitenant.go

@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
 	"sort"
@@ -385,17 +386,25 @@ func (am *MultitenantAlertmanager) transformConfig(userID string, amConfig *amco
 	if am.cfg.AutoSlackRoot != "" {
 		for _, r := range amConfig.Receivers {
 			for _, s := range r.SlackConfigs {
-				if s.APIURL == autoSlackURL {
-					s.APIURL = amconfig.Secret(am.cfg.AutoSlackRoot + "/" + userID + "/monitor")
+				if s.APIURL.String() == autoSlackURL {
+					u, err := url.Parse(am.cfg.AutoSlackRoot + "/" + userID + "/monitor")
+					if err != nil {
+						return nil, err
+					}
+					s.APIURL = &amconfig.SecretURL{URL: u}
 				}
 			}
 		}
 	}
 	if am.cfg.AutoWebhookRoot != "" {
 		for _, r := range amConfig.Receivers {
 			for _, w := range r.WebhookConfigs {
-				if w.URL == autoWebhookURL {
-					w.URL = am.cfg.AutoWebhookRoot + "/" + userID + "/monitor"
+				if w.URL.String() == autoWebhookURL {
+					u, err := url.Parse(am.cfg.AutoWebhookRoot + "/" + userID + "/monitor")
+					if err != nil {
+						return nil, err
+					}
+					w.URL = &amconfig.URL{URL: u}
 				}
 			}
 		}