rule: fix skips rule files based on their names. (thanos-io#4232)

Signed-off-by: weidai218169 <weidai218169@sohu-inc.com>
daiwei233 · Jul 20, 2021 · e48c30f · e48c30f
1 parent 0058003
commit e48c30f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 ### Fixed
 
 - [#4442](https://github.com/thanos-io/thanos/pull/4442) rule: fix reload signal not working
+- [#4232](https://github.com/thanos-io/thanos/issues/4232) rule: fix skips rule files based on their names.
 
 ### Changed
 

diff --git a/pkg/rules/manager.go b/pkg/rules/manager.go
@@ -356,7 +356,7 @@ func (m *Manager) Update(evalInterval time.Duration, files []string) error {
 
 			// Use full file name appending to work dir, so we can differentiate between different dirs and same filenames(!).
 			// This will be also used as key for file group name.
-			newFn := filepath.Join(m.workDir, s.String(), strings.TrimLeft(fn, m.workDir))
+			newFn := filepath.Join(m.workDir, s.String(), filepath.Base(fn))
 			if err := os.MkdirAll(filepath.Dir(newFn), os.ModePerm); err != nil {
 				errs.Add(errors.Wrapf(err, "create %s", filepath.Dir(newFn)))
 				continue