OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 告警邮件转发时间格式错误

Browse Source
This commit is contained in:
TsMask
2025-06-27 19:18:04 +08:00
parent debd1ca859
commit f7114fffb2
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/fm/alarm.go
View File

@@ -475,7 +475,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
} }
if config.GetYamlConfig().Alarm.EmailForward.Enable { if config.GetYamlConfig().Alarm.EmailForward.Enable {
alarmData.EventTime = eventTimeGMT alarmData.AckUser = eventTimeGMT
if err = AlarmEmailForward(&alarmData); err != nil { if err = AlarmEmailForward(&alarmData); err != nil {
log.Error("Failed to AlarmEmailForward:", err) log.Error("Failed to AlarmEmailForward:", err)
} }

8
features/fm/email.go
View File

@@ -4,11 +4,9 @@ import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"strings" "strings"
"time"
"be.ems/lib/config" "be.ems/lib/config"
"be.ems/lib/dborm" "be.ems/lib/dborm"
"be.ems/lib/global"
"be.ems/lib/log" "be.ems/lib/log"
neService "be.ems/src/modules/network_element/service" neService "be.ems/src/modules/network_element/service"
@@ -38,7 +36,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
<p style="text-indent:1.5em">Event Time: %s</p> <p style="text-indent:1.5em">Event Time: %s</p>
<p style="text-indent:0.5em">Alarm Status: %s</p> <p style="text-indent:0.5em">Alarm Status: %s</p>
<p>Automatic sent by OMC, please do not reply!</p> <p>Automatic sent by OMC, please do not reply!</p>
`, alarmData.AlarmSeq, alarmData.NeName, neInfo.IP, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.EventTime, alarmStatus) `, alarmData.AlarmSeq, alarmData.NeName, neInfo.IP, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.AckUser, alarmStatus)
// message := fmt.Sprintf(` // message := fmt.Sprintf(`
// Alarm information // Alarm information
@@ -80,14 +78,14 @@ func AlarmEmailForward(alarmData *Alarm) error {
// return err // return err
// } // }
emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",") emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",")
eventTime := global.GetFmtTimeString(time.RFC3339, alarmData.EventTime, time.DateTime)
forwardLog := &dborm.AlarmForwardLog{ forwardLog := &dborm.AlarmForwardLog{
NeType: alarmData.NeType, NeType: alarmData.NeType,
NeID: alarmData.NeId, NeID: alarmData.NeId,
AlarmID: alarmData.AlarmId, AlarmID: alarmData.AlarmId,
AlarmTitle: alarmData.AlarmTitle, AlarmTitle: alarmData.AlarmTitle,
AlarmSeq: alarmData.AlarmSeq, AlarmSeq: alarmData.AlarmSeq,
EventTime: eventTime, EventTime: alarmData.EventTime,
Interface: "Email",
ToUser: config.GetYamlConfig().Alarm.EmailForward.EmailList, ToUser: config.GetYamlConfig().Alarm.EmailForward.EmailList,
} }