From 3092b4b65d3a174e9e4cfac1fe9b9e25115a2615 Mon Sep 17 00:00:00 2001
From: 710leo <710leo@gmail.com>
Date: Thu, 19 Mar 2020 17:20:29 +0800
Subject: [PATCH] fix: recovery alert value is null & refactor stats

---
 src/modules/judge/judge/judge.go  | 8 ++++----
 src/toolkits/identity/identity.go | 3 ++-
 src/toolkits/stats/init.go        | 2 --
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/modules/judge/judge/judge.go b/src/modules/judge/judge/judge.go
index e50c935c..68739dcc 100644
--- a/src/modules/judge/judge/judge.go
+++ b/src/modules/judge/judge/judge.go
@@ -110,16 +110,16 @@ func Judge(stra *model.Stra, exps []model.Exp, historyData []*dataobj.RRDData, f
 	}()
 
 	leftValue, isTriggered = judgeItemWithStrategy(stra, historyData, exps[0], firstItem, now)
-	if !isTriggered {
-		return
-	}
-
 	if value == "" {
 		value = fmt.Sprintf("%s: %v", exp.Metric, leftValue)
 	} else {
 		value += fmt.Sprintf("; %s: %v", exp.Metric, leftValue)
 	}
 
+	if !isTriggered {
+		return
+	}
+
 	//与条件情况下执行
 	if len(exps) > 1 {
 		if exps[1].Func == "nodata" { //nodata重新查询索引来进行告警判断
diff --git a/src/toolkits/identity/identity.go b/src/toolkits/identity/identity.go
index d39aeae6..7a8bdb28 100644
--- a/src/toolkits/identity/identity.go
+++ b/src/toolkits/identity/identity.go
@@ -18,11 +18,12 @@ type IdentitySection struct {
 func Init(identity IdentitySection) {
 	if identity.Specify != "" {
 		Identity = identity.Specify
+		return
 	}
 
 	var err error
 	Identity, err = sys.CmdOutTrim("bash", "-c", identity.Shell)
 	if err != nil {
-		log.Fatalln("[F] cannot get hostname")
+		log.Fatalln("[F] cannot get identity")
 	}
 }
diff --git a/src/toolkits/stats/init.go b/src/toolkits/stats/init.go
index 40a09def..3ef9bca6 100644
--- a/src/toolkits/stats/init.go
+++ b/src/toolkits/stats/init.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/didi/nightingale/src/dataobj"
-	"github.com/didi/nightingale/src/toolkits/identity"
 
 	"github.com/toolkits/pkg/logger"
 )
@@ -42,7 +41,6 @@ func Push() {
 func NewMetricValue(metric string, value int64) *dataobj.MetricValue {
 	item := &dataobj.MetricValue{
 		Metric:       metric,
-		Endpoint:     identity.Identity,
 		Timestamp:    time.Now().Unix(),
 		ValueUntyped: value,
 		CounterType:  "GAUGE",
-- 
GitLab