Merge pull request #858 from prometheus/fabxc/rmtfix

cmd/prometheus: fix remote storage fanout
This commit is contained in:
Fabian Reinartz 2015-06-26 01:49:38 +02:00
commit 1e61b5e0cf

View file

@ -60,14 +60,17 @@ func Main() int {
memStorage = local.NewMemorySeriesStorage(&cfg.storage) memStorage = local.NewMemorySeriesStorage(&cfg.storage)
remoteStorage = remote.New(&cfg.remote) remoteStorage = remote.New(&cfg.remote)
sampleAppender = storage.Fanout{memStorage} sampleAppender = storage.Fanout{memStorage}
notificationHandler = notification.NewNotificationHandler(&cfg.notification)
targetManager = retrieval.NewTargetManager(sampleAppender)
queryEngine = promql.NewEngine(memStorage, &cfg.queryEngine)
) )
if remoteStorage != nil { if remoteStorage != nil {
sampleAppender = append(sampleAppender, remoteStorage) 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{ ruleManager := rules.NewManager(&rules.ManagerOptions{
SampleAppender: sampleAppender, SampleAppender: sampleAppender,
NotificationHandler: notificationHandler, NotificationHandler: notificationHandler,