root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 194 Packages Projects Releases Wiki Activity

Alerting: Enable the remote Alertmanager feature using only feature toggles (#101410) 

* Alerting: Enable the remote Alertmanager feature using only feature toggles

* Trigger build
This commit is contained in:
Santiago 2025-04-30 12:18:47 +02:00 committed by GitHub
parent afa97a5970
commit 5a589bb51a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/defaults.ini
View File

@ -1561,13 +1561,7 @@ default_datasource_uid =
[recording_rules.custom_headers] [recording_rules.custom_headers]
# exampleHeader = exampleValue # exampleHeader = exampleValue
# NOTE: this configuration options are not used yet.
[remote.alertmanager] [remote.alertmanager]
# Enable the use of the configured remote Alertmanager and disable the internal one.
# The default value is `false`.
enabled = false
# URL of the remote Alertmanager that will replace the internal one. # URL of the remote Alertmanager that will replace the internal one.
# This URL should be the root path, Grafana will automatically append an "/alertmanager" suffix for certain HTTP calls. # This URL should be the root path, Grafana will automatically append an "/alertmanager" suffix for certain HTTP calls.
# Required if `enabled` is set to `true`. # Required if `enabled` is set to `true`.

2
pkg/services/ngalert/ngalert.go
View File

@ -188,7 +188,7 @@ func (ng *AlertNG) init() error {
remoteOnly := ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertmanagerRemoteOnly) remoteOnly := ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertmanagerRemoteOnly)
remotePrimary := ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertmanagerRemotePrimary) remotePrimary := ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertmanagerRemotePrimary)
remoteSecondary := ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertmanagerRemoteSecondary) remoteSecondary := ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertmanagerRemoteSecondary)
if ng.Cfg.UnifiedAlerting.RemoteAlertmanager.Enable { if remoteOnly || remotePrimary || remoteSecondary {
autogenFn := remote.NoopAutogenFn autogenFn := remote.NoopAutogenFn
if ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertingSimplifiedRouting) { if ng.FeatureToggles.IsEnabled(initCtx, featuremgmt.FlagAlertingSimplifiedRouting) {
autogenFn = func(ctx context.Context, logger log.Logger, orgID int64, cfg *definitions.PostableApiAlertingConfig, skipInvalid bool) error { autogenFn = func(ctx context.Context, logger log.Logger, orgID int64, cfg *definitions.PostableApiAlertingConfig, skipInvalid bool) error {

2
pkg/setting/setting_unified_alerting.go
View File

@ -148,7 +148,6 @@ type RecordingRuleSettings struct {
// RemoteAlertmanagerSettings contains the configuration needed // RemoteAlertmanagerSettings contains the configuration needed
// to disable the internal Alertmanager and use an external one instead. // to disable the internal Alertmanager and use an external one instead.
type RemoteAlertmanagerSettings struct { type RemoteAlertmanagerSettings struct {
Enable bool
URL string URL string
TenantID string TenantID string
Password string Password string
@ -389,7 +388,6 @@ func (cfg *Cfg) ReadUnifiedAlertingSettings(iniFile *ini.File) error {
remoteAlertmanager := iniFile.Section("remote.alertmanager") remoteAlertmanager := iniFile.Section("remote.alertmanager")
uaCfgRemoteAM := RemoteAlertmanagerSettings{ uaCfgRemoteAM := RemoteAlertmanagerSettings{
Enable: remoteAlertmanager.Key("enabled").MustBool(false),
URL: remoteAlertmanager.Key("url").MustString(""), URL: remoteAlertmanager.Key("url").MustString(""),
TenantID: remoteAlertmanager.Key("tenant").MustString(""), TenantID: remoteAlertmanager.Key("tenant").MustString(""),
Password: remoteAlertmanager.Key("password").MustString(""), Password: remoteAlertmanager.Key("password").MustString(""),