1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-30 02:36:18 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix alert issue remove some alert logs (#10322)

Browse source
This commit is contained in:
蘭 2025-09-10 11:28:50 +08:00 • committed by GitHub
parent ee33fdab89
commit 9b50581fd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
agent/app/service/alert_helper.go
View file

@ -377,16 +377,17 @@ func loadLoadInfo(alert dto.AlertDTO) {
func loadDiskUsage(alert dto.AlertDTO) {
newDate, err := alertRepo.GetTaskLog(alert.Type, alert.ID)
if err != nil || !isAlertDue(newDate) {
if err != nil {
global.LOG.Errorf("record not found, err: %v", err)
return
}
if strings.Contains(alert.Project, "all") {
err = processAllDisks(alert)
} else {
err = processSingleDisk(alert)
if isAlertDue(newDate) {
if strings.Contains(alert.Project, "all") {
err = processAllDisks(alert)
} else {
err = processSingleDisk(alert)
}
}
}
func loadPanelLogin(alert dto.AlertDTO) {
@ -515,12 +516,14 @@ func loadNodeException(alert dto.AlertDTO) {
},
}
newDate, err := alertRepo.GetTaskLog(alert.Type, alert.ID)
if err != nil || !isAlertDue(newDate) {
if err != nil {
global.LOG.Errorf("record not found, err: %v", err)
return
}
sender := NewAlertSender(alert, quotaType)
sender.ResourceSend(strconv.Itoa(int(failCount)), params)
if isAlertDue(newDate) {
sender := NewAlertSender(alert, quotaType)
sender.ResourceSend(strconv.Itoa(int(failCount)), params)
}
}
}
@ -542,12 +545,14 @@ func loadLicenseException(alert dto.AlertDTO) {
},
}
newDate, err := alertRepo.GetTaskLog(alert.Type, alert.ID)
if err != nil || !isAlertDue(newDate) {
if err != nil {
global.LOG.Errorf("record not found, err: %v", err)
return
}
sender := NewAlertSender(alert, quotaType)
sender.ResourceSend(strconv.Itoa(int(failCount)), params)
if isAlertDue(newDate) {
sender := NewAlertSender(alert, quotaType)
sender.ResourceSend(strconv.Itoa(int(failCount)), params)
}
}
}
@ -814,16 +819,11 @@ func processAllDisks(alert dto.AlertDTO) error {
global.LOG.Errorf("error getting disk list, err: %v", err)
return err
}
var flag bool
for _, item := range diskList {
if success, err := checkAndCreateDiskAlert(alert, item.Path); err == nil && success {
flag = true
global.LOG.Infof("disk alert pushed successfully for %s", item.Path)
}
}
if flag {
global.LOG.Info("all disk alert push successful")
}
return nil
}
@ -833,7 +833,7 @@ func processSingleDisk(alert dto.AlertDTO) error {
return err
}
if success {
global.LOG.Info("disk alert push successful")
global.LOG.Infof("disk alert pushed successfully for %s", alert.Project)
}
return nil
}

2
frontend/src/views/setting/alert/dash/index.vue
View file

@ -197,7 +197,7 @@ const buttons = [
const openView = async (
title: string,
rowData: Partial<Alert.AlertInfo> = {
type: 'panelPwdEndTime',
type: isMaster.value ? 'panelPwdEndTime' : 'sshLogin',
cycle: 15,
count: 0,
sendCount: 3,