From 112bf3d1b1e5249ed20670ae0597795b9da08dd6 Mon Sep 17 00:00:00 2001 From: Matej Gera Date: Thu, 17 Mar 2022 19:18:04 +0100 Subject: [PATCH 1/2] Fix WAL directory in ruler Signed-off-by: Matej Gera --- cmd/thanos/rule.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/thanos/rule.go b/cmd/thanos/rule.go index 47414f495f..e73d13c583 100644 --- a/cmd/thanos/rule.go +++ b/cmd/thanos/rule.go @@ -357,11 +357,10 @@ func runRule( return errors.Wrapf(err, "failed to parse remote write config %v", string(rwCfgYAML)) } - walDir := filepath.Join(conf.dataDir, "wal") // flushDeadline is set to 1m, but it is for metadata watcher only so not used here. remoteStore := remote.NewStorage(logger, reg, func() (int64, error) { return 0, nil - }, walDir, 1*time.Minute, nil) + }, conf.dataDir, 1*time.Minute, nil) if err := remoteStore.ApplyConfig(&config.Config{ GlobalConfig: config.GlobalConfig{ ExternalLabels: labelsTSDBToProm(conf.lset), @@ -371,7 +370,7 @@ func runRule( return errors.Wrap(err, "applying config to remote storage") } - agentDB, err = agent.Open(logger, reg, remoteStore, walDir, agentOpts) + agentDB, err = agent.Open(logger, reg, remoteStore, conf.dataDir, agentOpts) if err != nil { return errors.Wrap(err, "start remote write agent db") } From 74706dab2b0f95a4649bb9acaf2c022681994183 Mon Sep 17 00:00:00 2001 From: Matej Gera Date: Thu, 17 Mar 2022 19:30:23 +0100 Subject: [PATCH 2/2] Update CHANGELOG Signed-off-by: Matej Gera --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44721110d4..5294355905 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re ### Fixed +- [#5242](https://github.com/thanos-io/thanos/pull/5242) Ruler: Make ruler use the correct WAL directory. + ### Added - [#5220](https://github.com/thanos-io/thanos/pull/5220) Query Frontend: Add `--query-frontend.forward-header` flag, forward headers to downstream querier.