From 33887c38e6cc8e9c7f143b443f9bea684aa88e1c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 16 Jul 2024 11:42:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B72.2407.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++++ captrace/makefile | 2 +- crontask/makefile | 2 +- data2html/makefile | 2 +- makefile | 2 +- mkpkg.sh | 2 +- restagent/makefile | 2 +- src/framework/config/config/config.default.yaml | 2 +- sshsvc/makefile | 2 +- 9 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70f1851c..c8f2ef5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 版本发布日志 +## 2.2407.3-20240716 + +- 更新 参数配置UPF参数属性dataForwarderCommon +- 修复 移除omc脚本命令前的sudo + ## 2.2407.2-20240712 - 修复 网元版本安装MME写入host文件ip错误 diff --git a/captrace/makefile b/captrace/makefile index d1cd8cb9..0f67fe6d 100644 --- a/captrace/makefile +++ b/captrace/makefile @@ -1,7 +1,7 @@ # Makefile for rest agent project PROJECT = OMC -VERSION = 2.2407.2 +VERSION = 2.2407.3 PLATFORM = amd64 ARMPLATFORM = aarch64 BUILDDIR = ../../build diff --git a/crontask/makefile b/crontask/makefile index c18cd4ae..690bc389 100644 --- a/crontask/makefile +++ b/crontask/makefile @@ -1,7 +1,7 @@ # Makefile for OMC-OMC-crontask project PROJECT = OMC -VERSION = 2.2407.2 +VERSION = 2.2407.3 LIBDIR = be.ems/lib BINNAME = crontask diff --git a/data2html/makefile b/data2html/makefile index 8b8e1456..8175ee49 100644 --- a/data2html/makefile +++ b/data2html/makefile @@ -1,7 +1,7 @@ # Makefile for rest agent project PROJECT = OMC -VERSION = 2.2407.2 +VERSION = 2.2407.3 RelDate = `date +%Y%m%d` Release = $(RelDate) RelVer = $(VERSION)-$(RelDate) diff --git a/makefile b/makefile index f99dd0f5..0dcb5bfb 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ ProjectL = omc ProjectU = OMC PROJECT = $(ProjectL) -VERSION = 2.2407.2 +VERSION = 2.2407.3 RelDate = `date +%Y%m%d` Release = $(RelDate) RelVer = $(VERSION)-$(RelDate) diff --git a/mkpkg.sh b/mkpkg.sh index 9ff67bd9..c5ce36e8 100644 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -2,7 +2,7 @@ ProcList="restagent crontask sshsvc captrace data2html" ProjectL=omc -VERSION=2.2407.2 +VERSION=2.2407.3 RelDate=`date +%Y%m%d` Release=${RelDate} RelVer=${VERSION}-${RelDate} diff --git a/restagent/makefile b/restagent/makefile index 97934ee6..ff761071 100644 --- a/restagent/makefile +++ b/restagent/makefile @@ -1,7 +1,7 @@ # Makefile for rest agent project PROJECT = OMC -VERSION = 2.2407.2 +VERSION = 2.2407.3 PLATFORM = amd64 ARMPLATFORM = aarch64 BUILDDIR = ../../build diff --git a/src/framework/config/config/config.default.yaml b/src/framework/config/config/config.default.yaml index f9640efe..23260483 100644 --- 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.2407.2" + version: "2.2407.3" # 应用服务配置 server: diff --git a/sshsvc/makefile b/sshsvc/makefile index 1c37581b..20e2f55b 100644 --- a/sshsvc/makefile +++ b/sshsvc/makefile @@ -1,7 +1,7 @@ # Makefile for OMC-OMC-crontask project PROJECT = OMC -VERSION = 2.2407.2 +VERSION = 2.2407.3 LIBDIR = be.ems/lib BINNAME = sshsvc From e9809c280ec4021854e4d5af832894682e4cbb64 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 16 Jul 2024 14:54:03 +0800 Subject: [PATCH 2/2] fix: parameter display error of kpiid --- database/common/mml_command.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/common/mml_command.sql b/database/common/mml_command.sql index 3612490c..302d0ed4 100644 --- a/database/common/mml_command.sql +++ b/database/common/mml_command.sql @@ -63,7 +63,7 @@ INSERT INTO `mml_command` VALUES (1614, 'OMC', 'pmTaskManagement', 'Performance INSERT INTO `mml_command` VALUES (1615, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'del', 'measuretask', 'Delete Performance Measure Task', '[{\"alias\":\"id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"false\",\"type\":\"string\"}]', 'Active'); INSERT INTO `mml_command` VALUES (1616, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'act', 'measuretask', 'Active Performance Measure Task', '[{\"alias\":\"id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"false\",\"type\":\"string\"}]', 'Active'); INSERT INTO `mml_command` VALUES (1617, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'dea', 'measuretask', 'Deactive Performance Measure Task', '[{\"alias\":\"id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"false\",\"type\":\"string\"}]', 'Active'); -INSERT INTO `mml_command` VALUES (1618, 'OMC', 'pmDataManagement', 'Performance Data Management', 'lst', 'measuredata', 'List Performance Data', '[{\"alias\":\"task_id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"kpi_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"kpiid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"start_time\\u003e\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure period start time(\\u003e=)\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"start_time\\u003c\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure period start time(\\u003c=)\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active'); +INSERT INTO `mml_command` VALUES (1618, 'OMC', 'pmDataManagement', 'Performance Data Management', 'lst', 'measuredata', 'List Performance Data', '[{\"alias\":\"task_id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"kpi_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"KPI ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"kpiid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"start_time\\u003e\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure period start time(\\u003e=)\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"start_time\\u003c\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure period start time(\\u003c=)\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active'); INSERT INTO `mml_command` VALUES (1619, 'OMC', 'logManagement', 'Log Management', 'lst', 'systemlog', 'List System Log', '[{\"alias\":\"process_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Process type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"processtype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"log_time\\u003e\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time more than\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"log_time\\u003c\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time less than\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active'); INSERT INTO `mml_command` VALUES (1620, 'OMC', 'logManagement', 'Log Management', 'lst', 'operationlog', 'List Operation Log', '[{\"alias\":\"account_name\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Account ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"accountid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"log_time\\u003e\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time more than\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"log_time\\u003c\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log Time Less Than\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active'); INSERT INTO `mml_command` VALUES (1621, 'OMC', 'logManagement', 'Log Management', 'lst', 'securitylog', 'List Security Log', '[{\"alias\":\"account_name\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Account ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"accountid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"op_time\\u003e\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time more than\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"op_time\\u003c\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time less than\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');