Merge branch 'master' of github.com:didi/nightingale

This commit is contained in:
qinxiaohui 2020-04-22 17:44:32 +08:00
commit 4bbb39913c
3 changed files with 6 additions and 2 deletions

View File

@ -309,8 +309,8 @@ func GetReqs(stra *model.Stra, metric string, endpoints []string, now int64) ([]
Endpoint: index.Endpoint,
Metric: index.Metric,
Tag: "",
Step: index.Step,
Dstype: index.Dstype,
Step: 10,
Dstype: "GAUGE",
TS: now,
}
lostSeries = append(lostSeries, s)

View File

@ -47,6 +47,7 @@ func nodataJudge() {
Tags: "",
TagsMap: map[string]string{},
DsType: "GAUGE",
Step: 10,
}
nodataJob.Acquire()

View File

@ -178,6 +178,9 @@ func fetchDataSync(start, end int64, consolFun, endpoint, counter string, step i
if err != nil {
logger.Warningf("fetch tsdb data error: %+v", err)
stats.Counter.Set("query.data.err", 1)
data.Endpoint = endpoint
data.Counter = counter
data.Step = step
}
dataChan <- data
}