From a73f2654dfc750343c0aa08f1ea07c1eafc63dcb Mon Sep 17 00:00:00 2001
From: 710leo <710leo@gmail.com>
Date: Thu, 27 May 2021 00:46:21 +0800
Subject: [PATCH] bugfix: aggr output and alert

---
 src/modules/server/config/config.go         |  9 ++++---
 src/modules/server/http/router_event.go     | 26 +++++++++++++++------
 src/modules/server/rpc/transfer_consumer.go |  3 ++-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/modules/server/config/config.go b/src/modules/server/config/config.go
index 4c38cc9f..3c40d4ba 100644
--- a/src/modules/server/config/config.go
+++ b/src/modules/server/config/config.go
@@ -393,13 +393,16 @@ func Parse(ymlFile string) error {
 	}
 
 	fmt.Println("config.file:", ymlFile)
-	Ident, _ = identity.GetIdent()
-
 	if err := parseOps(); err != nil {
 		return err
 	}
 
-	return identity.Parse()
+	if err := identity.Parse(); err != nil {
+		return err
+	}
+	Ident, _ = identity.GetIdent()
+
+	return nil
 }
 
 // map["node"]="host1,host2" --> map["node"]=["host1", "host2"]
diff --git a/src/modules/server/http/router_event.go b/src/modules/server/http/router_event.go
index 847eedd9..c1d4dee0 100644
--- a/src/modules/server/http/router_event.go
+++ b/src/modules/server/http/router_event.go
@@ -410,13 +410,6 @@ func eventCurClaim(c *gin.Context) {
 	var f claimForm
 	errors.Dangerous(c.ShouldBind(&f))
 
-	eventCur := mustEventCur(f.Id)
-	can, err := models.UsernameCandoNodeOp(username, "mon_event_write", eventCur.Nid)
-	errors.Dangerous(err)
-	if !can {
-		errors.Bomb(_s("no privilege"))
-	}
-
 	id := f.Id
 	nodePath := f.NodePath
 
@@ -429,9 +422,28 @@ func eventCurClaim(c *gin.Context) {
 	}
 
 	if id != 0 {
+		eventCur := mustEventCur(id)
+		can, err := models.UsernameCandoNodeOp(username, "mon_event_write", eventCur.Nid)
+		errors.Dangerous(err)
+		if !can {
+			errors.Bomb(_s("no privilege"))
+		}
+
 		renderMessage(c, models.UpdateClaimantsById(users[0].Id, id))
 		return
 	}
 
+	node, err := models.NodeGet("path=?", nodePath)
+	errors.Dangerous(err)
+	if node == nil {
+		errors.Bomb(_s("node not found"))
+	}
+
+	can, err := models.UsernameCandoNodeOp(username, "mon_event_write", node.Id)
+	errors.Dangerous(err)
+	if !can {
+		errors.Bomb(_s("no privilege"))
+	}
+
 	renderMessage(c, models.UpdateClaimantsByNodePath(users[0].Id, nodePath))
 }
diff --git a/src/modules/server/rpc/transfer_consumer.go b/src/modules/server/rpc/transfer_consumer.go
index 292f3123..74d12172 100644
--- a/src/modules/server/rpc/transfer_consumer.go
+++ b/src/modules/server/rpc/transfer_consumer.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"strings"
 
 	"github.com/didi/nightingale/v4/src/common/dataobj"
 	"github.com/didi/nightingale/v4/src/common/stats"
@@ -95,7 +96,7 @@ func aggrOut2MetricValue(out *dataobj.AggrOut) *dataobj.MetricValue {
 		Metric:       cache.AggrCalcMap.GetMetric(out.Data.Sid),
 		Timestamp:    out.Data.Timestamp / 1000,
 		Step:         out.Data.Step,
-		Tags:         out.Data.GroupTag,
+		Tags:         strings.Replace(out.Data.GroupTag, "||", ",", -1),
 		ValueUntyped: out.Data.Value,
 		CounterType:  "GAUGE",
 	}