diff --git a/changelog b/changelog index 2bf8501a..cfad6272 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,11 @@ 3.1.1 -影响模块:需要更新job模块的二进制 +影响模块:job 更新内容:job模块之前给监控用的callback地址method误设置为了get,是不对的,改成了post + +3.1.2 +影响模块:rdb +更新内容:子节点修改的时候,不允许修改为租户节点 + +3.1.3 +影响模块:monapi +更新内容:对于P2、P3的告警会发送重复的两条 diff --git a/control b/control index e229f18c..d747b4dc 100755 --- a/control +++ b/control @@ -1,7 +1,7 @@ #!/bin/bash # release version -version=3.1.2 +version=3.1.3 CWD=$(cd $(dirname $0)/; pwd) cd $CWD diff --git a/src/modules/monapi/alarm/event_consumer.go b/src/modules/monapi/alarm/event_consumer.go index c1e1b140..db03c485 100644 --- a/src/modules/monapi/alarm/event_consumer.go +++ b/src/modules/monapi/alarm/event_consumer.go @@ -59,8 +59,6 @@ func consume(event *models.Event, isHigh bool) { fillUserIDs(event) - go notify.DoNotify(event.RealUpgrade, event) - // 没有配置报警接收人,修改event状态为无接收人 if len(event.RecvUserIDs) == 0 { SetEventStatus(event, models.STATUS_NONEUSER) @@ -73,6 +71,7 @@ func consume(event *models.Event, isHigh bool) { return } + go notify.DoNotify(event.RealUpgrade, event) SetEventStatus(event, models.STATUS_SEND) } diff --git a/src/modules/monapi/monapi.go b/src/modules/monapi/monapi.go index 8df36428..e1209cfc 100644 --- a/src/modules/monapi/monapi.go +++ b/src/modules/monapi/monapi.go @@ -30,8 +30,7 @@ var ( help *bool conf *string - gitHash = "No GitHash Provided" - buildTime = "No BuildTime Provided" + version = "No Version Provided" ) func init() { @@ -41,8 +40,7 @@ func init() { flag.Parse() if *vers { - fmt.Println("Git Commit Hash:", gitHash) - fmt.Println("UTC Build Time:", buildTime) + fmt.Println("Version:", version) os.Exit(0) }