From 8087f705c009d30311072c203371b3cba2869c5e Mon Sep 17 00:00:00 2001
From: icey-yu <119291641+icey-yu@users.noreply.github.com>
Date: Tue, 23 Jul 2024 10:26:04 +0800
Subject: [PATCH] Fix search log (#2425)

* feat: update alert email template

* fix: search log

* fix: log support ex
---
 config/email.tmpl                     | 44 +++++++++++++++++++--------
 internal/rpc/third/log.go             |  5 +--
 pkg/common/storage/controller/user.go |  1 +
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/config/email.tmpl b/config/email.tmpl
index 0385601d0..824144e9d 100644
--- a/config/email.tmpl
+++ b/config/email.tmpl
@@ -1,16 +1,36 @@
 {{ define "email.to.html" }}
-{{ range .Alerts }}
-<!-- Begin of OpenIM Alert -->
-<div style="border:1px solid #ccc; padding:10px; margin-bottom:10px;">
-    <h3>OpenIM Alert</h3>
-    <p><strong>Alert Program:</strong> Prometheus Alert</p>
-    <p><strong>Severity Level:</strong> {{ .Labels.severity }}</p>
-    <p><strong>Alert Type:</strong> {{ .Labels.alertname }}</p>
-    <p><strong>Affected Host:</strong> {{ .Labels.instance }}</p>
-    <p><strong>Affected Service:</strong> {{ .Labels.job }}</p>
-    <p><strong>Alert Subject:</strong> {{ .Annotations.summary }}</p>
-    <p><strong>Trigger Time:</strong> {{ .StartsAt.Format "2006-01-02 15:04:05" }}</p>
-</div>
+{{ if eq .Status "firing" }}
+    {{ range .Alerts }}
+    <!-- Begin of OpenIM Alert -->
+    <div style="border:1px solid #ccc; padding:10px; margin-bottom:10px;">
+        <h3>OpenIM Alert</h3>
+        <p><strong>Alert Status:</strong> firing</p>
+        <p><strong>Alert Program:</strong> Prometheus Alert</p>
+        <p><strong>Severity Level:</strong> {{ .Labels.severity }}</p>
+        <p><strong>Alert Type:</strong> {{ .Labels.alertname }}</p>
+        <p><strong>Affected Host:</strong> {{ .Labels.instance }}</p>
+        <p><strong>Affected Service:</strong> {{ .Labels.job }}</p>
+        <p><strong>Alert Subject:</strong> {{ .Annotations.summary }}</p>
+        <p><strong>Trigger Time:</strong> {{ .StartsAt.Format "2006-01-02 15:04:05" }}</p>
+    </div>
+    {{ end }}
+
+
+{{ else if eq .Status "resolved" }}
+    {{ range .Alerts }}
+    <!-- Begin of OpenIM Alert -->
+    <div style="border:1px solid #ccc; padding:10px; margin-bottom:10px;">
+        <h3>OpenIM Alert</h3>
+        <p><strong>Alert Status:</strong> resolved</p>
+        <p><strong>Alert Program:</strong> Prometheus Alert</p>
+        <p><strong>Severity Level:</strong> {{ .Labels.severity }}</p>
+        <p><strong>Alert Type:</strong> {{ .Labels.alertname }}</p>
+        <p><strong>Affected Host:</strong> {{ .Labels.instance }}</p>
+        <p><strong>Affected Service:</strong> {{ .Labels.job }}</p>
+        <p><strong>Alert Subject:</strong> {{ .Annotations.summary }}</p>
+        <p><strong>Trigger Time:</strong> {{ .StartsAt.Format "2006-01-02 15:04:05" }}</p>
+    </div>
+    {{ end }}
 <!-- End of OpenIM Alert -->
 {{ end }}
 {{ end }}
diff --git a/internal/rpc/third/log.go b/internal/rpc/third/log.go
index 5c0b1f2e6..cd52727cb 100644
--- a/internal/rpc/third/log.go
+++ b/internal/rpc/third/log.go
@@ -50,13 +50,14 @@ func (t *thirdServer) UploadLogs(ctx context.Context, req *third.UploadLogsReq)
 	platform := constant.PlatformID2Name[int(req.Platform)]
 	for _, fileURL := range req.FileURLs {
 		log := relationtb.Log{
-			Version:    req.Version,
-			SystemType: req.SystemType,
 			Platform:   platform,
 			UserID:     userID,
 			CreateTime: time.Now(),
 			Url:        fileURL.URL,
 			FileName:   fileURL.Filename,
+			SystemType: req.SystemType,
+			Version:    req.Version,
+			Ex:         req.Ex,
 		}
 		for i := 0; i < 20; i++ {
 			id := genLogID()
diff --git a/pkg/common/storage/controller/user.go b/pkg/common/storage/controller/user.go
index 5ce8104e7..533eac78f 100644
--- a/pkg/common/storage/controller/user.go
+++ b/pkg/common/storage/controller/user.go
@@ -110,6 +110,7 @@ func (u *userDatabase) InitOnce(ctx context.Context, users []*model.User) error
 
 // FindWithError Get the information of the specified user and return an error if the userID is not found.
 func (u *userDatabase) FindWithError(ctx context.Context, userIDs []string) (users []*model.User, err error) {
+	userIDs = datautil.Distinct(userIDs)
 	users, err = u.cache.GetUsersInfo(ctx, userIDs)
 	if err != nil {
 		return