refactor

sql/upgrade.sql

+use n9e_mon;
+ALTER TABLE event ADD cur_node_path varchar(255) AFTER nid;
+ALTER TABLE event ADD cur_nid varchar(255) AFTER nid;
+
+ALTER TABLE event_cur ADD cur_node_path varchar(255) AFTER nid;
+ALTER TABLE event_cur ADD cur_nid varchar(255) AFTER nid;
+
+
+ALTER TABLE maskconf ADD category int AFTER id;
+
+create table `maskconf_nids` (
+  `id` int unsigned not null auto_increment,
+  `mask_id` int unsigned not null,
+  `nid` varchar(255) not null,
+  `path` varchar(255) not null,
+  primary key (`id`),
+  key(`mask_id`)
+) engine=innodb default charset=utf8;
\ No newline at end of file

src/modules/index/rpc/push.go

@@ -36,6 +36,7 @@ func push(args []*dataobj.IndexModel, reply *dataobj.IndexResp) {
 		logger.Debugf("<---index %v", item)
 
 		if item.Nid != "" {
+			item.Endpoint = item.Nid
 			cache.NidIndexDB.Push(*item, now)
 		} else {
 			cache.IndexDB.Push(*item, now)

src/modules/judge/backend/query/index.go

@@ -30,17 +30,17 @@ func (i *IndexAddrs) Get() []string {
 	return i.Data
 }
 
-func GetIndexLoop() {
+func GetIndexLoop(hbsMod string) {
 	t1 := time.NewTicker(time.Duration(9) * time.Second)
-	GetIndex()
+	GetIndex(hbsMod)
 	for {
 		<-t1.C
-		GetIndex()
+		GetIndex(hbsMod)
 	}
 }
 
-func GetIndex() {
-	instances, err := report.GetAlive("index", "monapi")
+func GetIndex(hbsMod string) {
+	instances, err := report.GetAlive("index", hbsMod)
 	if err != nil {
 		stats.Counter.Set("get.index.err", 1)
 		logger.Warningf("get index list err:%v", err)

src/modules/judge/backend/query/init.go

@@ -23,11 +23,11 @@ type SeriesQuerySection struct {
 	IndexCallTimeout int    `json:"indexCallTimeout"` // 请求超时
 }
 
-func Init(cfg SeriesQuerySection) {
+func Init(cfg SeriesQuerySection, hbsMod string) {
 	Config = cfg
 	TransferConnPools = pools.NewConnPools(
 		Config.MaxConn, Config.MaxIdle, Config.ConnTimeout, Config.CallTimeout, address.GetRPCAddresses("transfer"),
 	)
 
-	go GetIndexLoop()
+	go GetIndexLoop(hbsMod)
 }

src/modules/judge/judge.go

@@ -66,7 +66,7 @@ func main() {
 	tlogger.Init(cfg.Logger)
 	go stats.Init("n9e.judge")
 
-	query.Init(cfg.Query)
+	query.Init(cfg.Query, "monapi")
 	redi.Init(cfg.Redis)
 
 	cache.InitHistoryBigMap()