From 120940214f4c4d0c0d9b30118c9f63c29c50e8aa Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 22 Mar 2024 16:57:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BD=91=E5=85=83=E6=93=8D=E4=BD=9CAMF=20UPF=20UDM=20SMF=20=20?= =?UTF-8?q?NSSF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/database/upgrade/upg_sys_job.sql | 4 ++-- src/modules/nms_cxy/README.md | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build/database/upgrade/upg_sys_job.sql b/build/database/upgrade/upg_sys_job.sql index 0cd5e07..88da3c7 100644 --- a/build/database/upgrade/upg_sys_job.sql +++ b/build/database/upgrade/upg_sys_job.sql @@ -335,9 +335,9 @@ VALUES ( 'job.genNeStateAlarmRemark' ); -INSERT IGNORE INTO `sys_job` VALUES ('job.nms_cxy.performance_upload_oss', 'SYSTEM', 'performance_upload_oss', '{\"interval\":15,\"neTypes\":[\"AMF\",\"UPF\"]}', '0 0/15 * * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710819124454, 'job.nms_cxy.performance_upload_oss_remark'); +INSERT IGNORE INTO `sys_job` VALUES ('job.nms_cxy.performance_upload_oss', 'SYSTEM', 'performance_upload_oss', '{\"interval\":15,\"neTypes\":[\"AMF\",\"UPF\",\"UDM\",\"SMF\",\"NSSF\"]}', '0 0/15 * * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710819124454, 'job.nms_cxy.performance_upload_oss_remark'); INSERT IGNORE INTO `sys_job` VALUES ('job.nms_cxy.resource_upload_oss', 'SYSTEM', 'resource_upload_oss', '{\"neTypes\":[\"AMF\",\"UPF\"]}', '0 0 0,12 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710819133986, 'job.nms_cxy.resource_upload_oss_remark'); -INSERT IGNORE INTO `sys_job` VALUES ('job.nms_cxy.config_upload_oss', 'SYSTEM', 'config_upload_oss', '{\"neTypes\":[\"AMF\",\"UPF\"]}', '0 0 0,12 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710818082110, 'job.nms_cxy.config_upload_oss_remark'); +INSERT IGNORE INTO `sys_job` VALUES ('job.nms_cxy.config_upload_oss', 'SYSTEM', 'config_upload_oss', '{\"neTypes\":[\"AMF\",\"UPF\",\"UDM\",\"SMF\"]}', '0 0 0,12 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710818082110, 'job.nms_cxy.config_upload_oss_remark'); INSERT IGNORE INTO `sys_dict_data` VALUES (210, 210, 'job.nms_cxy.performance_upload_oss', '性能数据文件的上报', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); INSERT IGNORE INTO `sys_dict_data` VALUES (211, 211, 'job.nms_cxy.performance_upload_oss_remark', 'interval周期为15分钟。neTypes为数组对应上报数据的网元类型。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); INSERT IGNORE INTO `sys_dict_data` VALUES (212, 212, 'job.nms_cxy.performance_upload_oss', 'Reporting of performance data files', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); diff --git a/src/modules/nms_cxy/README.md b/src/modules/nms_cxy/README.md index 6283a8e..548206a 100644 --- a/src/modules/nms_cxy/README.md +++ b/src/modules/nms_cxy/README.md @@ -44,11 +44,17 @@ nmsCXY: secretAccessKey: "9tDErvtCEuVox6LoQu5BOVtycQKcQjlXOGvjl1eD" ``` + +## Kafka Topic + +告警数据订阅topic，名称为：专业编码-厂商编码-OMC编号-数据类别（固定为FM） +资源数据订阅topic，名称为：专业编码-厂商编码-OMC编号-网元类型-数据类别（固定为NRM）-资源对象类型简称（一般没有） + ## 数据库添加定时任务 ```sql -- 性能数据文件的上报 -INSERT IGNORE INTO `sys_job` VALUES ('job.nms_cxy.performance_upload_oss', 'SYSTEM', 'performance_upload_oss', '{\"interval\":15,\"neTypes\":[\"AMF\",\"UPF\"]}', '0 0/15 * * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710819124454, 'job.nms_cxy.performance_upload_oss_remark'); +INSERT IGNORE INTO `sys_job` VALUES ('job.nms_cxy.performance_upload_oss', 'SYSTEM', 'performance_upload_oss', '{\"interval\":15,\"neTypes\":[\"AMF\",\"UPF\",\"UDM\",\"SMF\",\"NSSF\"]}', '0 0/15 * * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710819124454, 'job.nms_cxy.performance_upload_oss_remark'); INSERT IGNORE INTO `sys_dict_data` VALUES (210, 210, 'job.nms_cxy.performance_upload_oss', '性能数据文件的上报', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); INSERT IGNORE INTO `sys_dict_data` VALUES (211, 211, 'job.nms_cxy.performance_upload_oss_remark', 'interval周期为15分钟。neTypes为数组对应上报数据的网元类型。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); INSERT IGNORE INTO `sys_dict_data` VALUES (212, 212, 'job.nms_cxy.performance_upload_oss', 'Reporting of performance data files', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); @@ -62,7 +68,7 @@ INSERT IGNORE INTO `sys_dict_data` VALUES (217, 217, 'job.nms_cxy.resource_uploa INSERT IGNORE INTO `sys_dict_data` VALUES (218, 218, 'job.nms_cxy.resource_upload_oss_remark', 'Full resource data files for network elements are reported to the OSS at 0000 and 1200 hours each day.', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -- 配置数据上报接口 -INSERT IGNORE INTO `sys_job` VALUES ('job.nms_cxy.config_upload_oss', 'SYSTEM', 'config_upload_oss', '{\"neTypes\":[\"AMF\",\"UPF\"]}', '0 0 0,12 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710818082110, 'job.nms_cxy.config_upload_oss_remark'); +INSERT IGNORE INTO `sys_job` VALUES ('job.nms_cxy.config_upload_oss', 'SYSTEM', 'config_upload_oss', '{\"neTypes\":[\"AMF\",\"UPF\",\"UDM\",\"SMF\"]}', '0 0 0,12 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710818082110, 'job.nms_cxy.config_upload_oss_remark'); INSERT IGNORE INTO `sys_dict_data` VALUES (220, 220, 'job.nms_cxy.config_upload_oss', '配置数据上报接口', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); INSERT IGNORE INTO `sys_dict_data` VALUES (221, 221, 'job.nms_cxy.config_upload_oss_remark', '配置数据上报时间为每日的0时及12时。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); INSERT IGNORE INTO `sys_dict_data` VALUES (222, 222, 'job.nms_cxy.config_upload_oss', 'Configure data reporting interface', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');