Skip to content

Fix panic when alertmanager applies configs #2114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pracucci merged 3 commits into from
Feb 12, 2020
Merged

Fix panic when alertmanager applies configs #2114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8800b42
fix panic when creating pipelineBuidler in alertmanager
jtlisi Feb 11, 2020
719c5a3
update changelog
jtlisi Feb 11, 2020
ac9530d
Merge branch 'master' into 20200211_fix_registry_panic
jtlisi Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* `-server.grpc.keepalive.timeout`
* [ENHANCEMENT] PostgreSQL: Bump up `github.com/lib/pq` from `v1.0.0` to `v1.3.0` to support PostgreSQL SCRAM-SHA-256 authentication. #2097
* [ENHANCEMENT] Casandra: User no longer need `CREATE` privilege on `<all keyspaces>` if given keyspace exists. #2032
* [BUGFIX] Alertmanager: fixed panic upon applying a new config, caused by duplicate metrics registration in the `NewPipelineBuilder` function. #211
* [BUGFIX] Experimental TSDB: fixed `/all_user_stats` and `/api/prom/user_stats` endpoints when using the experimental TSDB blocks storage. #2042
* [BUGFIX] Experimental TSDB: fixed ruler to correctly work with the experimental TSDB blocks storage. #2101
* [BUGFIX] Azure Blob ChunkStore: Fixed issue causing `invalid chunk checksum` errors. #2074
Expand Down
33 changes: 18 additions & 15 deletions pkg/alertmanager/alertmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,20 @@ type Config struct {

// An Alertmanager manages the alerts for one user.
type Alertmanager struct {
cfg *Config
api *api.API
logger log.Logger
nflog *nflog.Log
silences *silence.Silences
marker types.Marker
alerts *mem.Alerts
dispatcher *dispatch.Dispatcher
inhibitor *inhibit.Inhibitor
stop chan struct{}
wg sync.WaitGroup
mux *http.ServeMux
registry *prometheus.Registry
cfg *Config
api *api.API
logger log.Logger
nflog *nflog.Log
silences *silence.Silences
marker types.Marker
alerts *mem.Alerts
dispatcher *dispatch.Dispatcher
inhibitor *inhibit.Inhibitor
pipelineBuilder *notify.PipelineBuilder
stop chan struct{}
wg sync.WaitGroup
mux *http.ServeMux
registry *prometheus.Registry
}

var webReload = make(chan chan error)
Expand Down Expand Up @@ -130,6 +131,8 @@ func New(cfg *Config) (*Alertmanager, error) {
am.silences.SetBroadcast(c.Broadcast)
}

am.pipelineBuilder = notify.NewPipelineBuilder(am.registry)

am.wg.Add(1)
go func() {
am.silences.Maintenance(15*time.Minute, filepath.Join(cfg.DataDir, silencesID), am.stop)
Expand Down Expand Up @@ -205,8 +208,8 @@ func (am *Alertmanager) ApplyConfig(userID string, conf *config.Config) error {
if err != nil {
return nil
}
pipelineBuilder := notify.NewPipelineBuilder(am.registry)
pipeline := pipelineBuilder.New(

pipeline := am.pipelineBuilder.New(
integrationsMap,
waitFunc,
am.inhibitor,
Expand Down