refactor: change some log print
This commit is contained in:
parent
e60322a612
commit
f648a6c8c2
|
@ -1,6 +1,9 @@
|
||||||
**What type of PR is this?**
|
**What type of PR is this?**
|
||||||
|
|
||||||
**What this PR does / why we need it**:
|
**What this PR does / why we need it**:
|
||||||
|
<!--
|
||||||
|
"Nice to have" "You need it" is not a good reason. :)
|
||||||
|
-->
|
||||||
|
|
||||||
**Which issue(s) this PR fixes**:
|
**Which issue(s) this PR fixes**:
|
||||||
<!--
|
<!--
|
||||||
|
|
|
@ -45,6 +45,7 @@ func Query(reqs []*dataobj.QueryData) ([]*dataobj.TsdbQueryResponse, error) {
|
||||||
if err == nil {
|
if err == nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
time.Sleep(500 * time.Millisecond)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -67,7 +67,7 @@ func Judge(stra *model.Stra, exps []model.Exp, historyData []*dataobj.HistoryDat
|
||||||
|
|
||||||
if len(exps) < 1 {
|
if len(exps) < 1 {
|
||||||
stats.Counter.Set("stra.illegal", 1)
|
stats.Counter.Set("stra.illegal", 1)
|
||||||
logger.Warningf("stra:%v exp is null", stra)
|
logger.Warningf("stra:%+v exp is null", stra)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
exp := exps[0]
|
exp := exps[0]
|
||||||
|
@ -92,7 +92,7 @@ func Judge(stra *model.Stra, exps []model.Exp, historyData []*dataobj.HistoryDat
|
||||||
if len(exps) == 1 {
|
if len(exps) == 1 {
|
||||||
bs, err := json.Marshal(history)
|
bs, err := json.Marshal(history)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Errorf("Marshal history:%v err:%v", history, err)
|
logger.Errorf("Marshal history:%+v err:%v", history, err)
|
||||||
}
|
}
|
||||||
event := &dataobj.Event{
|
event := &dataobj.Event{
|
||||||
ID: fmt.Sprintf("s_%d_%s", stra.Id, firstItem.PrimaryKey()),
|
ID: fmt.Sprintf("s_%d_%s", stra.Id, firstItem.PrimaryKey()),
|
||||||
|
@ -151,7 +151,7 @@ func Judge(stra *model.Stra, exps []model.Exp, historyData []*dataobj.HistoryDat
|
||||||
respData, err = GetData(stra, exps[1], firstItem, now, false)
|
respData, err = GetData(stra, exps[1], firstItem, now, false)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Errorf("stra:%v get query data err:%v", stra, err)
|
logger.Errorf("stra:%+v get query data err:%v", stra, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
for i := range respData {
|
for i := range respData {
|
||||||
|
@ -169,7 +169,7 @@ func judgeItemWithStrategy(stra *model.Stra, historyData []*dataobj.HistoryData,
|
||||||
|
|
||||||
straParam := []interface{}{}
|
straParam := []interface{}{}
|
||||||
if firstItem.Step == 0 {
|
if firstItem.Step == 0 {
|
||||||
logger.Errorf("wrong step:%v", firstItem)
|
logger.Errorf("wrong step:%+v", firstItem)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
straParam = append(straParam, stra.AlertDur/int(firstItem.Step))
|
straParam = append(straParam, stra.AlertDur/int(firstItem.Step))
|
||||||
|
@ -177,13 +177,13 @@ func judgeItemWithStrategy(stra *model.Stra, historyData []*dataobj.HistoryData,
|
||||||
switch straFunc {
|
switch straFunc {
|
||||||
case "happen":
|
case "happen":
|
||||||
if len(exp.Params) < 1 {
|
if len(exp.Params) < 1 {
|
||||||
logger.Errorf("stra:%d exp:%v stra param is null", stra.Id, exp)
|
logger.Errorf("stra:%d exp:%+v stra param is null", stra.Id, exp)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
straParam = append(straParam, exp.Params[0])
|
straParam = append(straParam, exp.Params[0])
|
||||||
case "c_avg", "c_avg_abs", "c_avg_rate", "c_avg_rate_abs":
|
case "c_avg", "c_avg_abs", "c_avg_rate", "c_avg_rate_abs":
|
||||||
if len(exp.Params) < 1 {
|
if len(exp.Params) < 1 {
|
||||||
logger.Errorf("stra:%d exp:%v stra param is null", stra.Id, exp)
|
logger.Errorf("stra:%d exp:%+v stra param is null", stra.Id, exp)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -194,12 +194,12 @@ func judgeItemWithStrategy(stra *model.Stra, historyData []*dataobj.HistoryData,
|
||||||
|
|
||||||
respItems, err := GetData(stra, exp, firstItem, now-int64(exp.Params[0]), true)
|
respItems, err := GetData(stra, exp, firstItem, now-int64(exp.Params[0]), true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Errorf("stra:%v %v get compare data err:%v", stra.Id, exp, err)
|
logger.Errorf("stra:%v %+v get compare data err:%v", stra.Id, exp, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(respItems) != 1 || len(respItems[0].Values) < 1 {
|
if len(respItems) != 1 || len(respItems[0].Values) < 1 {
|
||||||
logger.Errorf("stra:%d %v get compare data err, respItems:%v", stra.Id, exp, respItems)
|
logger.Errorf("stra:%d %+v get compare data err, respItems:%v", stra.Id, exp, respItems)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -215,7 +215,7 @@ func judgeItemWithStrategy(stra *model.Stra, historyData []*dataobj.HistoryData,
|
||||||
|
|
||||||
fn, err := ParseFuncFromString(straFunc, straParam, exp.Eopt, exp.Threshold)
|
fn, err := ParseFuncFromString(straFunc, straParam, exp.Eopt, exp.Threshold)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Errorf("stra:%d %v parse func fail: %v", stra.Id, exp, err)
|
logger.Errorf("stra:%d %+v parse func fail: %v", stra.Id, exp, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -265,7 +265,7 @@ func GetData(stra *model.Stra, exp model.Exp, firstItem *dataobj.JudgeItem, now
|
||||||
|
|
||||||
if len(respData) < 1 {
|
if len(respData) < 1 {
|
||||||
stats.Counter.Set("get.data.null", 1)
|
stats.Counter.Set("get.data.null", 1)
|
||||||
err = fmt.Errorf("stra:%v get query data is null", stra)
|
err = fmt.Errorf("get query data is null")
|
||||||
}
|
}
|
||||||
return respData, err
|
return respData, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,10 +32,15 @@ func nodataJudge() {
|
||||||
stras := cache.NodataStra.GetAll()
|
stras := cache.NodataStra.GetAll()
|
||||||
for _, stra := range stras {
|
for _, stra := range stras {
|
||||||
//nodata处理
|
//nodata处理
|
||||||
|
if len(stra.Endpoints) == 0 {
|
||||||
|
logger.Warningf("stra:%+v endpoints is null", stra)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
now := time.Now().Unix()
|
now := time.Now().Unix()
|
||||||
respData, err := GetData(stra, stra.Exprs[0], nil, now, false)
|
respData, err := GetData(stra, stra.Exprs[0], nil, now, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Errorf("stra:%v get query data err:%v", stra, err)
|
logger.Errorf("stra:%+v get query data err:%v", stra, err)
|
||||||
//获取数据报错,直接出发nodata
|
//获取数据报错,直接出发nodata
|
||||||
for _, endpoint := range stra.Endpoints {
|
for _, endpoint := range stra.Endpoints {
|
||||||
if endpoint == "" {
|
if endpoint == "" {
|
||||||
|
|
Loading…
Reference in New Issue