From f293304eec803fa44ac4852e1616894b343f804c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 26 Jun 2025 18:11:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0rpm=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=91=BD=E4=BB=A4=EF=BC=8C=E6=B7=BB=E5=8A=A0--nosigna?= =?UTF-8?q?ture=E3=80=81--nodeps=E5=92=8C--replacepkgs=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_element/service/ne_version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go index 74ecc3ae..793e6663 100644 --- a/src/modules/network_element/service/ne_version.go +++ b/src/modules/network_element/service/ne_version.go @@ -240,7 +240,7 @@ func (r NeVersion) operateCommand(action, neType string, neFilePaths []string) ( pkgCmdStr := fmt.Sprintf("sudo dpkg -i %s", strings.Join(neFilePaths, " ")) fileExt := filepath.Ext(strings.ToLower(neFilePaths[0])) if strings.HasSuffix(fileExt, "rpm") { - pkgCmdStr = fmt.Sprintf("sudo rpm -Uvh --reinstall %s", strings.Join(neFilePaths, " ")) + pkgCmdStr = fmt.Sprintf("sudo rpm -Uvh --nosignature --nodeps --replacepkgs %s", strings.Join(neFilePaths, " ")) } // 组合命令输入 @@ -258,7 +258,7 @@ func (r NeVersion) operateCommand(action, neType string, neFilePaths []string) ( // 升级软件包 pkgCmdStr = fmt.Sprintf("sudo dpkg -i %s", strings.Join(neFilePaths, " ")) if strings.HasSuffix(fileExt, "rpm") { - pkgCmdStr = fmt.Sprintf("sudo rpm -Uvh --reinstall %s", strings.Join(neFilePaths, " ")) + pkgCmdStr = fmt.Sprintf("sudo rpm -Uvh --nosignature --nodeps --replacepkgs %s", strings.Join(neFilePaths, " ")) } omcStrArr = append(omcStrArr, pkgCmdStr) } From 2787c544bb72b8800d7a64dfb9f693c54b5dacc4 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 27 Jun 2025 11:05:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E8=8E=B7=E5=8F=96=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8C=89=E6=97=B6=E9=97=B4=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E8=BF=91=E5=88=B0=E8=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/framework/ssh/files.go | 6 ++++++ src/framework/utils/file/files.go | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/src/framework/ssh/files.go b/src/framework/ssh/files.go index 61874fc7..66074717 100644 --- a/src/framework/ssh/files.go +++ b/src/framework/ssh/files.go @@ -2,6 +2,7 @@ package ssh import ( "fmt" + "sort" "strings" "be.ems/src/framework/cmd" @@ -99,5 +100,10 @@ func FileList(sshClient *ConnSSH, path, search string) ([]FileListRow, error) { FileName: fileName, }) } + + // 按时间排序 + sort.Slice(rows, func(i, j int) bool { + return rows[i].ModifiedTime > rows[j].ModifiedTime + }) return rows, nil } diff --git a/src/framework/utils/file/files.go b/src/framework/utils/file/files.go index 9f45e47a..80bbc8eb 100644 --- a/src/framework/utils/file/files.go +++ b/src/framework/utils/file/files.go @@ -3,6 +3,7 @@ package file import ( "os" "path/filepath" + "sort" ) // FileListRow 文件列表行数据 @@ -74,5 +75,9 @@ func FileList(path, search string) ([]FileListRow, error) { }) } + // 按时间排序 + sort.Slice(rows, func(i, j int) bool { + return rows[i].ModifiedTime > rows[j].ModifiedTime + }) return rows, nil } From 062a47f7af88e2d27db722486de58fe33df5098b Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 27 Jun 2025 11:18:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=82=AE=E4=BB=B6=E6=A0=87=E9=A2=98=EF=BC=8C=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E8=BD=AC=E5=8F=91=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/database/lite/common/ne_config.sql | 8 ++++---- build/database/std/common/ne_config.sql | 8 ++++---- build/default/omc.yaml | 9 +++++---- features/fm/email.go | 13 +++++++++---- lib/config/config.go | 1 + local/omc.yaml | 9 +++++---- local/param/omc_param_config.yaml | 7 +++++++ 7 files changed, 35 insertions(+), 20 deletions(-) diff --git a/build/database/lite/common/ne_config.sql b/build/database/lite/common/ne_config.sql index c4eb2c27..ce390fd5 100644 --- a/build/database/lite/common/ne_config.sql +++ b/build/database/lite/common/ne_config.sql @@ -133,10 +133,10 @@ INSERT INTO "ne_config" VALUES (240, 'CBC', 'system', 'System Config', 'list', ' INSERT INTO "ne_config" VALUES (241, 'CBC', 'amfProfile', 'AMF Profile', 'array', '[{"access":"read-only","comment":"0~15","display":"Index","filter":"0~15","name":"index","type":"int","value":"0"},{"access":"read-write","comment":"","display":"NF Name","filter":"0~64","name":"name","type":"string","value":"AMF"},{"access":"read-write","comment":"","display":"AMF URI","filter":"0~64","name":"uri","type":"string","value":"http://172.16.5.130:8080"},{"access":"read-write","comment":"","display":"PLMN ID","filter":"^[0-9]{5,6}$","name":"plmnId","type":"regex","value":"00101"},{"access":"read-write","comment":"0~16777215","display":"TAC","filter":"0~8","name":"tac","type":"string","value":"1"}]', 3, '', 1724327154499, 'public'); INSERT INTO "ne_config" VALUES (242, 'CBC', 'mmeProfile', 'MME Profile', 'array', '[{"access":"read-only","comment":"0~15","display":"Index","filter":"0~15","name":"index","type":"int","value":"0"},{"access":"read-write","comment":"","display":"NF Name","filter":"0~64","name":"name","type":"string","value":"MME"},{"access":"read-write","comment":"","display":"MME URI","filter":"0~64","name":"uri","type":"string","value":"sctp://192.168.1.1:9090"},{"access":"read-write","comment":"","display":"PLMN ID","filter":"^[0-9]{5,6}$","name":"plmnId","type":"regex","value":"00101"},{"access":"read-write","comment":"0~16777215","display":"TAC","filter":"0~8","name":"tac","type":"string","value":"1"}]', 5, '', 1724327154504, 'public'); --- OMC parameter config -INSERT INTO "ne_config" VALUES (260, 'OMC', 'alarmEmailForward', 'Alarm Email Forward Interface', 'list', '[{"access":"rw","comment":"Is it enabled forward alarm with Email interface","display":"Enable","filter":"true;false","name":"enable","type":"bool","value":"true"},{"access":"rw","comment":"","display":"Email List","filter":"","name":"emailList","type":"string","value":""},{"access":"rw","comment":"Email SMTP server","display":"SMTP Server","filter":"","name":"smtp","type":"string","value":""},{"access":"rw","comment":"","display":"Port","filter":"0~65535","name":"port","type":"int","value":""},{"access":"rw","comment":"","display":"User","filter":"","name":"user","type":"string","value":""},{"access":"rw","comment":"","display":"Password","filter":"","name":"password","type":"string","value":""},{"access":"rw","comment":"If skip TLS verify (true/false)","display":"TLS Skip Verify","filter":"true;false","name":"tlsSkipVerify","type":"bool","value":"true"}]', 3, '', 1725505025649, 'public'); -INSERT INTO "ne_config" VALUES (261, 'OMC', 'alarmSMSForward', 'Alarm SMS Forward Interface', 'list', '[{"access":"rw","comment":"Is it enabled forward alarm with SMS interface","display":"Enable","filter":"true;false","name":"enable","type":"bool","value":"true"},{"access":"rw","comment":"Multiple mobile separated by commas","display":"Mobile List","filter":"","name":"mobileList","type":"string","value":""},{"access":"rw","comment":"The SMSC SMPP Address","display":"SMSC Address","filter":"","name":"smscAddr","type":"string","value":""},{"access":"rw","comment":"","display":"System ID","filter":"","name":"systemID","type":"string","value":""},{"access":"rw","comment":"","display":"Password","filter":"","name":"password","type":"string","value":""},{"access":"rw","comment":"","display":"System Type","filter":"","name":"systemType","type":"string","value":""},{"access":"rw","comment":"Short message coding type","display":"Data Coding","filter":"{\"0\":\"GSM7BIT\",\"1\":\"ASCII\",\"2\":\"BINARY8BIT1\",\"3\":\"LATIN1\",\"4\":\"BINARY8BIT2\",\"6\":\"CYRILLIC\",\"7\":\"HEBREW\",\"8\":\"UCS2\"}","name":"dataCoding","type":"enum","value":"GSM7BIT"},{"access":"rw","comment":"It is the source address, the length is between 3 and 20","display":"Service Number","filter":"3~20","name":"serviceNumber","type":"string","value":"OMC"}]', 4, '', 1727664057261, 'public'); -INSERT INTO "ne_config" VALUES (262, 'OMC', 'trace', 'NE Signaling Trace', 'list', '[{\"access\":\"read-write\",\"comment\":\"enable or disable NE signaling trace creation\",\"display\":\"Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"enabled\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"NE signaling trace host address\",\"display\":\"Host\",\"filter\":\"0~128\",\"name\":\"host\",\"type\":\"ipv4\",\"value\":\"172.16.5.100\"},{\"access\":\"read-write\",\"comment\":\"NE signaling trace port\",\"display\":\"Port\",\"filter\":\"3000~65530\",\"name\":\"port\",\"type\":\"int\",\"value\":\"33033\"}]', 1, '', 1748570559170, 'public'); +-- 更新 OMC 配置 2025627 +INSERT INTO "ne_config" VALUES (260, 'OMC', 'alarmEmailForward', 'Alarm Email Forward Interface', 'list', '[{"access":"rw","comment":"Is it enabled forward alarm with Email interface","display":"Enable","filter":"true;false","name":"enable","type":"bool","value":"true"},{"access":"rw","comment":"string, no variable support","display":"Email Title","filter":"0~64","name":"title","type":"string","value":""},{"access":"rw","comment":"","display":"Email List","filter":"","name":"emailList","type":"string","value":""},{"access":"rw","comment":"Email SMTP server","display":"SMTP Server","filter":"","name":"smtp","type":"string","value":""},{"access":"rw","comment":"","display":"Port","filter":"0~65535","name":"port","type":"int","value":""},{"access":"rw","comment":"","display":"User","filter":"","name":"user","type":"string","value":""},{"access":"rw","comment":"","display":"Password","filter":"","name":"password","type":"string","value":""},{"access":"rw","comment":"If skip TLS verify (true/false)","display":"TLS Skip Verify","filter":"true;false","name":"tlsSkipVerify","type":"bool","value":"true"}]', 3, '', 1750993234226, 'public'); +INSERT INTO "ne_config" VALUES (261, 'OMC', 'alarmSMSForward', 'Alarm SMS Forward Interface', 'list', '[{"access":"rw","comment":"Is it enabled forward alarm with SMS interface","display":"Enable","filter":"true;false","name":"enable","type":"bool","value":"true"},{"access":"rw","comment":"Multiple mobile separated by commas","display":"Mobile List","filter":"","name":"mobileList","type":"string","value":""},{"access":"rw","comment":"The SMSC SMPP Address","display":"SMSC Address","filter":"","name":"smscAddr","type":"string","value":""},{"access":"rw","comment":"","display":"System ID","filter":"","name":"systemID","type":"string","value":""},{"access":"rw","comment":"","display":"Password","filter":"","name":"password","type":"string","value":""},{"access":"rw","comment":"","display":"System Type","filter":"","name":"systemType","type":"string","value":""},{"access":"rw","comment":"Short message coding type","display":"Data Coding","filter":"{\"0\":\"GSM7BIT\",\"1\":\"ASCII\",\"2\":\"BINARY8BIT1\",\"3\":\"LATIN1\",\"4\":\"BINARY8BIT2\",\"6\":\"CYRILLIC\",\"7\":\"HEBREW\",\"8\":\"UCS2\"}","name":"dataCoding","type":"enum","value":"GSM7BIT"},{"access":"rw","comment":"It is the source address, the length is between 3 and 20","display":"Service Number","filter":"3~20","name":"serviceNumber","type":"string","value":"OMC"}]', 4, '', 1750993234232, 'public'); +INSERT INTO "ne_config" VALUES (262, 'OMC', 'trace', 'NE Signaling Trace', 'list', '[{"access":"read-write","comment":"enable or disable NE signaling trace creation","display":"Enable","filter":"{\"0\":\"false\",\"1\":\"true\"}","name":"enabled","type":"bool","value":"false"},{"access":"read-write","comment":"NE signaling trace host address","display":"Host","filter":"0~128","name":"host","type":"ipv4","value":"172.16.5.100"},{"access":"read-write","comment":"NE signaling trace port","display":"Port","filter":"3000~65530","name":"port","type":"int","value":"33033"}]', 1, '', 1750993234209, 'public'); -- 更新 SMSC 配置 2025521 INSERT INTO "ne_config" VALUES (280, 'SMSC', 'system', 'System', 'list', '[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CDR Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"cdrFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SM Validity\",\"filter\":\"0-2147483647\",\"name\":\"smValidity\",\"type\":\"int\",\"value\":\"259200\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Log Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"logFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to unattainable local users.\",\"display\":\"Local Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"localPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to unattainable outbound roaming users.\",\"display\":\"Local Roaming Out Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"localRoamingOutPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to unattainable inbound roaming users.\",\"display\":\"Visitor Roaming In Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"visitorRoamingInPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to other unattainable users.\",\"display\":\"Other Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"otherPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Define the maximum port number that the queue of pending SMS may grow to.\",\"display\":\"Polling Number\",\"filter\":\"0-64\",\"name\":\"pollingNumber\",\"type\":\"int\",\"value\":\"64\"},{\"access\":\"read-write\",\"comment\":\"Specify the priority parameter of SM_RP_PRI. true = High; false = Low.\",\"display\":\"Priority Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"priorityFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable TP-Reply-Path parameter in the SMS-DELIVER data unit.\",\"display\":\"TP Reply Path Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"tpReplyPathFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SMSC Number\",\"filter\":\"0~32\",\"name\":\"smscNumber\",\"type\":\"string\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SMSC Domain\",\"filter\":\"0~16\",\"name\":\"smscDomain\",\"type\":\"string\",\"value\":\"0.0.0.0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CSFB VoLTE Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"csfbVolteFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Camel Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"camelFlag\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SCF Address\",\"filter\":\"0~16\",\"name\":\"scfAddress\",\"type\":\"string\",\"value\":\"0.0.0.0\"},{\"access\":\"read-write\",\"comment\":\"If add plus then set false\",\"display\":\"MT Id Format Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"mtIdFormatFlag\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"enable mcast sms\",\"display\":\"Mcast Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"mcastFlag\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Log Level\",\"filter\":\"{\\\"0\\\":\\\"none\\\",\\\"1\\\":\\\"error\\\",\\\"2\\\":\\\"debug\\\"}\",\"name\":\"logLevel\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"The MB sizeof log file\",\"display\":\"Log Size\",\"filter\":\"1-1000\",\"name\":\"logSize\",\"type\":\"int\",\"value\":\"200\"},{\"access\":\"read-write\",\"comment\":\"The number of log file\",\"display\":\"Log Number\",\"filter\":\"1-20\",\"name\":\"logNum\",\"type\":\"int\",\"value\":\"10\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Log Directory\",\"filter\":\"0~128\",\"name\":\"logDir\",\"type\":\"string\",\"value\":\"/var/log/\"}]', 1, '', 1747799255683, 'public'); diff --git a/build/database/std/common/ne_config.sql b/build/database/std/common/ne_config.sql index 0ddedc48..ff4ed5a2 100644 --- a/build/database/std/common/ne_config.sql +++ b/build/database/std/common/ne_config.sql @@ -134,10 +134,10 @@ INSERT INTO `ne_config` VALUES (240, 'CBC', 'system', 'System Config', 'list', ' INSERT INTO `ne_config` VALUES (241, 'CBC', 'amfProfile', 'AMF Profile', 'array', '[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NF Name\",\"filter\":\"0~64\",\"name\":\"name\",\"type\":\"string\",\"value\":\"AMF\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AMF URI\",\"filter\":\"0~64\",\"name\":\"uri\",\"type\":\"string\",\"value\":\"http://172.16.5.130:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PLMN ID\",\"filter\":\"^[0-9]{5,6}$\",\"name\":\"plmnId\",\"type\":\"regex\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"0~16777215\",\"display\":\"TAC\",\"filter\":\"0~8\",\"name\":\"tac\",\"type\":\"string\",\"value\":\"1\"}]', 3, '', 1724327154499, 'public'); INSERT INTO `ne_config` VALUES (242, 'CBC', 'mmeProfile', 'MME Profile', 'array', '[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NF Name\",\"filter\":\"0~64\",\"name\":\"name\",\"type\":\"string\",\"value\":\"MME\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"MME URI\",\"filter\":\"0~64\",\"name\":\"uri\",\"type\":\"string\",\"value\":\"sctp://192.168.1.1:9090\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PLMN ID\",\"filter\":\"^[0-9]{5,6}$\",\"name\":\"plmnId\",\"type\":\"regex\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"0~16777215\",\"display\":\"TAC\",\"filter\":\"0~8\",\"name\":\"tac\",\"type\":\"string\",\"value\":\"1\"}]', 5, '', 1724327154504, 'public'); --- OMC parameter config -INSERT INTO `ne_config` VALUES (260, 'OMC', 'alarmEmailForward', 'Alarm Email Forward Interface', 'list', '[{\"access\":\"rw\",\"comment\":\"Is it enabled forward alarm with Email interface\",\"display\":\"Enable\",\"filter\":\"true;false\",\"name\":\"enable\",\"type\":\"bool\",\"value\":\"true\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"Email List\",\"filter\":\"\",\"name\":\"emailList\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"Email SMTP server\",\"display\":\"SMTP Server\",\"filter\":\"\",\"name\":\"smtp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"Port\",\"filter\":\"0~65535\",\"name\":\"port\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"User\",\"filter\":\"\",\"name\":\"user\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"Password\",\"filter\":\"\",\"name\":\"password\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"If skip TLS verify (true/false)\",\"display\":\"TLS Skip Verify\",\"filter\":\"true;false\",\"name\":\"tlsSkipVerify\",\"type\":\"bool\",\"value\":\"true\"}]', 3, '', 1725505025649, 'public'); -INSERT INTO `ne_config` VALUES (261, 'OMC', 'alarmSMSForward', 'Alarm SMS Forward Interface', 'list', '[{\"access\":\"rw\",\"comment\":\"Is it enabled forward alarm with SMS interface\",\"display\":\"Enable\",\"filter\":\"true;false\",\"name\":\"enable\",\"type\":\"bool\",\"value\":\"true\"},{\"access\":\"rw\",\"comment\":\"Multiple mobile separated by commas\",\"display\":\"Mobile List\",\"filter\":\"\",\"name\":\"mobileList\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"The SMSC SMPP Address\",\"display\":\"SMSC Address\",\"filter\":\"\",\"name\":\"smscAddr\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"System ID\",\"filter\":\"\",\"name\":\"systemID\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"Password\",\"filter\":\"\",\"name\":\"password\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"System Type\",\"filter\":\"\",\"name\":\"systemType\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"Short message coding type\",\"display\":\"Data Coding\",\"filter\":\"{\\\"0\\\":\\\"GSM7BIT\\\",\\\"1\\\":\\\"ASCII\\\",\\\"2\\\":\\\"BINARY8BIT1\\\",\\\"3\\\":\\\"LATIN1\\\",\\\"4\\\":\\\"BINARY8BIT2\\\",\\\"6\\\":\\\"CYRILLIC\\\",\\\"7\\\":\\\"HEBREW\\\",\\\"8\\\":\\\"UCS2\\\"}\",\"name\":\"dataCoding\",\"type\":\"enum\",\"value\":\"GSM7BIT\"},{\"access\":\"rw\",\"comment\":\"It is the source address, the length is between 3 and 20\",\"display\":\"Service Number\",\"filter\":\"3~20\",\"name\":\"serviceNumber\",\"type\":\"string\",\"value\":\"OMC\"}]', 4, '', 1727664057261, 'public'); -INSERT INTO `ne_config` VALUES (262, 'OMC', 'trace', 'NE Signaling Trace', 'list', '[{\"access\":\"read-write\",\"comment\":\"enable or disable NE signaling trace creation\",\"display\":\"Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"enabled\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"NE signaling trace host address\",\"display\":\"Host\",\"filter\":\"0~128\",\"name\":\"host\",\"type\":\"ipv4\",\"value\":\"172.16.5.100\"},{\"access\":\"read-write\",\"comment\":\"NE signaling trace port\",\"display\":\"Port\",\"filter\":\"3000~65530\",\"name\":\"port\",\"type\":\"int\",\"value\":\"33033\"}]', 1, '', 1748570559170, 'public'); +-- 更新 OMC 配置 20250627 +INSERT INTO `ne_config` VALUES (260, 'OMC', 'alarmEmailForward', 'Alarm Email Forward Interface', 'list', '[{\"access\":\"rw\",\"comment\":\"Is it enabled forward alarm with Email interface\",\"display\":\"Enable\",\"filter\":\"true;false\",\"name\":\"enable\",\"type\":\"bool\",\"value\":\"true\"},{\"access\":\"rw\",\"comment\":\"string, no variable support\",\"display\":\"Email Title\",\"filter\":\"0~64\",\"name\":\"title\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"Email List\",\"filter\":\"\",\"name\":\"emailList\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"Email SMTP server\",\"display\":\"SMTP Server\",\"filter\":\"\",\"name\":\"smtp\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"Port\",\"filter\":\"0~65535\",\"name\":\"port\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"User\",\"filter\":\"\",\"name\":\"user\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"Password\",\"filter\":\"\",\"name\":\"password\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"If skip TLS verify (true/false)\",\"display\":\"TLS Skip Verify\",\"filter\":\"true;false\",\"name\":\"tlsSkipVerify\",\"type\":\"bool\",\"value\":\"true\"}]', 3, '', 1750993234226, 'public'); +INSERT INTO `ne_config` VALUES (261, 'OMC', 'alarmSMSForward', 'Alarm SMS Forward Interface', 'list', '[{\"access\":\"rw\",\"comment\":\"Is it enabled forward alarm with SMS interface\",\"display\":\"Enable\",\"filter\":\"true;false\",\"name\":\"enable\",\"type\":\"bool\",\"value\":\"true\"},{\"access\":\"rw\",\"comment\":\"Multiple mobile separated by commas\",\"display\":\"Mobile List\",\"filter\":\"\",\"name\":\"mobileList\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"The SMSC SMPP Address\",\"display\":\"SMSC Address\",\"filter\":\"\",\"name\":\"smscAddr\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"System ID\",\"filter\":\"\",\"name\":\"systemID\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"Password\",\"filter\":\"\",\"name\":\"password\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"\",\"display\":\"System Type\",\"filter\":\"\",\"name\":\"systemType\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"rw\",\"comment\":\"Short message coding type\",\"display\":\"Data Coding\",\"filter\":\"{\\\"0\\\":\\\"GSM7BIT\\\",\\\"1\\\":\\\"ASCII\\\",\\\"2\\\":\\\"BINARY8BIT1\\\",\\\"3\\\":\\\"LATIN1\\\",\\\"4\\\":\\\"BINARY8BIT2\\\",\\\"6\\\":\\\"CYRILLIC\\\",\\\"7\\\":\\\"HEBREW\\\",\\\"8\\\":\\\"UCS2\\\"}\",\"name\":\"dataCoding\",\"type\":\"enum\",\"value\":\"GSM7BIT\"},{\"access\":\"rw\",\"comment\":\"It is the source address, the length is between 3 and 20\",\"display\":\"Service Number\",\"filter\":\"3~20\",\"name\":\"serviceNumber\",\"type\":\"string\",\"value\":\"OMC\"}]', 4, '', 1750993234232, 'public'); +INSERT INTO `ne_config` VALUES (262, 'OMC', 'trace', 'NE Signaling Trace', 'list', '[{\"access\":\"read-write\",\"comment\":\"enable or disable NE signaling trace creation\",\"display\":\"Enable\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"enabled\",\"type\":\"bool\",\"value\":\"false\"},{\"access\":\"read-write\",\"comment\":\"NE signaling trace host address\",\"display\":\"Host\",\"filter\":\"0~128\",\"name\":\"host\",\"type\":\"ipv4\",\"value\":\"172.16.5.100\"},{\"access\":\"read-write\",\"comment\":\"NE signaling trace port\",\"display\":\"Port\",\"filter\":\"3000~65530\",\"name\":\"port\",\"type\":\"int\",\"value\":\"33033\"}]', 1, '', 1750993234209, 'public'); -- 更新 SMSC 配置 2025521 INSERT INTO `ne_config` VALUES (280, 'SMSC', 'system', 'System', 'list', '[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CDR Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"cdrFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SM Validity\",\"filter\":\"0-2147483647\",\"name\":\"smValidity\",\"type\":\"int\",\"value\":\"259200\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Log Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"logFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to unattainable local users.\",\"display\":\"Local Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"localPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to unattainable outbound roaming users.\",\"display\":\"Local Roaming Out Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"localRoamingOutPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to unattainable inbound roaming users.\",\"display\":\"Visitor Roaming In Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"visitorRoamingInPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable resend pending SMS to other unattainable users.\",\"display\":\"Other Polling Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"otherPollingFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Define the maximum port number that the queue of pending SMS may grow to.\",\"display\":\"Polling Number\",\"filter\":\"0-64\",\"name\":\"pollingNumber\",\"type\":\"int\",\"value\":\"64\"},{\"access\":\"read-write\",\"comment\":\"Specify the priority parameter of SM_RP_PRI. true = High; false = Low.\",\"display\":\"Priority Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"priorityFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"Enable or disable TP-Reply-Path parameter in the SMS-DELIVER data unit.\",\"display\":\"TP Reply Path Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"tpReplyPathFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SMSC Number\",\"filter\":\"0~32\",\"name\":\"smscNumber\",\"type\":\"string\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SMSC Domain\",\"filter\":\"0~16\",\"name\":\"smscDomain\",\"type\":\"string\",\"value\":\"0.0.0.0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"CSFB VoLTE Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"csfbVolteFlag\",\"type\":\"bool\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Camel Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"camelFlag\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SCF Address\",\"filter\":\"0~16\",\"name\":\"scfAddress\",\"type\":\"string\",\"value\":\"0.0.0.0\"},{\"access\":\"read-write\",\"comment\":\"If add plus then set false\",\"display\":\"MT Id Format Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"mtIdFormatFlag\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"enable mcast sms\",\"display\":\"Mcast Flag\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"mcastFlag\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Log Level\",\"filter\":\"{\\\"0\\\":\\\"none\\\",\\\"1\\\":\\\"error\\\",\\\"2\\\":\\\"debug\\\"}\",\"name\":\"logLevel\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"The MB sizeof log file\",\"display\":\"Log Size\",\"filter\":\"1-1000\",\"name\":\"logSize\",\"type\":\"int\",\"value\":\"200\"},{\"access\":\"read-write\",\"comment\":\"The number of log file\",\"display\":\"Log Number\",\"filter\":\"1-20\",\"name\":\"logNum\",\"type\":\"int\",\"value\":\"10\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Log Directory\",\"filter\":\"0~128\",\"name\":\"logDir\",\"type\":\"string\",\"value\":\"/var/log/\"}]', 1, '', 1747799255683, 'public'); diff --git a/build/default/omc.yaml b/build/default/omc.yaml index dd5d4c85..c1a1dae6 100644 --- a/build/default/omc.yaml +++ b/build/default/omc.yaml @@ -149,16 +149,17 @@ omc: # 4:BINARY8BIT2, 6:CYRILLIC, 7:HEBREW, 8:UCS2 alarm: alarmEmailForward: - enable: true - emailList: + enable: false + emailList: "" + title: "Alarm from OMC" smtp: mail.smtp.com port: 25 user: smtpext@smtp.com password: "1000smtp@omc!" tlsSkipVerify: true alarmSMSForward: - enable: true - mobileList: + enable: false + mobileList: "" smscAddr: "192.168.13.114:2775" systemID: "omc" password: "omc123" diff --git a/features/fm/email.go b/features/fm/email.go index 3db2c87c..eacca7d1 100644 --- a/features/fm/email.go +++ b/features/fm/email.go @@ -6,14 +6,14 @@ import ( "strings" "be.ems/lib/config" - "be.ems/lib/log" + neService "be.ems/src/modules/network_element/service" systemService "be.ems/src/modules/system/service" "gopkg.in/gomail.v2" ) func AlarmEmailForward(alarmData *Alarm) error { - log.Info("AlarmEmailForward processing... ") + neInfo := neService.NewNeInfo.FindByRmuid(alarmData.NeId) alarmStatus := "Clear" if alarmData.AlarmStatus == 1 { @@ -26,11 +26,15 @@ func AlarmEmailForward(alarmData *Alarm) error { severity = v.DataLabel } } - subjectTime := fmt.Sprintf("%s-%s-%s", severity, alarmData.NeName, alarmData.AlarmTitle) + subjectTitle := config.GetYamlConfig().Alarm.EmailForward.Title + if subjectTitle == "" { + subjectTitle = fmt.Sprintf("%s-%s-%s", alarmData.OrigSeverity, alarmData.NeName, alarmData.AlarmTitle) + } message := fmt.Sprintf(`

Alarm information

Sequence: %d

NE Name: %s

+

NE IP: %s

Title: %s

Severity: %s

Event Time: %s

@@ -39,6 +43,7 @@ func AlarmEmailForward(alarmData *Alarm) error { `, alarmData.AlarmSeq, alarmData.NeName, + neInfo.IP, alarmData.AlarmTitle, severity, alarmData.EventTime, @@ -93,7 +98,7 @@ func AlarmEmailForward(alarmData *Alarm) error { //m.SetHeader("To", "zhangshuzhong@agrandtech.com", "simonzhangsz@outlook.com") // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接 //m.SetHeader("Cc", "******@qq.com") // 抄送，可以多个 //m.SetHeader("Bcc", "******@qq.com") // 暗送，可以多个 - m.SetHeader("Subject", subjectTime) // 邮件主题 + m.SetHeader("Subject", subjectTitle) // 邮件主题 // text/html 的意思是将文件的 content-type 设置为 text/html 的形式，浏览器在获取到这种文件时会自动调用html的解析器对文件进行相应的处理。 // 可以通过 text/html 处理文本格式进行特殊处理，如换行、缩进、加粗等等 diff --git a/lib/config/config.go b/lib/config/config.go index 25818264..2ba6afae 100644 --- a/lib/config/config.go +++ b/lib/config/config.go @@ -113,6 +113,7 @@ type AlarmConfig struct { EmailForward struct { Enable bool `yaml:"enable" json:"enable"` EmailList string `yaml:"emailList" json:"emailList"` + Title string `yaml:"title" json:"title"` SMTP string `yaml:"smtp" json:"smtp"` Port uint16 `yaml:"port" json:"port"` User string `yaml:"user" json:"user"` diff --git a/local/omc.yaml b/local/omc.yaml index d9cf1d3a..f2adc98e 100644 --- a/local/omc.yaml +++ b/local/omc.yaml @@ -163,16 +163,17 @@ omc: # 4:BINARY8BIT2, 6:CYRILLIC, 7:HEBREW, 8:UCS2 alarm: alarmEmailForward: - enable: true - emailList: + enable: false + emailList: "" + title: "Alarm from OMC" smtp: mail.smtp.com port: 25 user: smtpext@smtp.com password: "1000smtp@omc!" tlsSkipVerify: true alarmSMSForward: - enable: true - mobileList: + enable: false + mobileList: "" smscAddr: "192.168.13.114:2775" systemID: "omc" password: "omc123" diff --git a/local/param/omc_param_config.yaml b/local/param/omc_param_config.yaml index 554ddc24..0b47d6a1 100644 --- a/local/param/omc_param_config.yaml +++ b/local/param/omc_param_config.yaml @@ -35,6 +35,13 @@ omc: filter: "true;false" display: "Enable" comment: "Is it enabled forward alarm with Email interface" + - name: "title" + type: "string" + value: "" + access: "rw" + filter: "0~64" + display: "Email Title" + comment: "string, no variable support" - name: "emailList" type: "string" value: "" From 7c70e125d64928c7985844028521c9bce4d17cee Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 27 Jun 2025 11:37:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?sql:=E4=BF=AE=E6=AD=A3UPF=E7=9B=B8=E5=85=B3?= =?UTF-8?q?KPI=E7=9A=84=E8=AE=A1=E7=AE=97=E5=85=AC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/database/lite/install/kpi_c_title.sql | 8 ++++---- build/database/lite/upgrade/upg_kpi_c_title.sql | 8 ++++---- build/database/std/install/kpi_c_title.sql | 8 ++++---- build/database/std/upgrade/upg_kpi_c_title.sql | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/database/lite/install/kpi_c_title.sql b/build/database/lite/install/kpi_c_title.sql index 2d17e716..19ed5903 100644 --- a/build/database/lite/install/kpi_c_title.sql +++ b/build/database/lite/install/kpi_c_title.sql @@ -41,11 +41,11 @@ INSERT INTO "kpi_c_title" VALUES (40, 'MME', 'MME.C.01', 'Combine Attach Success INSERT INTO "kpi_c_title" VALUES (41, 'MME', 'MME.C.02', 'Attach Success Rate', '(''MME.A.02''/''MME.A.01'')*100', '%', '', '1', 'admin', 1739362260083); INSERT INTO "kpi_c_title" VALUES (60, 'UPF', 'UPF.C.01', 'PFCP Establish Success Rate', '(''UPF.01''/''UPF.02'')*100', '%', '', '1', 'admin', 1739362260083); INSERT INTO "kpi_c_title" VALUES (61, 'UPF', 'UPF.C.02', 'N6_Uplink_Throughout', '(''UPF.03'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -INSERT INTO "kpi_c_title" VALUES (62, 'UPF', 'UPF.C.03', 'N3_Uplink_Throughout', '(''UPF.06'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -INSERT INTO "kpi_c_title" VALUES (63, 'UPF', 'UPF.C.06', 'N3_Downlink_Throughout', '(''UPF.05'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); +INSERT INTO "kpi_c_title" VALUES (62, 'UPF', 'UPF.C.03', 'N3_Uplink_Throughout', '(''UPF.05'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); +INSERT INTO "kpi_c_title" VALUES (63, 'UPF', 'UPF.C.06', 'N3_Downlink_Throughout', '(''UPF.06'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); INSERT INTO "kpi_c_title" VALUES (64, 'UPF', 'UPF.C.07', 'N6_Downlink_Throughout', '(''UPF.04'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -INSERT INTO "kpi_c_title" VALUES (65, 'UPF', 'UPF.C.08', 'Uplink Packet Loss Rate', '(((''UPF.06'')*8/5/1000/1000) - ((''UPF.03'')*8/5/1000/1000)) / ((''UPF.06'')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); -INSERT INTO "kpi_c_title" VALUES (66, 'UPF', 'UPF.C.09', 'Downlink Packet Loss Rate', '(((''UPF.04'')*8/5/1000/1000) - ((''UPF.05'')*8/5/1000/1000)) / ((''UPF.04'')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); +INSERT INTO "kpi_c_title" VALUES (65, 'UPF', 'UPF.C.08', 'Uplink Packet Loss Rate', '(((''UPF.05'')*8/5/1000/1000) - ((''UPF.03'')*8/5/1000/1000)) / ((''UPF.05'')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); +INSERT INTO "kpi_c_title" VALUES (66, 'UPF', 'UPF.C.09', 'Downlink Packet Loss Rate', '(((''UPF.04'')*8/5/1000/1000) - ((''UPF.06'')*8/5/1000/1000)) / ((''UPF.04'')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); INSERT INTO "kpi_c_title" VALUES (80, 'UDM', 'UDM.C.01', 'AMF_UECM_Success_Rate', '(''UDM.03''/''UDM.02'')*100', '%', '', '1', 'admin', 1739362260083); INSERT INTO "kpi_c_title" VALUES (81, 'UDM', 'UDM.C.02', 'SMF_UECM_Success_Rate', '(''UDM.04''/''UDM.05'')*100', '%', '', '1', 'admin', 1739362260083); INSERT INTO "kpi_c_title" VALUES (90, 'IMS', 'IMS.C.01', 'InitReg_Success_Rate', '(''SCSCF.03''/''SCSCF.04'')*100', '%', '', '1', 'admin', 1739362260083); diff --git a/build/database/lite/upgrade/upg_kpi_c_title.sql b/build/database/lite/upgrade/upg_kpi_c_title.sql index 01ebf850..9e683954 100644 --- a/build/database/lite/upgrade/upg_kpi_c_title.sql +++ b/build/database/lite/upgrade/upg_kpi_c_title.sql @@ -42,11 +42,11 @@ REPLACE INTO "kpi_c_title" VALUES (40, 'MME', 'MME.C.01', 'Combine Attach Succes REPLACE INTO "kpi_c_title" VALUES (41, 'MME', 'MME.C.02', 'Attach Success Rate', '(''MME.A.02''/''MME.A.01'')*100', '%', '', '1', 'admin', 1739362260083); REPLACE INTO "kpi_c_title" VALUES (60, 'UPF', 'UPF.C.01', 'PFCP Establish Success Rate', '(''UPF.01''/''UPF.02'')*100', '%', '', '1', 'admin', 1739362260083); REPLACE INTO "kpi_c_title" VALUES (61, 'UPF', 'UPF.C.02', 'N6_Uplink_Throughout', '(''UPF.03'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -REPLACE INTO "kpi_c_title" VALUES (62, 'UPF', 'UPF.C.03', 'N3_Uplink_Throughout', '(''UPF.06'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -REPLACE INTO "kpi_c_title" VALUES (63, 'UPF', 'UPF.C.06', 'N3_Downlink_Throughout', '(''UPF.05'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); +REPLACE INTO "kpi_c_title" VALUES (62, 'UPF', 'UPF.C.03', 'N3_Uplink_Throughout', '(''UPF.05'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); +REPLACE INTO "kpi_c_title" VALUES (63, 'UPF', 'UPF.C.06', 'N3_Downlink_Throughout', '(''UPF.06'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); REPLACE INTO "kpi_c_title" VALUES (64, 'UPF', 'UPF.C.07', 'N6_Downlink_Throughout', '(''UPF.04'')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -REPLACE INTO "kpi_c_title" VALUES (65, 'UPF', 'UPF.C.08', 'Uplink Packet Loss Rate', '(((''UPF.06'')*8/5/1000/1000) - ((''UPF.03'')*8/5/1000/1000)) / ((''UPF.06'')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); -REPLACE INTO "kpi_c_title" VALUES (66, 'UPF', 'UPF.C.09', 'Downlink Packet Loss Rate', '(((''UPF.04'')*8/5/1000/1000) - ((''UPF.05'')*8/5/1000/1000)) / ((''UPF.04'')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); +REPLACE INTO "kpi_c_title" VALUES (65, 'UPF', 'UPF.C.08', 'Uplink Packet Loss Rate', '(((''UPF.05'')*8/5/1000/1000) - ((''UPF.03'')*8/5/1000/1000)) / ((''UPF.05'')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); +REPLACE INTO "kpi_c_title" VALUES (66, 'UPF', 'UPF.C.09', 'Downlink Packet Loss Rate', '(((''UPF.04'')*8/5/1000/1000) - ((''UPF.06'')*8/5/1000/1000)) / ((''UPF.04'')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); REPLACE INTO "kpi_c_title" VALUES (80, 'UDM', 'UDM.C.01', 'AMF_UECM_Success_Rate', '(''UDM.03''/''UDM.02'')*100', '%', '', '1', 'admin', 1739362260083); REPLACE INTO "kpi_c_title" VALUES (81, 'UDM', 'UDM.C.02', 'SMF_UECM_Success_Rate', '(''UDM.04''/''UDM.05'')*100', '%', '', '1', 'admin', 1739362260083); REPLACE INTO "kpi_c_title" VALUES (90, 'IMS', 'IMS.C.01', 'InitReg_Success_Rate', '(''SCSCF.03''/''SCSCF.04'')*100', '%', '', '1', 'admin', 1739362260083); diff --git a/build/database/std/install/kpi_c_title.sql b/build/database/std/install/kpi_c_title.sql index 0d89c4a9..55fa97ad 100644 --- a/build/database/std/install/kpi_c_title.sql +++ b/build/database/std/install/kpi_c_title.sql @@ -33,11 +33,11 @@ INSERT INTO `kpi_c_title` VALUES (41, 'MME', 'MME.C.02', 'Attach Success Rate', INSERT INTO `kpi_c_title` VALUES (60, 'UPF', 'UPF.C.01', 'PFCP Establish Success Rate', '(\'UPF.01\'/\'UPF.02\')*100', '%', '', '1', 'admin', 1739362260083); INSERT INTO `kpi_c_title` VALUES (61, 'UPF', 'UPF.C.02', 'N6_Uplink_Throughout', '(\'UPF.03\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -INSERT INTO `kpi_c_title` VALUES (62, 'UPF', 'UPF.C.03', 'N3_Uplink_Throughout', '(\'UPF.06\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -INSERT INTO `kpi_c_title` VALUES (63, 'UPF', 'UPF.C.06', 'N3_Downlink_Throughout', '(\'UPF.05\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); +INSERT INTO `kpi_c_title` VALUES (62, 'UPF', 'UPF.C.03', 'N3_Uplink_Throughout', '(\'UPF.05\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); +INSERT INTO `kpi_c_title` VALUES (63, 'UPF', 'UPF.C.06', 'N3_Downlink_Throughout', '(\'UPF.06\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); INSERT INTO `kpi_c_title` VALUES (64, 'UPF', 'UPF.C.07', 'N6_Downlink_Throughout', '(\'UPF.04\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -INSERT INTO `kpi_c_title` VALUES (65, 'UPF', 'UPF.C.08', 'Uplink Packet Loss Rate', '(((\'UPF.06\')*8/5/1000/1000) - ((\'UPF.03\')*8/5/1000/1000)) / ((\'UPF.06\')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); -INSERT INTO `kpi_c_title` VALUES (66, 'UPF', 'UPF.C.09', 'Downlink Packet Loss Rate', '(((\'UPF.04\')*8/5/1000/1000) - ((\'UPF.05\')*8/5/1000/1000)) / ((\'UPF.04\')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); +INSERT INTO `kpi_c_title` VALUES (65, 'UPF', 'UPF.C.08', 'Uplink Packet Loss Rate', '(((\'UPF.05\')*8/5/1000/1000) - ((\'UPF.03\')*8/5/1000/1000)) / ((\'UPF.05\')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); +INSERT INTO `kpi_c_title` VALUES (66, 'UPF', 'UPF.C.09', 'Downlink Packet Loss Rate', '(((\'UPF.04\')*8/5/1000/1000) - ((\'UPF.06\')*8/5/1000/1000)) / ((\'UPF.04\')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); INSERT INTO `kpi_c_title` VALUES (80, 'UDM', 'UDM.C.01', 'AMF_UECM_Success_Rate', '(\'UDM.03\'/\'UDM.02\')*100', '%', '', '1', 'admin', 1739362260083); INSERT INTO `kpi_c_title` VALUES (81, 'UDM', 'UDM.C.02', 'SMF_UECM_Success_Rate', '(\'UDM.04\'/\'UDM.05\')*100', '%', '', '1', 'admin', 1739362260083); diff --git a/build/database/std/upgrade/upg_kpi_c_title.sql b/build/database/std/upgrade/upg_kpi_c_title.sql index fa53617a..28e3c566 100644 --- a/build/database/std/upgrade/upg_kpi_c_title.sql +++ b/build/database/std/upgrade/upg_kpi_c_title.sql @@ -39,11 +39,11 @@ REPLACE INTO `kpi_c_title` VALUES (41, 'MME', 'MME.C.02', 'Attach Success Rate', REPLACE INTO `kpi_c_title` VALUES (60, 'UPF', 'UPF.C.01', 'PFCP Establish Success Rate', '(\'UPF.01\'/\'UPF.02\')*100', '%', '', '1', 'admin', 1739362260083); REPLACE INTO `kpi_c_title` VALUES (61, 'UPF', 'UPF.C.02', 'N6_Uplink_Throughout', '(\'UPF.03\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -REPLACE INTO `kpi_c_title` VALUES (62, 'UPF', 'UPF.C.03', 'N3_Uplink_Throughout', '(\'UPF.06\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -REPLACE INTO `kpi_c_title` VALUES (63, 'UPF', 'UPF.C.06', 'N3_Downlink_Throughout', '(\'UPF.05\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); +REPLACE INTO `kpi_c_title` VALUES (62, 'UPF', 'UPF.C.03', 'N3_Uplink_Throughout', '(\'UPF.05\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); +REPLACE INTO `kpi_c_title` VALUES (63, 'UPF', 'UPF.C.06', 'N3_Downlink_Throughout', '(\'UPF.06\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); REPLACE INTO `kpi_c_title` VALUES (64, 'UPF', 'UPF.C.07', 'N6_Downlink_Throughout', '(\'UPF.04\')*8/5/1000/1000', 'Mbps', '', '1', 'admin', 1739362260083); -REPLACE INTO `kpi_c_title` VALUES (65, 'UPF', 'UPF.C.08', 'Uplink Packet Loss Rate', '(((\'UPF.06\')*8/5/1000/1000) - ((\'UPF.03\')*8/5/1000/1000)) / ((\'UPF.06\')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); -REPLACE INTO `kpi_c_title` VALUES (66, 'UPF', 'UPF.C.09', 'Downlink Packet Loss Rate', '(((\'UPF.04\')*8/5/1000/1000) - ((\'UPF.05\')*8/5/1000/1000)) / ((\'UPF.04\')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); +REPLACE INTO `kpi_c_title` VALUES (65, 'UPF', 'UPF.C.08', 'Uplink Packet Loss Rate', '(((\'UPF.05\')*8/5/1000/1000) - ((\'UPF.03\')*8/5/1000/1000)) / ((\'UPF.05\')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); +REPLACE INTO `kpi_c_title` VALUES (66, 'UPF', 'UPF.C.09', 'Downlink Packet Loss Rate', '(((\'UPF.04\')*8/5/1000/1000) - ((\'UPF.06\')*8/5/1000/1000)) / ((\'UPF.04\')*8/5/1000/1000) * 100', '%', '', '1', 'admin', 1739362260083); REPLACE INTO `kpi_c_title` VALUES (80, 'UDM', 'UDM.C.01', 'AMF_UECM_Success_Rate', '(\'UDM.03\'/\'UDM.02\')*100', '%', '', '1', 'admin', 1739362260083); REPLACE INTO `kpi_c_title` VALUES (81, 'UDM', 'UDM.C.02', 'SMF_UECM_Success_Rate', '(\'UDM.04\'/\'UDM.05\')*100', '%', '', '1', 'admin', 1739362260083);