implement request duration metric and ensure firewall tests are working

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

Author: friedrichg

pkg/alertmanager/alertmanager.go

@@ -30,6 +30,7 @@ import (
 	"github.com/prometheus/alertmanager/notify/email"
 	"github.com/prometheus/alertmanager/notify/incidentio"
 	"github.com/prometheus/alertmanager/notify/jira"
+	"github.com/prometheus/alertmanager/notify/mattermost"
 	"github.com/prometheus/alertmanager/notify/msteams"
 	"github.com/prometheus/alertmanager/notify/msteamsv2"
 	"github.com/prometheus/alertmanager/notify/opsgenie"
@@ -87,14 +88,13 @@ type Config struct {
 	// Tenant-specific local directory where AM can store its state (notifications, silences, templates). When AM is stopped, entire dir is removed.
 	TenantDataDir string
 
-	ShardingEnabled    bool
-	ReplicationFactor  int
-	Replicator         Replicator
-	Store              alertstore.AlertStore
-	PersisterConfig    PersisterConfig
-	APIConcurrency     int
-	GCInterval         time.Duration
-	DispatchStartDelay time.Duration
+	ShardingEnabled   bool
+	ReplicationFactor int
+	Replicator        Replicator
+	Store             alertstore.AlertStore
+	PersisterConfig   PersisterConfig
+	APIConcurrency    int
+	GCInterval        time.Duration
 }
 
 // An Alertmanager manages the alerts for one user.
@@ -130,6 +130,8 @@ type Alertmanager struct {
 	configHashMetric prometheus.Gauge
 
 	rateLimitedNotifications *prometheus.CounterVec
+
+	requestDuration *prometheus.HistogramVec
 }
 
 var (
@@ -184,6 +186,17 @@ func New(cfg *Config, reg *prometheus.Registry) (*Alertmanager, error) {
 			Help: "Number of rate-limited notifications per integration.",
 		}, []string{"integration"}), // "integration" is consistent with other alertmanager metrics.
 
+		requestDuration: promauto.With(reg).NewHistogramVec(
+			prometheus.HistogramOpts{
+				Name:                            "alertmanager_http_request_duration_seconds",
+				Help:                            "Histogram of latencies for HTTP requests.",
+				Buckets:                         prometheus.DefBuckets,
+				NativeHistogramBucketFactor:     1.1,
+				NativeHistogramMaxBucketNumber:  100,
+				NativeHistogramMinResetDuration: 1 * time.Hour,
+			},
+			[]string{"handler", "method", "code"},
+		),
 	}
 
 	am.registry = reg
@@ -292,7 +305,8 @@ func New(cfg *Config, reg *prometheus.Registry) (*Alertmanager, error) {
 		GroupFunc: func(ctx context.Context, f1 func(*dispatch.Route) bool, f2 func(*types.Alert, time.Time) bool) (dispatch.AlertGroups, map[model.Fingerprint][]string, error) {
 			return am.dispatcher.Groups(ctx, f1, f2)
 		},
-		Concurrency: am.cfg.APIConcurrency,
+		Concurrency:     am.cfg.APIConcurrency,
+		RequestDuration: am.requestDuration,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create api: %v", err)
@@ -612,6 +626,11 @@ func buildReceiverIntegrations(nc config.Receiver, tmpl *template.Template, fire
 			return incidentio.New(c, tmpl, util_log.GoKitLogToSlog(l), httpOps...)
 		})
 	}
+	for i, c := range nc.MattermostConfigs {
+		add("mattermost", i, c, func(l log.Logger) (notify.Notifier, error) {
+			return mattermost.New(c, tmpl, util_log.GoKitLogToSlog(l), httpOps...)
+		})
+	}
 
 	// If we add support for more integrations, we need to add them to validation as well. See validation.allowedIntegrationNames field.
 	if errs.Len() > 0 {

pkg/alertmanager/api.go

@@ -619,15 +619,6 @@ func validateDiscordConfig(cfg config.DiscordConfig) error {
 	return nil
 }
 
-// validateMatterMostConfig validates the Discord Config and returns an error if it contains
-// settings not allowed by Cortex.
-func validateMattermostConfig(cfg config.MattermostConfig) error {
-	if cfg.WebhookURLFile != "" {
-		return errMatterMostWebhookUrlFileNotAllowed
-	}
-	return nil
-}
-
 // validateEmailConfig validates the Email Config and returns an error if it contains
 // settings not allowed by Cortex.
 func validateEmailConfig(cfg config.EmailConfig) error {
@@ -650,3 +641,12 @@ func validateIncidentIOConfig(cfg config.IncidentioConfig) error {
 
 	return nil
 }
+
+// validateMatterMostConfig validates the Mattermost Config and returns an error if it contains
+// settings not allowed by Cortex.
+func validateMattermostConfig(cfg config.MattermostConfig) error {
+	if cfg.WebhookURLFile != "" {
+		return errMatterMostWebhookUrlFileNotAllowed
+	}
+	return nil
+}

pkg/alertmanager/multitenant_test.go

@@ -526,6 +526,21 @@ receivers:
       - api_url: %s
         token: token
         token_id: token-id
+`, backendURL)
+			},
+		},
+		"mattermost": {
+			getAlertmanagerConfig: func(backendURL string) string {
+				return fmt.Sprintf(`
+route:
+  receiver: mattermost
+  group_wait: 0s
+  group_interval: 1s
+
+receivers:
+  - name: mattermost
+    mattermost_configs: {}
+	  - webhook_url: %s
 `, backendURL)
 			},
 		},