Merge pull request #1203 from PapaPiya/fix_metric_meta

[PDR-16341][fix(meta)]: 监控采集任务meta目录设置不生效
qiniu · Jan 21, 2022 · 480816e · 480816e
2 parents 01200fd + fe1201d
commit 480816e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/mgr/metric_runner.go b/mgr/metric_runner.go
@@ -3,6 +3,7 @@ package mgr
 import (
 	"errors"
 	"fmt"
+	"path/filepath"
 	"runtime/debug"
 	"strconv"
 	"strings"
@@ -82,10 +83,15 @@ func NewMetricRunner(rc RunnerConfig, wg *sync.WaitGroup, sr *sender.Registry) (
 		return nil, errors.New("Runner " + rc.RunnerName + " has no metric, ignore it")
 	}
 	interval := time.Duration(rc.CollectInterval) * time.Second
+	metaPath := ""
+	if rc.MetaDir != "" {
+		metaPath = filepath.Join(rc.MetaDir, fmt.Sprintf("%s_%s", rc.RunnerName, Hash("")))
+	}
 	cf := conf.MapConf{
 		GlobalKeyName: rc.RunnerName,
 		KeyRunnerName: rc.RunnerName,
 		KeyMode:       reader.ModeMetrics,
+		KeyMetaPath:   metaPath,
 	}
 	if rc.ExtraInfo {
 		cf[ExtraInfo] = Bool2String(rc.ExtraInfo)

diff --git a/mgr/models.go b/mgr/models.go
@@ -108,6 +108,7 @@ type RunnerInfo struct {
 	InternalKeyPrefix      string `json:"internal_key_prefix"` // 内置字段名前缀
 	MaxLineLen             int64  `json:"max_line_len"`        // 限制单条数据/每个key对应的value大小，防止读取数据/发送数据出错时内存/磁盘占用过大
 	IsBlock                bool   `json:"is_block"`            // 阻塞式发送
+	MetaDir                string `json:"meta_dir"`            // meta目录
 }
 
 type ErrorsList struct {