✨ [dashboard v0.3.9] 手动即时触发计划任务

cmd/dashboard/controller/member_api.go

@@ -15,7 +15,6 @@ import (
 	"github.com/naiba/nezha/pkg/mygin"
 	"github.com/naiba/nezha/pkg/utils"
 	pb "github.com/naiba/nezha/proto"
-	"github.com/naiba/nezha/service/alertmanager"
 	"github.com/naiba/nezha/service/dao"
 )
 
@@ -37,6 +36,7 @@ func (ma *memberAPI) serve() {
 	mr.POST("/server", ma.addOrEditServer)
 	mr.POST("/monitor", ma.addOrEditMonitor)
 	mr.POST("/cron", ma.addOrEditCron)
+	mr.GET("/cron/:id/manual", ma.manualTrigger)
 	mr.POST("/notification", ma.addOrEditNotification)
 	mr.POST("/alert-rule", ma.addOrEditAlertRule)
 	mr.POST("/setting", ma.updateSetting)
@@ -67,7 +67,7 @@ func (ma *memberAPI) delete(c *gin.Context) {
 	case "notification":
 		err = dao.DB.Delete(&model.Notification{}, "id = ?", id).Error
 		if err == nil {
-			alertmanager.OnDeleteNotification(id)
+			dao.OnDeleteNotification(id)
 		}
 	case "monitor":
 		err = dao.DB.Delete(&model.Monitor{}, "id = ?", id).Error
@@ -88,7 +88,7 @@ func (ma *memberAPI) delete(c *gin.Context) {
 	case "alert-rule":
 		err = dao.DB.Delete(&model.AlertRule{}, "id = ?", id).Error
 		if err == nil {
-			alertmanager.OnDeleteAlert(id)
+			dao.OnDeleteAlert(id)
 		}
 	}
 	if err != nil {
@@ -281,7 +281,7 @@ func (ma *memberAPI) addOrEditCron(c *gin.Context) {
 					Type: model.TaskTypeCommand,
 				})
 			} else {
-				alertmanager.SendNotification(fmt.Sprintf("计划任务：%s，服务器：%d 离线，无法执行。", cr.Name, cr.Servers[j]), false)
+				dao.SendNotification(fmt.Sprintf("计划任务：%s，服务器：%d 离线，无法执行。", cr.Name, cr.Servers[j]), false)
 			}
 		}
 	})
@@ -294,6 +294,23 @@ func (ma *memberAPI) addOrEditCron(c *gin.Context) {
 	})
 }
 
+func (ma *memberAPI) manualTrigger(c *gin.Context) {
+	var cr model.Cron
+	if err := dao.DB.First(&cr, "id = ?", c.Param("id")).Error; err != nil {
+		c.JSON(http.StatusOK, model.Response{
+			Code:    http.StatusBadRequest,
+			Message: err.Error(),
+		})
+		return
+	}
+
+	dao.CronTrigger(&cr)
+
+	c.JSON(http.StatusOK, model.Response{
+		Code: http.StatusOK,
+	})
+}
+
 type notificationForm struct {
 	ID            uint64
 	Name          string
@@ -333,7 +350,7 @@ func (ma *memberAPI) addOrEditNotification(c *gin.Context) {
 		})
 		return
 	}
-	alertmanager.OnRefreshOrAddNotification(n)
+	dao.OnRefreshOrAddNotification(n)
 	c.JSON(http.StatusOK, model.Response{
 		Code: http.StatusOK,
 	})
@@ -384,7 +401,7 @@ func (ma *memberAPI) addOrEditAlertRule(c *gin.Context) {
 		})
 		return
 	}
-	alertmanager.OnRefreshOrAddAlert(r)
+	dao.OnRefreshOrAddAlert(r)
 	c.JSON(http.StatusOK, model.Response{
 		Code: http.StatusOK,
 	})

cmd/dashboard/main.go

@@ -13,7 +13,6 @@ import (
 	"github.com/naiba/nezha/cmd/dashboard/rpc"
 	"github.com/naiba/nezha/model"
 	pb "github.com/naiba/nezha/proto"
-	"github.com/naiba/nezha/service/alertmanager"
 	"github.com/naiba/nezha/service/dao"
 )
 
@@ -90,7 +89,7 @@ func loadCrons() {
 						Type: model.TaskTypeCommand,
 					})
 				} else {
-					alertmanager.SendNotification(fmt.Sprintf("计划任务：%s，服务器：%d 离线，无法执行。", cr.Name, cr.Servers[j]), false)
+					dao.SendNotification(fmt.Sprintf("计划任务：%s，服务器：%d 离线，无法执行。", cr.Name, cr.Servers[j]), false)
 				}
 			}
 		})
@@ -106,5 +105,5 @@ func main() {
 	go controller.ServeWeb(dao.Conf.HTTPPort)
 	go rpc.ServeRPC(5555)
 	go rpc.DispatchTask(time.Minute * 3)
-	alertmanager.Start()
+	dao.AlertSentinelStart()
 }