From 9b50581fd4bf55db098e5e57e5be0790f1a1ef8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com>
Date: Wed, 10 Sep 2025 11:28:50 +0800
Subject: [PATCH] fix: Fix alert issue remove some alert logs (#10322)

---
 agent/app/service/alert_helper.go             | 38 +++++++++----------
 .../src/views/setting/alert/dash/index.vue    |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/agent/app/service/alert_helper.go b/agent/app/service/alert_helper.go
index 04f0f2abe..07b230642 100644
--- a/agent/app/service/alert_helper.go
+++ b/agent/app/service/alert_helper.go
@@ -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
 }
diff --git a/frontend/src/views/setting/alert/dash/index.vue b/frontend/src/views/setting/alert/dash/index.vue
index 5997b1f5e..7f6e59146 100644
--- a/frontend/src/views/setting/alert/dash/index.vue
+++ b/frontend/src/views/setting/alert/dash/index.vue
@@ -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,