From d5c02dee551e01bbe741107bea520d85b53857d5 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 5 Jan 2024 16:35:26 +0800 Subject: [PATCH] fix: alarm locationInfo --- database/upgrade/upg_sys_job.sql | 2 +- database/upgvue3/upg_sys_job.sql | 2 +- features/fm/alarm.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/database/upgrade/upg_sys_job.sql b/database/upgrade/upg_sys_job.sql index 465e8c59..fdb18509 100644 --- a/database/upgrade/upg_sys_job.sql +++ b/database/upgrade/upg_sys_job.sql @@ -322,7 +322,7 @@ VALUES ( 'job.genNeStateAlarm', 'SYSTEM', 'genNeStateAlarm', - '{\"AlarmID\":\"HXEMSSM10000\",\"alarmCode\":\"10000\",\"alarmTitle\":\"The system state is abnormal\",\"neType\":\"OMC\",\"alarmType\":\"EquipmentAlarm\",\"origSeverity\": \"Major\",\"objectName\":\"EMS;SystemManagement;Heartbeat\",\"objectType\":\"SystemState\",\"specificProblem\":\"Alarm cause: the system state of target NE has not been received for {threshold} seconds\", \"specificProblemID\":\"AC10000\",\"threshold\":30}', + '{\"alarmID\":\"HXEMSSM10000\",\"alarmCode\":10000,\"alarmTitle\":\"The system state is abnormal\",\"neType\":\"OMC\",\"alarmType\":\"EquipmentAlarm\",\"origSeverity\": \"Major\",\"objectName\":\"EMS;SystemManagement;Heartbeat\",\"objectType\":\"SystemState\",\"specificProblem\":\"Alarm cause: the system state of target NE has not been received for {threshold} seconds\", \"specificProblemID\":\"AC10000\",\"threshold\":30}', '0/5 * * * * ?', '3', '0', diff --git a/database/upgvue3/upg_sys_job.sql b/database/upgvue3/upg_sys_job.sql index 4e79db25..ce565000 100644 --- a/database/upgvue3/upg_sys_job.sql +++ b/database/upgvue3/upg_sys_job.sql @@ -418,7 +418,7 @@ VALUES ( 'job.genNeStateAlarm', 'SYSTEM', 'genNeStateAlarm', - '{\"AlarmID\":\"HXEMSSM10000\",\"alarmCode\":\"10000\",\"alarmTitle\":\"The system state is abnormal\",\"neType\":\"OMC\",\"alarmType\":\"EquipmentAlarm\",\"origSeverity\": \"Major\",\"objectName\":\"EMS;SystemManagement;Heartbeat\",\"objectType\":\"SystemState\",\"specificProblem\":\"Alarm cause: the system state of target NE has not been received for {threshold} seconds\", \"specificProblemID\":\"AC10000\",\"threshold\":30}', + '{\"alarmID\":\"HXEMSSM10000\",\"alarmCode\":10000,\"alarmTitle\":\"The system state is abnormal\",\"neType\":\"OMC\",\"alarmType\":\"EquipmentAlarm\",\"origSeverity\": \"Major\",\"objectName\":\"EMS;SystemManagement;Heartbeat\",\"objectType\":\"SystemState\",\"specificProblem\":\"Alarm cause: the system state of target NE has not been received for {threshold} seconds\", \"specificProblemID\":\"AC10000\",\"threshold\":30}', '0/5 * * * * ?', '3', '0', diff --git a/features/fm/alarm.go b/features/fm/alarm.go index 06be5fed..840d2287 100644 --- a/features/fm/alarm.go +++ b/features/fm/alarm.go @@ -407,9 +407,9 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { alarmData.LocationInfo = fmt.Sprintf("Host:%s", r.RemoteAddr) } if alarmData.AddInfo == "" { - alarmData.LocationInfo = fmt.Sprintf("subNeInfo:%s", alarmData.NeType) + alarmData.AddInfo = fmt.Sprintf("subNeInfo:%s", alarmData.NeType) } - if IsNeedToAckAlarm(valueJson, &alarmData) == true { + if IsNeedToAckAlarm(valueJson, &alarmData) { SetAlarmAckInfo(valueJson, &alarmData) } log.Debug("alarmData:", alarmData)