diff --git a/resource/template/dashboard-default/cron.html b/resource/template/dashboard-default/cron.html
index 67619d5..d136e76 100644
--- a/resource/template/dashboard-default/cron.html
+++ b/resource/template/dashboard-default/cron.html
@@ -15,6 +15,7 @@
| ID |
{{tr "Name"}} |
+ {{tr "TaskType"}} |
{{tr "Scheduler"}} |
{{tr "Command"}} |
{{tr "NotificationMethodGroup"}} |
@@ -31,11 +32,12 @@
| {{$cron.ID}} |
{{$cron.Name}} |
+ {{if eq $cron.TaskType 0}}{{tr "CronTask"}}{{else}}{{tr "TriggerTask"}}{{end}} |
{{$cron.Scheduler}} |
{{$cron.Command}} |
{{$cron.NotificationTag}} |
{{$cron.PushSuccessful}} |
- {{if eq $cron.Cover 0}}{{tr "IgnoreAll"}}{{else}}{{tr "CoverAll"}}{{end}} |
+ {{if eq $cron.Cover 0}}{{tr "IgnoreAll"}}{{else if eq $cron.Cover 1}}{{tr "CoverAll"}}{{else}}{{tr "ByTrigger"}}{{end}} |
{{$cron.ServersRaw}} |
{{$cron.LastExecutedAt|tf}} |
{{$cron.LastResult}} |
diff --git a/resource/template/dashboard-default/notification.html b/resource/template/dashboard-default/notification.html
index 17cdc97..133aa8e 100644
--- a/resource/template/dashboard-default/notification.html
+++ b/resource/template/dashboard-default/notification.html
@@ -58,7 +58,10 @@
ID |
{{tr "Name"}} |
{{tr "NotificationMethodGroup"}} |
+ {{tr "NotificationTriggerMode"}} |
{{tr "Rules"}} |
+ {{tr "FailTriggerTasks"}} |
+ {{tr "RecoverTriggerTasks"}} |
{{tr "Enable"}} |
{{tr "Administration"}} |
@@ -69,7 +72,10 @@
{{$rule.ID}} |
{{$rule.Name}} |
{{$rule.NotificationTag}} |
+
{{if eq $rule.TriggerMode 0}}{{tr "ModeAlwaysTrigger"}}{{else}}{{tr "ModeOnetimeTrigger"}}{{end}}
| {{$rule.RulesRaw}} |
+
{{$rule.FailTriggerTasksRaw}} |
+
{{$rule.RecoverTriggerTasksRaw}} |
{{$rule.Enable}} |
diff --git a/resource/template/dashboard-default/redirect.html b/resource/template/dashboard-default/redirect.html
index 4f43eef..90d8f07 100644
--- a/resource/template/dashboard-default/redirect.html
+++ b/resource/template/dashboard-default/redirect.html
@@ -6,11 +6,11 @@
- Redireting..
+ Redirecting..
- Please click here if you are not redirected.
+ If you are not redirected, please click here.
diff --git a/service/singleton/alertsentinel.go b/service/singleton/alertsentinel.go
index f178ae1..eb95fc3 100644
--- a/service/singleton/alertsentinel.go
+++ b/service/singleton/alertsentinel.go
@@ -153,17 +153,25 @@ func checkStatus() {
// 保存当前服务器状态信息
curServer := model.Server{}
copier.Copy(&curServer, server)
+
+ // 本次未通过检查
if !passed {
- alertsPrevState[alert.ID][server.ID] = _RuleCheckFail
- message := fmt.Sprintf("[%s] %s(%s) %s", Localizer.MustLocalize(&i18n.LocalizeConfig{
- MessageID: "Incident",
- }), server.Name, IPDesensitize(server.Host.IP), alert.Name)
- go SendNotification(alert.NotificationTag, message, true, &curServer)
+ // 始终触发模式或上次检查不为失败时触发报警（跳过单次触发+上次失败的情况）
+ if alert.TriggerMode == model.ModeAlwaysTrigger || alertsPrevState[alert.ID][server.ID] != _RuleCheckFail {
+ alertsPrevState[alert.ID][server.ID] = _RuleCheckFail
+ message := fmt.Sprintf("[%s] %s(%s) %s", Localizer.MustLocalize(&i18n.LocalizeConfig{
+ MessageID: "Incident",
+ }), server.Name, IPDesensitize(server.Host.IP), alert.Name)
+ go SendTriggerTasks(alert.FailTriggerTasks, curServer.ID)
+ go SendNotification(alert.NotificationTag, message, true, &curServer)
+ }
} else {
+ // 本次通过检查但上一次的状态为失败，则发送恢复通知
if alertsPrevState[alert.ID][server.ID] == _RuleCheckFail {
message := fmt.Sprintf("[%s] %s(%s) %s", Localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: "Resolved",
}), server.Name, IPDesensitize(server.Host.IP), alert.Name)
+ go SendTriggerTasks(alert.RecoverTriggerTasks, curServer.ID)
go SendNotification(alert.NotificationTag, message, true, &curServer)
}
alertsPrevState[alert.ID][server.ID] = _RuleCheckPass
diff --git a/service/singleton/crontask.go b/service/singleton/crontask.go
index 8cd26d7..bf721ea 100644
--- a/service/singleton/crontask.go
+++ b/service/singleton/crontask.go
@@ -3,9 +3,10 @@ package singleton
import (
"bytes"
"fmt"
- "github.com/jinzhu/copier"
"sync"
+ "github.com/jinzhu/copier"
+
"github.com/robfig/cron/v3"
"github.com/naiba/nezha/model"
@@ -32,6 +33,11 @@ func LoadCronTasks() {
var notificationTagList []string
notificationMsgMap := make(map[string]*bytes.Buffer)
for i := 0; i < len(crons); i++ {
+ // 触发任务类型无需注册
+ if crons[i].TaskType == model.CronTypeTriggerTask {
+ Crons[crons[i].ID] = &crons[i]
+ continue
+ }
// 旧版本计划任务可能不存在通知组 为其添加默认通知组
if crons[i].NotificationTag == "" {
crons[i].NotificationTag = "default"
@@ -63,12 +69,51 @@ func ManualTrigger(c model.Cron) {
CronTrigger(c)()
}
-func CronTrigger(cr model.Cron) func() {
+func SendTriggerTasks(taskIDs []uint64, triggerServer uint64) {
+ CronLock.RLock()
+ var cronLists []*model.Cron
+ for _, taskID := range taskIDs {
+ if c, ok := Crons[taskID]; ok {
+ cronLists = append(cronLists, c)
+ }
+ }
+ CronLock.RUnlock()
+
+ // 依次调用CronTrigger发送任务
+ for _, c := range cronLists {
+ go CronTrigger(*c, triggerServer)()
+ }
+}
+
+func CronTrigger(cr model.Cron, triggerServer ...uint64) func() {
crIgnoreMap := make(map[uint64]bool)
for j := 0; j < len(cr.Servers); j++ {
crIgnoreMap[cr.Servers[j]] = true
}
return func() {
+ if cr.Cover == model.CronCoverAlertTrigger {
+ if len(triggerServer) == 0 {
+ return
+ }
+ ServerLock.RLock()
+ defer ServerLock.RUnlock()
+ if s, ok := ServerList[triggerServer[0]]; ok {
+ if s.TaskStream != nil {
+ s.TaskStream.Send(&pb.Task{
+ Id: cr.ID,
+ Data: cr.Command,
+ Type: model.TaskTypeCommand,
+ })
+ } else {
+ // 保存当前服务器状态信息
+ curServer := model.Server{}
+ copier.Copy(&curServer, s)
+ SendNotification(cr.NotificationTag, fmt.Sprintf("[任务失败] %s，服务器 %s 离线，无法执行。", cr.Name, s.Name), false, &curServer)
+ }
+ }
+ return
+ }
+
ServerLock.RLock()
defer ServerLock.RUnlock()
for _, s := range ServerList {
|