diff --git a/agent/app/service/cronjob_helper.go b/agent/app/service/cronjob_helper.go index f2ef92aca..cbb0ba690 100644 --- a/agent/app/service/cronjob_helper.go +++ b/agent/app/service/cronjob_helper.go @@ -48,6 +48,7 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) { global.LOG.Debugf("preper to handle cron job [%s] %s failed, err: %v", cronjob.Type, cronjob.Name, err) record.TaskID = "" cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), record.Records) + handleCronJobAlert(cronjob) return } if err := taskItem.Execute(); err != nil { diff --git a/frontend/src/views/setting/alert/dash/task/index.vue b/frontend/src/views/setting/alert/dash/task/index.vue index aef0fa574..6530c54a1 100644 --- a/frontend/src/views/setting/alert/dash/task/index.vue +++ b/frontend/src/views/setting/alert/dash/task/index.vue @@ -288,10 +288,6 @@ - - - - diff --git a/frontend/src/views/setting/alert/setting/email/index.vue b/frontend/src/views/setting/alert/setting/email/index.vue index 8c9721557..d01ff8fa0 100644 --- a/frontend/src/views/setting/alert/setting/email/index.vue +++ b/frontend/src/views/setting/alert/setting/email/index.vue @@ -36,30 +36,25 @@ - - {{ $t('xpack.alert.portHelper') }} - - SSL + SSL {{ $t('xpack.alert.sslHelper') }} - TLS + TLS diff --git a/frontend/src/views/setting/alert/setting/index.vue b/frontend/src/views/setting/alert/setting/index.vue index c82b6afea..850d5772f 100644 --- a/frontend/src/views/setting/alert/setting/index.vue +++ b/frontend/src/views/setting/alert/setting/index.vue @@ -106,7 +106,7 @@ - + {{ $t('xpack.alert.smsConfig') }}