converge delete

src/models/mon_event.go

@@ -199,6 +199,11 @@ func DelEventOlder(ts int64, batch int) error {
 	return err
 }
 
+func EventDelById(id interface{}) error {
+	_, err := DB["mon"].Where("id=?", id).Delete(new(Event))
+	return err
+}
+
 func EventAlertUpgradeUnMarshal(str string) (EventAlertUpgrade, error) {
 	var obj EventAlertUpgrade
 	if strings.TrimSpace(str) == "" {

src/models/mon_event_cur.go

@@ -246,7 +246,11 @@ func EventCurGet(col string, value interface{}) (*EventCur, error) {
 }
 
 func (e *EventCur) EventIgnore() error {
-	_, err := DB["mon"].Exec("delete from event_cur where id=?", e.Id)
+	return EventCurDelById(e.Id)
+}
+
+func EventCurDelById(id interface{}) error {
+	_, err := DB["mon"].Where("id=?", id).Delete(new(EventCur))
 	return err
 }
 

src/modules/monapi/alarm/event_consumer.go

@@ -277,12 +277,6 @@ func needUpgrade(event *models.Event) bool {
 }
 
 func SetEventStatus(event *models.Event, status string) {
-	if err := models.SaveEventStatus(event.Id, status); err != nil {
-		logger.Errorf("set event status fail, event: %+v, status: %v, err:%v", event, status, err)
-	} else {
-		logger.Infof("set event status succ, event hasid: %v, status: %v", event.HashId, status)
-	}
-
 	if event.EventType == config.ALERT {
 		if err := models.SaveEventCurStatus(event.HashId, status); err != nil {
 			logger.Errorf("set event_cur status fail, event: %+v, status: %v, err:%v", event, status, err)
@@ -290,6 +284,22 @@ func SetEventStatus(event *models.Event, status string) {
 			logger.Infof("set event_cur status succ, event hashid: %v, status: %v", event.HashId, status)
 		}
 	}
+
+	if config.Get().Cleaner.Converge && status == models.STATUS_CONVERGE {
+		// 已收敛的告警，直接从库里删了，不保留了
+		if err := models.EventDelById(event.Id); err != nil {
+			logger.Errorf("converge_del fail, id: %v, hash id: %v, error: %v", event.Id, event.HashId, err)
+		} else {
+			logger.Infof("converge_del succ, id: %v, hash id: %v", event.Id, event.HashId)
+		}
+		return
+	}
+
+	if err := models.SaveEventStatus(event.Id, status); err != nil {
+		logger.Errorf("set event status fail, event: %+v, status: %v, err:%v", event, status, err)
+	} else {
+		logger.Infof("set event status succ, event hasid: %v, status: %v", event.HashId, status)
+	}
 }
 
 func getUserIds(users, groups string) ([]int64, error) {

src/modules/monapi/config/yaml.go

@@ -40,6 +40,7 @@ type mergeSection struct {
 type cleanerSection struct {
 	Days     int  `yaml:"days"`
 	Batch    int  `yaml:"batch"`
+	Converge bool `yaml:"converge"`
 }
 
 type queueSection struct {
@@ -171,6 +172,7 @@ func Parse(ymlfile string) error {
 	viper.SetDefault("cleaner", map[string]interface{}{
 		"days":     31,
 		"batch":    100,
+		"converge": true, // 历史告警的数据库表，对于已收敛的告警，默认删掉，不保留，省得告警太多
 	})
 
 	err = viper.Unmarshal(&yaml)