remove processor logic

http/router.go

@@ -158,7 +158,7 @@ func configRoutes(r *gin.Engine) {
 		pages.DELETE("/alert-events", login(), alertEventsDel)
 		pages.GET("/alert-event/:id", login(), alertEventGet)
 		pages.DELETE("/alert-event/:id", login(), alertEventDel)
-		pages.PUT("/alert-event/:id", login(), alertEventNotePut)
+		// pages.PUT("/alert-event/:id", login(), alertEventNotePut)
 
 		pages.GET("/history-alert-events", login(), historyAlertEventGets)
 		pages.GET("/history-alert-event/:id", login(), historyAlertEventGet)

http/router_alert_event.go

@@ -58,15 +58,15 @@ type alertEventNoteForm struct {
 	EventNote string `json:"event_note"`
 }
 
-func alertEventNotePut(c *gin.Context) {
-	var f alertEventNoteForm
-	bind(c, &f)
+// func alertEventNotePut(c *gin.Context) {
+// 	var f alertEventNoteForm
+// 	bind(c, &f)
 
-	me := loginUser(c).MustPerm("alert_event_modify")
-	ae := AlertEvent(urlParamInt64(c, "id"))
+// 	me := loginUser(c).MustPerm("alert_event_modify")
+// 	ae := AlertEvent(urlParamInt64(c, "id"))
 
-	renderMessage(c, models.AlertEventUpdateEventNote(ae.Id, ae.HashId, f.EventNote, me.Id))
-}
+// 	renderMessage(c, models.AlertEventUpdateEventNote(ae.Id, ae.HashId, f.EventNote, me.Id))
+// }
 
 func alertEventDel(c *gin.Context) {
 	loginUser(c).MustPerm("alert_event_delete")

models/alert_event.go

@@ -17,9 +17,9 @@ type AlertEvent struct {
 	RuleId             int64             `json:"rule_id"`
 	RuleName           string            `json:"rule_name"`
 	RuleNote           string            `json:"rule_note"`
-	ProcessorUid       int64             `json:"processor_uid"`
-	ProcessorObj       User              `json:"processor_user_obj" xorm:"-"`
-	EventNote          string            `json:"event_note"`
+	// ProcessorUid       int64             `json:"processor_uid"`
+	// ProcessorObj       User              `json:"processor_user_obj" xorm:"-"`
+	// EventNote          string            `json:"event_note"`
 	HashId             string            `json:"hash_id"`                 // 唯一标识
 	IsPromePull        int               `json:"is_prome_pull"`           // 代表是否是prometheus pull告警，为1时前端使用 ReadableExpression 拉取最近1小时数据
 	LastSend           bool              `json:"last_sent" xorm:"-"`      // true 代表上次发了，false代表还没发:给prometheus做for判断的
@@ -117,13 +117,13 @@ func (ae *AlertEvent) FillObjs() error {
 		ae.NotifyUserObjs = users
 	}
 
-	if ae.ProcessorUid != 0 {
-		processor, err := UserGetById(ae.ProcessorUid)
-		if err != nil {
-			return err
-		}
-		ae.ProcessorObj = *processor
-	}
+	// if ae.ProcessorUid != 0 {
+	// 	processor, err := UserGetById(ae.ProcessorUid)
+	// 	if err != nil {
+	// 		return err
+	// 	}
+	// 	ae.ProcessorObj = *processor
+	// }
 
 	return nil
 }
@@ -269,23 +269,23 @@ func AlertEventGet(where string, args ...interface{}) (*AlertEvent, error) {
 	return &obj, nil
 }
 
-func AlertEventUpdateEventNote(id int64, hashId string, note string, uid int64) error {
-	session := DB.NewSession()
-	defer session.Close()
+// func AlertEventUpdateEventNote(id int64, hashId string, note string, uid int64) error {
+// 	session := DB.NewSession()
+// 	defer session.Close()
 
-	if err := session.Begin(); err != nil {
-		return err
-	}
+// 	if err := session.Begin(); err != nil {
+// 		return err
+// 	}
 
-	if _, err := session.Exec("UPDATE alert_event SET event_note = ?, processor_uid = ? WHERE id = ?", note, uid, id); err != nil {
-		logger.Errorf("mysql.error: update alert_event event_note fail: %v", err)
-		return err
-	}
+// 	if _, err := session.Exec("UPDATE alert_event SET event_note = ?, processor_uid = ? WHERE id = ?", note, uid, id); err != nil {
+// 		logger.Errorf("mysql.error: update alert_event event_note fail: %v", err)
+// 		return err
+// 	}
 
-	if _, err := session.Exec("UPDATE history_alert_event SET event_note = ?, processor_uid = ? WHERE hash_id = ? ORDER BY id DESC LIMIT 1", note, uid, hashId); err != nil {
-		logger.Errorf("mysql.error: update history_alert_event event_note fail: %v", err)
-		return err
-	}
+// 	if _, err := session.Exec("UPDATE history_alert_event SET event_note = ?, processor_uid = ? WHERE hash_id = ? ORDER BY id DESC LIMIT 1", note, uid, hashId); err != nil {
+// 		logger.Errorf("mysql.error: update history_alert_event event_note fail: %v", err)
+// 		return err
+// 	}
 
-	return session.Commit()
-}
+// 	return session.Commit()
+// }

sql/n9e.sql

@@ -297,8 +297,6 @@ CREATE TABLE `alert_event` (
     `rule_id` bigint unsigned not null,
     `rule_name` varchar(255) not null,
     `rule_note` varchar(512) not null default 'alert rule note',
-    `processor_uid` bigint NOT NULL default 0,
-    `event_note` varchar(512) not null default 'alert event note',
     `res_classpaths` varchar(1024) not null default '' comment 'belong classpaths',
     `priority` tinyint(1) not null,
     `status` tinyint(1) not null,