Merge remote-tracking branch 'origin/main' into lichang

2024-05-24 21:08:10 +08:00
parent 86525bac37 053fe3c429
commit 261a2a3d88
25 changed files with 322 additions and 97 deletions
--- a/captrace/makefile
+++ b/captrace/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2405.2
+VERSION = 2.2405.3
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
--- a/config/etc/default/restconf.yaml
+++ b/config/etc/default/restconf.yaml
@@ -79,11 +79,10 @@ mml:
  user: admin
  password: admin
  mmlHome: ./mmlhome
-  upload: /home/agtuser

 # NE config
 ne:
-  user: agtuser
+  user: manager
  etcdir: /usr/local/etc
  bindir: /usr/local/bin
  omcdir: /usr/local/omc
--- a/crontask/makefile
+++ b/crontask/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project

 PROJECT = OMC
-VERSION = 2.2405.2
+VERSION = 2.2405.3
 LIBDIR = be.ems/lib
 BINNAME = crontask

--- a/data2html/data2html.go
+++ b/data2html/data2html.go
@@ -77,7 +77,7 @@ func execTshark(html string, filename string, proto string, port int) {
 		//if err1 != nil {
 		//	fmt.Println("write html failed")
 		//}else {
-		//xsltproc pdml2html.xsl ngap.pdml > /home/agtuser/ngap.html
+		//xsltproc pdml2html.xsl ngap.pdml > /home/manager/ngap.html
 		command := fmt.Sprintf("xsltproc /usr/local/omc/etc/schema/pdml2html.xsl %s > %s", pdmlFile, html)
 		dest := exec.Command("sh", "-c", command)
 		_, err2 := dest.Output()
--- a/data2html/makefile
+++ b/data2html/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2405.2
+VERSION = 2.2405.3
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
--- a/database/install/alarm_event.sql
+++ b/database/install/alarm_event.sql
@@ -0,0 +1,63 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : local_mariadb
+ Source Server Type    : MariaDB
+ Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Host           : localhost:33066
+ Source Schema         : omc_db
+
+ Target Server Type    : MariaDB
+ Target Server Version : 100338 (10.3.38-MariaDB)
+ File Encoding         : 65001
+
+ Date: 24/05/2024 15:44:03
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for alarm_event
+-- ----------------------------
+DROP TABLE IF EXISTS `alarm_event`;
+CREATE TABLE `alarm_event`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `alarm_seq` int(11) NULL DEFAULT NULL,
+  `alarm_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `alarm_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `alarm_code` int(11) NULL DEFAULT NULL,
+  `event_time` datetime NULL DEFAULT NULL,
+  `alarm_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '',
+  `orig_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Minor' COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)',
+  `perceived_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)',
+  `pv_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `object_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `object_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0',
+  `object_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `location_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `province` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `alarm_status` int(11) NOT NULL DEFAULT 1 COMMENT '0:clear, 1:active',
+  `specific_problem` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `specific_problem_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `add_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `counter` int(11) NULL DEFAULT 0,
+  `latest_event_time` datetime NULL DEFAULT NULL,
+  `ack_state` tinyint(4) NULL DEFAULT 0 COMMENT '0: Unacked, 1: Acked',
+  `ack_time` datetime NULL DEFAULT NULL,
+  `ack_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `clear_type` tinyint(4) NULL DEFAULT 0 COMMENT '0: Unclear, 1: AutoClear, 2: ManualClear',
+  `clear_time` datetime NULL DEFAULT NULL,
+  `clear_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE INDEX `idx_pk_id`(`id`) USING BTREE,
+  UNIQUE INDEX `idx_uni_aid_ne_aseq`(`ne_type`, `ne_id`, `alarm_id`, `alarm_seq`) USING BTREE,
+  INDEX `idx_event_time`(`event_time`) USING BTREE,
+  INDEX `idx_severity_status`(`alarm_status`, `orig_severity`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 228788 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
--- a/database/upgrade/upg_alarm_event.sql
+++ b/database/upgrade/upg_alarm_event.sql
@@ -0,0 +1,62 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : local_mariadb
+ Source Server Type    : MariaDB
+ Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Host           : localhost:33066
+ Source Schema         : omc_db
+
+ Target Server Type    : MariaDB
+ Target Server Version : 100338 (10.3.38-MariaDB)
+ File Encoding         : 65001
+
+ Date: 24/05/2024 15:44:03
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for alarm_event
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `alarm_event`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `alarm_seq` int(11) NULL DEFAULT NULL,
+  `alarm_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `alarm_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `alarm_code` int(11) NULL DEFAULT NULL,
+  `event_time` datetime NULL DEFAULT NULL,
+  `alarm_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '',
+  `orig_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Minor' COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)',
+  `perceived_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)',
+  `pv_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `object_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `object_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0',
+  `object_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `location_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `province` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `alarm_status` int(11) NOT NULL DEFAULT 1 COMMENT '0:clear, 1:active',
+  `specific_problem` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `specific_problem_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `add_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `counter` int(11) NULL DEFAULT 0,
+  `latest_event_time` datetime NULL DEFAULT NULL,
+  `ack_state` tinyint(4) NULL DEFAULT 0 COMMENT '0: Unacked, 1: Acked',
+  `ack_time` datetime NULL DEFAULT NULL,
+  `ack_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `clear_type` tinyint(4) NULL DEFAULT 0 COMMENT '0: Unclear, 1: AutoClear, 2: ManualClear',
+  `clear_time` datetime NULL DEFAULT NULL,
+  `clear_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE INDEX `idx_pk_id`(`id`) USING BTREE,
+  UNIQUE INDEX `idx_uni_aid_ne_aseq`(`ne_type`, `ne_id`, `alarm_id`, `alarm_seq`) USING BTREE,
+  INDEX `idx_event_time`(`event_time`) USING BTREE,
+  INDEX `idx_severity_status`(`alarm_status`, `orig_severity`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 228788 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
--- a/database/upgvue3/upg_alarm_event.sql
+++ b/database/upgvue3/upg_alarm_event.sql
@@ -0,0 +1,62 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : local_mariadb
+ Source Server Type    : MariaDB
+ Source Server Version : 100338 (10.3.38-MariaDB)
+ Source Host           : localhost:33066
+ Source Schema         : omc_db
+
+ Target Server Type    : MariaDB
+ Target Server Version : 100338 (10.3.38-MariaDB)
+ File Encoding         : 65001
+
+ Date: 24/05/2024 15:44:03
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for alarm_event
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `alarm_event`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `alarm_seq` int(11) NULL DEFAULT NULL,
+  `alarm_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `alarm_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `alarm_code` int(11) NULL DEFAULT NULL,
+  `event_time` datetime NULL DEFAULT NULL,
+  `alarm_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '',
+  `orig_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Minor' COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)',
+  `perceived_severity` enum('Critical','Major','Minor','Warning','Event') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)',
+  `pv_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `ne_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `object_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `object_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0',
+  `object_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `location_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `province` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `alarm_status` int(11) NOT NULL DEFAULT 1 COMMENT '0:clear, 1:active',
+  `specific_problem` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `specific_problem_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `add_info` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `counter` int(11) NULL DEFAULT 0,
+  `latest_event_time` datetime NULL DEFAULT NULL,
+  `ack_state` tinyint(4) NULL DEFAULT 0 COMMENT '0: Unacked, 1: Acked',
+  `ack_time` datetime NULL DEFAULT NULL,
+  `ack_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `clear_type` tinyint(4) NULL DEFAULT 0 COMMENT '0: Unclear, 1: AutoClear, 2: ManualClear',
+  `clear_time` datetime NULL DEFAULT NULL,
+  `clear_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `timestamp` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE INDEX `idx_pk_id`(`id`) USING BTREE,
+  UNIQUE INDEX `idx_uni_aid_ne_aseq`(`ne_type`, `ne_id`, `alarm_id`, `alarm_seq`) USING BTREE,
+  INDEX `idx_event_time`(`event_time`) USING BTREE,
+  INDEX `idx_severity_status`(`alarm_status`, `orig_severity`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 228788 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
--- a/database/upgvue3/upg_sys_menu.sql
+++ b/database/upgvue3/upg_sys_menu.sql
@@ -802,28 +802,6 @@ SET
 WHERE
    `menu_id` = 2110;

-UPDATE `omc_db`.`sys_menu`
-SET
-    `menu_name` = 'menu.system.setting.i18n',
-    `parent_id` = 2114,
-    `menu_sort` = 1,
-    `path` = NULL,
-    `component` = NULL,
-    `is_frame` = '1',
-    `is_cache` = '1',
-    `menu_type` = 'B',
-    `visible` = '1',
-    `status` = '1',
-    `perms` = 'system:setting:i18n',
-    `icon` = '#',
-    `create_by` = 'supervisor',
-    `create_time` = 1700000000000,
-    `update_by` = 'supervisor',
-    `update_time` = 1700000000000,
-    `remark` = 'menu.system.setting.i18nRemark'
-WHERE
-    `menu_id` = 2122;
-
 UPDATE `omc_db`.`sys_menu`
 SET
    `menu_name` = 'menu.dashboard.cdr',
--- a/features/cm/software.go
+++ b/features/cm/software.go
@@ -697,19 +697,27 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 	if !config.GetYamlConfig().OMC.TestMode {
 		filePath := (*neVersion)[0]["path"]
 		sshHost := fmt.Sprintf("%s@%s", config.GetYamlConfig().NE.User, neInfo.Ip)
-		srcFile := fmt.Sprintf("%s/actpkg.sh", config.GetYamlConfig().OMC.BinDir)

+		runCmd := fmt.Sprintf("sudo rm -f %s/actpkg.sh", config.GetYamlConfig().NE.ScpDir)
+		err = RunSSHCmd(sshHost, runCmd)
+		if err != nil {
+			log.Errorf("Failed to run cmd: %s", runCmd)
+			services.ResponseInternalServerError500ProcessError(w, err)
+			return
+		}
+
+		srcFile := fmt.Sprintf("%s/actpkg.sh", config.GetYamlConfig().OMC.BinDir)
 		scpDir := fmt.Sprintf("%s@%s:%s", config.GetYamlConfig().NE.User,
 			neInfo.Ip, config.GetYamlConfig().NE.ScpDir)
 		cmd := exec.Command("scp", "-r", srcFile, scpDir)
 		_, err := cmd.CombinedOutput()
 		if err != nil {
-			log.Errorf("Faile to scp NF: neType=%s, neId=%s, ip=%s", neType, neId, neInfo.Ip)
+			log.Errorf("Failed to scp NF: neType=%s, neId=%s, ip=%s", neType, neId, neInfo.Ip)
 			services.ResponseInternalServerError500ProcessError(w, err)
 			return
 		}

-		runCmd := fmt.Sprintf("sudo %s/actpkg.sh '%s' %s",
+		runCmd = fmt.Sprintf("sudo %s/actpkg.sh '%s' %s",
 			config.GetYamlConfig().NE.ScpDir, filePath, neTypeUpper)
 		if neTypeLower == "omc" {
 			idNeVersion, _ := strconv.Atoi((*neVersion)[0]["id"])
@@ -897,6 +905,14 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) {

 	if !config.GetYamlConfig().OMC.TestMode {
 		sshHost := fmt.Sprintf("%s@%s", config.GetYamlConfig().NE.User, neInfo.Ip)
+		runCmd := fmt.Sprintf("sudo rm -f %s/rbkpkg.sh", config.GetYamlConfig().NE.ScpDir)
+		err = RunSSHCmd(sshHost, runCmd)
+		if err != nil {
+			log.Errorf("Failed to run cmd: %s", runCmd)
+			services.ResponseInternalServerError500ProcessError(w, err)
+			return
+		}
+
 		srcFile := fmt.Sprintf("%s/rbkpkg.sh", config.GetYamlConfig().OMC.BinDir)

 		scpDir := fmt.Sprintf("%s@%s:%s", config.GetYamlConfig().NE.User,
@@ -909,7 +925,7 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 			return
 		}

-		runCmd := fmt.Sprintf("sudo %s/rbkpkg.sh '%s' %s",
+		runCmd = fmt.Sprintf("sudo %s/rbkpkg.sh '%s' %s",
 			config.GetYamlConfig().NE.ScpDir, filePath, neTypeUpper)
 		if neTypeLower == "omc" {
 			idNeVersion, _ := strconv.Atoi((*neVersion)[0]["id"])
--- a/features/fm/alarm.go
+++ b/features/fm/alarm.go
@@ -435,11 +435,20 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 				SetAlarmAckInfo(valueJson, &alarmData)
 			}
 			log.Debug("alarmData:", alarmData)
-			affected, err := session.Insert(alarmData)
-			if err != nil && affected <= 0 {
-				log.Error("Failed to insert alarm data:", err)
-				services.ResponseInternalServerError500DatabaseOperationFailed(w)
-				continue
+			if alarmData.OrigSeverity == "Event" && config.GetYamlConfig().Alarm.SplitEventAlarm {
+				affected, err := xEngine.Table("alarm_event").InsertOne(alarmData)
+				if err != nil && affected <= 0 {
+					log.Error("Failed to insert alarm_event:", err)
+					services.ResponseInternalServerError500ProcessError(w, err)
+					continue
+				}
+			} else {
+				affected, err := session.Insert(alarmData)
+				if err != nil && affected <= 0 {
+					log.Error("Failed to insert alarm data:", err)
+					services.ResponseInternalServerError500DatabaseOperationFailed(w)
+					continue
+				}
 			}
 			alarmLog := new(AlarmLog)
 			alarmLog.NeType = alarmData.NeType
@@ -451,7 +460,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			alarmLog.EventTime = eventTime
 			log.Trace("alarmLog:", alarmLog)

-			affected, err = session.Insert(alarmLog)
+			affected, err := session.Insert(alarmLog)
 			if err != nil && affected <= 0 {
 				log.Error("Failed to insert alarm_log:", err)
 			}
@@ -470,6 +479,28 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 	services.ResponseStatusOK200Null(w)
 }

+type AlarmEvent struct {
+	AlarmSeq          int    `json:"alarmSeq"`
+	AlarmId           string `json:"alarmId" xorm:"alarm_id"`
+	NeId              string `json:"neId"`
+	AlarmCode         int    `json:"alarmCode"`
+	AlarmTitle        string `json:"alarmTitle"`
+	EventTime         string `json:"eventTime"`
+	AlarmType         string `json:"alarmType"`
+	OrigSeverity      string `json:"origSeverity"`
+	PVFlag            string `json:"pvFlag" xorm:"pv_flag"`
+	NeName            string `json:"neName"`
+	NeType            string `json:"neType"`
+	ObjectUid         string `json:"objectUid" xorm:"object_uid"`
+	ObjectName        string `json:"objectName" xorm:"object_name"`
+	ObjectType        string `json:"objectType" xorm:"object_type"`
+	LocationInfo      string `json:"locationInfo"`
+	Province          string `json:"province"`
+	SpecificProblem   string `json:"specificProblem"`
+	SpecificProblemID string `json:"specificProblemID" xorm:"specific_problem_id"`
+	AddInfo           string `json:"addInfo"`
+}
+
 // process alarm get from NFs
 func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("GetAlarmFromNF processing... ")
--- a/4
+++ b/4
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2405.2
+VERSION = 2.2405.3
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
@@ -128,7 +128,7 @@ deb: $(BINNAME)
 	chmod +x $(DebBuildDir)/usr/local/omc/bin/*
 	#sed -i.bak 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control
 	sed -i 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control
-	perl -0777 -i -pe 's/ne:\n  user: root/ne:\n  user: agtuser/g' $(DebBuildDir)/usr/local/omc/etc/default/restconf.yaml
+	perl -0777 -i -pe 's/ne:\n  user: root/ne:\n  user: manager/g' $(DebBuildDir)/usr/local/omc/etc/default/restconf.yaml
 	dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(DebPkgFile)

 rpm: $(BINNAME)
--- a/misc/cpnetools.sh
+++ b/misc/cpnetools.sh
@@ -3,7 +3,7 @@
 tooldir=/usr/local/bin
 toollist="zip unzip"

-#分发到各个节点,这里分发到nehosts文件中的主机中.
+# distribute to hosts in file nehosts 
 while read line
  do
    if [[ "$line" =~ ^[^[:space:]]*# || -z "$line" ]]; then
--- a/misc/cpsshkey.sh
+++ b/misc/cpsshkey.sh
@@ -1,29 +1,36 @@
 #!/bin/bash

-# 判断id_rsa密钥文件是否存在
+# if exist id_rsa
 if [ ! -f ~/.ssh/id_rsa ];then
  ssh-keygen -t rsa -P "" -f ~/.ssh/id_rsa
 else
  echo "id_rsa has created ..."
 fi

-#分发到各个节点,这里分发到nehosts文件中的主机中.
+# distribute to hosts in file nehosts 
 while read line
  do
+    # ignore comment or null line
    if [[ "$line" =~ ^[^[:space:]]*# || -z "$line" ]]; then
      continue
    fi
-    user=`echo $line | cut -d " " -f 2`
+
    ip=`echo $line | cut -d " " -f 1`
+    user=`echo $line | cut -d " " -f 2`
    passwd=`echo $line | cut -d " " -f 3`

+    # !!! to remove ~/.ssh, all old authorized key will be lost
    expect <<EOF
      set timeout 10
-      spawn ssh-copy-id -f $user@$ip
+      spawn ssh $user@$ip "sudo rm -r ~/.ssh"
      expect {
        "yes/no" { send "yes\n";exp_continue }
-        "password" { send "$passwd\n" }
+        "password:" { send "$passwd\n" }
      }
-      expect "password" { send "$passwd\n" }
+      spawn ssh-copy-id -f $user@$ip
+      expect {
+        "password:" { send "$passwd\n" }
+      }
+      expect eof
 EOF
  done <  nehosts
--- a/misc/nehosts
+++ b/misc/nehosts
@@ -1,16 +1,16 @@
 # host user password
 # Example: 192.168.4.133 root password
-172.16.5.100 agtuser admin123
-172.16.5.110 agtuser admin123
-172.16.5.120 agtuser admin123
-172.16.5.130 agtuser admin123
-172.16.5.140 agtuser admin123
-172.16.5.150 agtuser admin123
-172.16.5.160 agtuser admin123
-172.16.5.170 agtuser admin123
-172.16.5.180 agtuser admin123
-172.16.5.190 agtuser admin123
-172.16.5.220 agtuser admin123
-172.16.5.230 agtuser admin123
-172.16.5.210 agtuser admin123
-172.16.5.200 agtuser admin123
+172.16.5.100 manager admin123
+172.16.5.110 manager admin123
+172.16.5.120 manager admin123
+172.16.5.130 manager admin123
+172.16.5.140 manager admin123
+172.16.5.150 manager admin123
+172.16.5.160 manager admin123
+172.16.5.170 manager admin123
+172.16.5.180 manager admin123
+172.16.5.190 manager admin123
+172.16.5.220 manager admin123
+172.16.5.230 manager admin123
+172.16.5.210 manager admin123
+172.16.5.200 manager admin123
--- a/misc/setomc.sh
+++ b/misc/setomc.sh
@@ -50,8 +50,8 @@ case "${M_ARG}" in
           done
           cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
           cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
-           perl -0777 -i -pe 's/agtuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
-           perl -0777 -i -pe 's/agtuser/bluearcus/g' ${OMCBinDir}/nehosts
+           perl -0777 -i -pe 's/manager/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
+           perl -0777 -i -pe 's/manager/bluearcus/g' ${OMCBinDir}/nehosts
        fi       
        ;;
    upgrade | upgvue3)
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@

 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2405.2
+VERSION=2.2405.3
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
--- a/restagent/config/config.go
+++ b/restagent/config/config.go
@@ -81,30 +81,7 @@ type YamlConfig struct {
 		CmdTimeout       int    `yaml:"cmdTimeout"`
 	} `yaml:"omc"`

-	Alarm struct {
-		ForwardAlarm bool   `yaml:"forwardAlarm"`
-		SMProxy      string `yaml:"smProxy"`
-		Email        struct {
-			Smtp          string `yaml:"smtp"`
-			Port          uint16 `yaml:"port"`
-			User          string `yaml:"user"`
-			Password      string `yaml:"password"`
-			TlsSkipVerify bool   `yaml:"tlsSkipVerify"`
-		} `yaml:"email"`
-		SMS struct {
-			ApiURL          string `yaml:"apiURL"`
-			AccessKeyID     string `yaml:"AccessKeyID"`
-			AccessKeySecret string `yaml:"accessKeySecret"`
-			SignName        string `yaml:"signName"`
-			TemplateCode    string `yaml:"templateCode"`
-		} `yaml:"sms"`
-		SMSC struct {
-			Addr       string `yaml:"addr"`
-			SystemID   string `yaml:"systemID"`
-			Password   string `yaml:"password"`
-			SystemType string `yaml:"systemType"`
-		} `yaml:"smsc"`
-	} `yaml:"alarm"`
+	Alarm AlarmConfig `yaml:"alarm"`

 	MML MMLParam `yaml:"mml"`

@@ -169,6 +146,32 @@ type DbConfig struct {
 	Backup    string `yaml:"backup"`
 }

+type AlarmConfig struct {
+	SplitEventAlarm bool   `yaml:"splitEventAlarm"`
+	ForwardAlarm    bool   `yaml:"forwardAlarm"`
+	SMProxy         string `yaml:"smProxy"`
+	Email           struct {
+		Smtp          string `yaml:"smtp"`
+		Port          uint16 `yaml:"port"`
+		User          string `yaml:"user"`
+		Password      string `yaml:"password"`
+		TlsSkipVerify bool   `yaml:"tlsSkipVerify"`
+	} `yaml:"email"`
+	SMS struct {
+		ApiURL          string `yaml:"apiURL"`
+		AccessKeyID     string `yaml:"AccessKeyID"`
+		AccessKeySecret string `yaml:"accessKeySecret"`
+		SignName        string `yaml:"signName"`
+		TemplateCode    string `yaml:"templateCode"`
+	} `yaml:"sms"`
+	SMSC struct {
+		Addr       string `yaml:"addr"`
+		SystemID   string `yaml:"systemID"`
+		Password   string `yaml:"password"`
+		SystemType string `yaml:"systemType"`
+	} `yaml:"smsc"`
+}
+
 type MMLParam struct {
 	Port       int    `yaml:"port"`
 	Port2      int    `yaml:"port2"`
@@ -180,7 +183,6 @@ type MMLParam struct {
 	User       string `yaml:"user"`
 	Password   string `ymal:"password"`
 	MmlHome    string `yaml:"mmlHome"`
-	Upload     string `yaml:"upload"`
 }

 type TestDatas struct {
@@ -228,6 +230,9 @@ func NewYamlConfig() YamlConfig {
 			SizeCol:    128,
 			BufferSize: 65535,
 		},
+		Alarm: AlarmConfig{
+			SplitEventAlarm: true,
+		},
 	}
 }

--- a/restagent/etc/restconf-t.yaml
+++ b/restagent/etc/restconf-t.yaml
@@ -79,7 +79,7 @@ mml:
  user: admin
  password: admin
  mmlHome: ./mmlhome
-  upload: /home/agtuser
+  upload: /home/manager

 # NE config
 ne:
--- a/restagent/etc/restconf.yaml
+++ b/restagent/etc/restconf.yaml
@@ -84,7 +84,6 @@ mml:
  user: admin
  password: admin
  mmlHome: ./mmlhome
-  upload: /home/agtuser

 # NE config
 ne:
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2405.2
+VERSION = 2.2405.3
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
--- a/src/framework/config/config/config.default.yaml
+++ b/src/framework/config/config/config.default.yaml
@@ -1,7 +1,7 @@
 # 项目信息
 framework:
  name: "CN EMS"
-  version: "2.2405.2"
+  version: "2.2405.3"

 # 应用服务配置
 server:
--- a/src/framework/utils/repo/repo.go
+++ b/src/framework/utils/repo/repo.go
@@ -20,7 +20,7 @@ func PageNumSize(pageNum, pageSize any) (int64, int64) {

 	// 显示记录数
 	size := parse.Number(pageSize)
-	if size < 0 {
+	if size < 1 {
 		size = 10
 	}
 	return num - 1, size
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project

 PROJECT = OMC
-VERSION = 2.2405.2
+VERSION = 2.2405.3
 LIBDIR = be.ems/lib
 BINNAME = sshsvc

--- a/tools/misc/tables_s.lst
+++ b/tools/misc/tables_s.lst
@@ -1,5 +1,6 @@
 4a_log
 alarm
+alarm_event
 alarm_forward_log
 alarm_log
 alarm_relation
@@ -53,6 +54,8 @@ user
 user_menu
 user_role
 cdr_event
+cdr_event_ims
+cdr_event_smf
 ue_event
 kpi_report
 #end