Remote Alertmanager: Configure SMTP From address (#104925)
* Remote Alertmanager: Configure SMTP From address * include smtp from address in config comparison * updte tests * trigger build * make linter happy * trigger build * fix test
This commit is contained in:
@@ -22,6 +22,7 @@ type UserGrafanaConfig struct {
|
||||
Default bool `json:"default"`
|
||||
Promoted bool `json:"promoted"`
|
||||
ExternalURL string `json:"external_url"`
|
||||
SmtpFrom string `json:"smtp_from"`
|
||||
StaticHeaders map[string]string `json:"static_headers"`
|
||||
}
|
||||
|
||||
@@ -56,6 +57,7 @@ func (mc *Mimir) CreateGrafanaAlertmanagerConfig(ctx context.Context, cfg *apimo
|
||||
Default: isDefault,
|
||||
Promoted: mc.promoteConfig,
|
||||
ExternalURL: mc.externalURL,
|
||||
SmtpFrom: mc.smtpFrom,
|
||||
StaticHeaders: mc.staticHeaders,
|
||||
})
|
||||
if err != nil {
|
||||
|
||||
@@ -48,6 +48,7 @@ type Mimir struct {
|
||||
metrics *metrics.RemoteAlertmanager
|
||||
promoteConfig bool
|
||||
externalURL string
|
||||
smtpFrom string
|
||||
staticHeaders map[string]string
|
||||
}
|
||||
|
||||
@@ -59,6 +60,7 @@ type Config struct {
|
||||
Logger log.Logger
|
||||
PromoteConfig bool
|
||||
ExternalURL string
|
||||
SmtpFrom string
|
||||
StaticHeaders map[string]string
|
||||
}
|
||||
|
||||
@@ -103,6 +105,7 @@ func New(cfg *Config, metrics *metrics.RemoteAlertmanager, tracer tracing.Tracer
|
||||
metrics: metrics,
|
||||
promoteConfig: cfg.PromoteConfig,
|
||||
externalURL: cfg.ExternalURL,
|
||||
smtpFrom: cfg.SmtpFrom,
|
||||
staticHeaders: cfg.StaticHeaders,
|
||||
}, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user