RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-18 04:15:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused feature flags (#3676)

Browse Source 
This commit removes some code that should have been removed in #3668.
The FeatureFlags in silence.Options are no longer used but were
still initialized. These had a no-op effect.

Signed-off-by: George Robinson <george.robinson@grafana.com>
This commit is contained in:
George Robinson 2024-01-19 10:43:50 +00:00 committed by GitHub
parent 30fa9cd44b
commit f92a08d073
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/alertmanager/main.go
View File

@ -251,7 +251,6 @@ func run() int {
Retention: *retention, Retention: *retention,
Logger: log.With(logger, "component", "silences"), Logger: log.With(logger, "component", "silences"),
Metrics: prometheus.DefaultRegisterer, Metrics: prometheus.DefaultRegisterer,
FeatureFlags: ff,
} }
silences, err := silence.New(silenceOpts) silences, err := silence.New(silenceOpts)

6
silence/silence.go
View File

@ -37,7 +37,6 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/alertmanager/cluster" "github.com/prometheus/alertmanager/cluster"
"github.com/prometheus/alertmanager/featurecontrol"
"github.com/prometheus/alertmanager/matchers/compat" "github.com/prometheus/alertmanager/matchers/compat"
"github.com/prometheus/alertmanager/pkg/labels" "github.com/prometheus/alertmanager/pkg/labels"
pb "github.com/prometheus/alertmanager/silence/silencepb" pb "github.com/prometheus/alertmanager/silence/silencepb"
@ -317,9 +316,8 @@ type Options struct {
Retention time.Duration Retention time.Duration
// A logger used by background processing. // A logger used by background processing.
Logger log.Logger Logger log.Logger
Metrics prometheus.Registerer Metrics prometheus.Registerer
FeatureFlags featurecontrol.Flagger
} }
func (o *Options) validate() error { func (o *Options) validate() error {