From b201725d1c3391615aabb455095b16af1042394c Mon Sep 17 00:00:00 2001 From: Fabian Reinartz Date: Fri, 26 Jun 2015 01:32:44 +0200 Subject: [PATCH] cmd/prometheus: fix remote storage fanout --- cmd/prometheus/main.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go index 098d155fa0..4797423436 100644 --- a/cmd/prometheus/main.go +++ b/cmd/prometheus/main.go @@ -57,17 +57,20 @@ func Main() int { } var ( - memStorage = local.NewMemorySeriesStorage(&cfg.storage) - remoteStorage = remote.New(&cfg.remote) - sampleAppender = storage.Fanout{memStorage} - notificationHandler = notification.NewNotificationHandler(&cfg.notification) - targetManager = retrieval.NewTargetManager(sampleAppender) - queryEngine = promql.NewEngine(memStorage, &cfg.queryEngine) + memStorage = local.NewMemorySeriesStorage(&cfg.storage) + remoteStorage = remote.New(&cfg.remote) + sampleAppender = storage.Fanout{memStorage} ) if remoteStorage != nil { sampleAppender = append(sampleAppender, remoteStorage) } + var ( + notificationHandler = notification.NewNotificationHandler(&cfg.notification) + targetManager = retrieval.NewTargetManager(sampleAppender) + queryEngine = promql.NewEngine(memStorage, &cfg.queryEngine) + ) + ruleManager := rules.NewManager(&rules.ManagerOptions{ SampleAppender: sampleAppender, NotificationHandler: notificationHandler,