diff --git a/crontask/gencmxml.go b/crontask/gencmxml.go index 528d8fe1..2add655d 100644 --- a/crontask/gencmxml.go +++ b/crontask/gencmxml.go @@ -86,7 +86,7 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error { nrmFile.FileHeader = cmschema.FileHeader{ TimeStamp: timestamp, TimeZone: tzOffset, - VendorName: "Ruijie Network", + VendorName: "RJ", ElementType: neType, CmVersion: global.Version, } diff --git a/database/upgrade/config.sql b/database/upgrade/config.sql index 328f048e..7ef02245 100644 --- a/database/upgrade/config.sql +++ b/database/upgrade/config.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : 192.168.0.229 - Source Server Type : MySQL - Source Server Version : 100335 - Source Host : 192.168.0.229:33066 + 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 : MySQL - Target Server Version : 100335 + Target Server Type : MariaDB + Target Server Version : 100338 (10.3.38-MariaDB) File Encoding : 65001 - Date: 17/08/2023 18:26:28 + Date: 17/08/2023 19:43:37 */ SET NAMES utf8mb4; @@ -25,13 +25,13 @@ CREATE TABLE `config` ( `id` int(11) NOT NULL AUTO_INCREMENT, `module_name` varchar(32) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL, `config_tag` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `title_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL, + `title_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL, `value` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL, - `value_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL, - `update_time` datetime(0) NULL DEFAULT current_timestamp(0) ON UPDATE CURRENT_TIMESTAMP(0), + `value_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL, + `update_time` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP, `comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 34 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 33 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of config @@ -50,14 +50,14 @@ INSERT INTO `config` VALUES (17, 'Security', 'highRisk', '{\"cn\":\"高危指令 INSERT INTO `config` VALUES (18, 'Gold', 'goldSet', '{\"cn\":\"黄金指标设置\",\"en\":\"Gold Index Setting\"}', NULL, '{\"goldWeek\":\"1\",\"omc_name\":\"23123\",\"login_url\":\"231231\",\"handshake_url\":\"321312\",\"grant_type\":\"321312\",\"user_name\":\"32131\",\"user_key\":\"22321\",\"max_data_len\":\"231\",\"kpi_report_url\":\"1231231\",\"time_out\":\"2131\"}', '2023-08-13 18:15:01', NULL); INSERT INTO `config` VALUES (19, 'Security', 'userTimeSet', '{\"cn\":\"账号有效期设置\",\"en\":\"Account validity period setting\"}', '18000', NULL, '2023-08-10 14:18:57', NULL); INSERT INTO `config` VALUES (20, 'Security', 'pwdStrong', '{\"cn\":\"密码强度设置\",\"en\":\"Account validity period setting\"}', NULL, '{\"pwdMinLength\":\"4\",\"pwdTime\":\"12\",\"strongNum\":\"1\",\"outTimeMsg\":\"密码有效期已过,请联系管理员进行修改密码\"}', '2023-08-14 20:18:21', NULL); -INSERT INTO `config` VALUES (22, 'Nbi', 'nbiSet', '{\"cn\":\"北向接口设置\",\"en\":\"Interface settings\"}', NULL, '{\"localIp\":\"21312\",\"localPort\":\"312\"}', '2023-08-13 18:48:38', NULL); -INSERT INTO `config` VALUES (25, 'SystemMonitor', 'cpuThreshold', '{\"cn\":\"CPU阈值及告警级别设置\",\"en\":\"threshold of CPU settings\"}', NULL, '{\"Major\":\"12\",\"Minor\":\"3\",\"Critical\":\"\",\"Warning\":\"\",\"Event\":\"\"}', '2023-08-17 16:28:46', NULL); +INSERT INTO `config` VALUES (22, 'Nbi', 'nbiSet', '{\"cn\":\"北向接口设置\",\"en\":\"Interface settings\"}', NULL, '{\"listeningAddress\":\"21312222222222222222\",\"listeningPort\":\"312\"}', '2023-08-17 10:25:17', NULL); +INSERT INTO `config` VALUES (25, 'SystemMonitor', 'cpuThreshold', '{\"cn\":\"CPU阈值及告警级别设置\",\"en\":\"threshold of CPU settings\"}', NULL, '{\"Major\":\"60\",\"Minor\":\"50\",\"Critical\":\"80\",\"Warning\":\"90\",\"Event\":\"75\"}', '2023-08-15 18:06:13', NULL); INSERT INTO `config` VALUES (26, 'SystemMonitor', 'sampleTime', '{\"cn\":\"系统监控采样时间设置\",\"en\":\"settings\"}', NULL, '{\"sampleTime\":\"1\"}', '2023-08-17 09:36:51', NULL); -INSERT INTO `config` VALUES (27, 'SystemMonitor', 'fileThreshold', '{\"cn\":\"文件资源阈值及告警级别设置\",\"en\":\"threshold of file threshold settings\"}', NULL, '{\"Major\":\"80\",\"Minor\":\"\",\"Critical\":\"\",\"Warning\":\"\",\"Event\":\"\"}', '2023-08-17 10:00:04', NULL); -INSERT INTO `config` VALUES (28, 'SystemMonitor', 'RAMThreshold', '{\"cn\":\"内存阈值及告警级别设置\",\"en\":\"threshold of RAM threshold settings\"}', NULL, '{\"Major\":\"23\",\"Minor\":\"\",\"Critical\":\"\",\"Warning\":\"\",\"Event\":\"\"}', '2023-08-17 16:28:49', NULL); +INSERT INTO `config` VALUES (27, 'SystemMonitor', 'fileThreshold', '{\"cn\":\"文件资源阈值及告警级别设置\",\"en\":\"threshold of file threshold settings\"}', NULL, '{\"type\":\"cpuThreshold\",\"Major\":\"12\",\"Minor\":\"\",\"Critical\":\"\",\"Warning\":\"\",\"Event\":\"\"}', '2023-08-15 18:44:18', NULL); +INSERT INTO `config` VALUES (28, 'SystemMonitor', 'RAMThreshold', '{\"cn\":\"内存阈值及告警级别设置\",\"en\":\"threshold of RAM threshold settings\"}', NULL, '{\"Major\":\"\", \"Minor\": \"\",\"Critical\": \"\",\"Warning\": \"\",\"Event\":\"\"}', '2023-08-15 17:34:22', NULL); INSERT INTO `config` VALUES (29, 'SystemMonitor', 'backup', '{\"cn\":\"周期备份设置\",\"en\":\"Periodic backup Settings\"}', NULL, '{\"Major\":\"\",\"Minor\":\"\",\"Critical\":\"\",\"Warning\":\"\",\"Event\":\"\",\"backupTime\":\"12\"}', '2023-08-17 16:44:05', NULL); INSERT INTO `config` VALUES (30, 'SystemMonitor', 'databaseThreshold', '{\"cn\":\"数据库阈值及告警级别设置\",\"en\":\"threshold of database settings\"}', NULL, '{\"Major\":\"\", \"Minor\": \"\",\"Critical\": \"\",\"Warning\": \"\",\"Event\":\"\"}', '2023-08-15 17:32:55', NULL); INSERT INTO `config` VALUES (31, 'LOG', 'remoteLogSet', '{\"cn\":\"日志远程输出设置\",\"en\":\"Log Remote Output Settings\"}', NULL, '{\"logIp\":\"192222\",\"logDirectory\":\"1023012312\"}', '2023-08-16 15:36:20', NULL); -INSERT INTO `config` VALUES (32, 'MML', 'operationSet', '{\"cn\":\"操作维护接口设置\",\"en\":\"Operation settings\"}', NULL, '{\"listeningAddress\":\"21312\",\"listeningPort\":\"321\"}', '2023-08-16 19:17:16', NULL); +INSERT INTO `config` VALUES (32, 'MML', 'operationSet', '{\"cn\":\"操作维护接口设置\",\"en\":\"Operation settings\"}', NULL, '{\"listeningAddress\":\"123121111111111\",\"listeningPort\":\"32131\"}', '2023-08-17 10:25:07', NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/pm_template.sql b/database/upgrade/pm_template.sql new file mode 100644 index 00000000..0238bae6 --- /dev/null +++ b/database/upgrade/pm_template.sql @@ -0,0 +1,37 @@ +/* + 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: 17/08/2023 19:42:23 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for pm_template +-- ---------------------------- +DROP TABLE IF EXISTS `pm_template`; +CREATE TABLE `pm_template` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '对象模板名称', + `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网元类型', + `object_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '测量对象类型', + `kpi_set` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '测量对象通配', + `created_user` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `created_time` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP, + `updata_time` datetime NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/features/dbrest/dbrest.go b/features/dbrest/dbrest.go index 2f6f1f46..d89e119e 100644 --- a/features/dbrest/dbrest.go +++ b/features/dbrest/dbrest.go @@ -50,9 +50,9 @@ var ( CustomXormDataSQLUri = config.UriPrefix + "/dataManagement/{apiVersion}/{dataStorage}/{dataObject}" // for external // 查询数据库连接情况 - UriDbConnection = config.UriPrefix + "/dataManagement/{apiVersion}/dbConnection" + UriDbConnection = config.DefaultUriPrefix + "/dataManagement/{apiVersion}/dbConnection" // 终结非法的数据库连接 - UriDbStop = config.UriPrefix + "/dataManagement/{apiVersion}/dbStop" + UriDbStop = config.DefaultUriPrefix + "/dataManagement/{apiVersion}/dbStop" ) var xormResponse XormResponse diff --git a/features/file/file.go b/features/file/file.go index 8eaf7fdd..31628403 100644 --- a/features/file/file.go +++ b/features/file/file.go @@ -21,10 +21,10 @@ var ( CustomUriFile = config.UriPrefix + "/fileManagement/{apiVersion}/{location}/file" // 获取磁盘列表 - UriDiskList = config.UriPrefix + "/fileManagement/{apiVersion}/files/diskList" + UriDiskList = config.DefaultUriPrefix + "/fileManagement/{apiVersion}/files/diskList" // 获取文件列表 - UriListFiles = config.UriPrefix + "/fileManagement/{apiVersion}/files/listFiles" + UriListFiles = config.DefaultUriPrefix + "/fileManagement/{apiVersion}/files/listFiles" ) // func init() { diff --git a/features/monitor/monitor/monitor.go b/features/monitor/monitor/monitor.go index 5cacfc21..db91d634 100644 --- a/features/monitor/monitor/monitor.go +++ b/features/monitor/monitor/monitor.go @@ -20,11 +20,17 @@ import ( var ( // 可选网络 - UriNetOpt = config.UriPrefix + "/monitor/{apiVersion}/monitor/netoptions" + UriNetOpt = config.DefaultUriPrefix + "/monitor/{apiVersion}/monitor/netoptions" // 可选磁盘 - UriIoOpt = config.UriPrefix + "/monitor/{apiVersion}/monitor/iooptions" + UriIoOpt = config.DefaultUriPrefix + "/monitor/{apiVersion}/monitor/iooptions" // 加载 - UriLoad = config.UriPrefix + "/monitor/{apiVersion}/monitor/load" + UriLoad = config.DefaultUriPrefix + "/monitor/{apiVersion}/monitor/load" + + UriNetOptOAM = config.UriPrefix + "/monitor/{apiVersion}/monitor/netoptions" + // 可选磁盘 + UriIoOptOAM = config.UriPrefix + "/monitor/{apiVersion}/monitor/iooptions" + // 加载 + UriLoadOAM = config.UriPrefix + "/monitor/{apiVersion}/monitor/load" ) // Netoptions 可选网络 diff --git a/features/monitor/psnet/psnet.go b/features/monitor/psnet/psnet.go index 8f38fcd8..fb4646c5 100644 --- a/features/monitor/psnet/psnet.go +++ b/features/monitor/psnet/psnet.go @@ -13,9 +13,9 @@ import ( var ( // websockte通信 - UriWs = config.UriPrefix + "/monitor/{apiVersion}/psnet/ws" + UriWs = config.DefaultUriPrefix + "/monitor/{apiVersion}/psnet/ws" // 停止进程 - UriStop = config.UriPrefix + "/monitor/{apiVersion}/psnet/stop" + UriStop = config.DefaultUriPrefix + "/monitor/{apiVersion}/psnet/stop" ) // 进程管理 diff --git a/lib/mmlp/parse.go b/lib/mmlp/parse.go index 1f28973c..760da94a 100644 --- a/lib/mmlp/parse.go +++ b/lib/mmlp/parse.go @@ -330,31 +330,31 @@ func parseRequestUri(httpUri string, mmlMap *dborm.MmlHttpMap, mml *MmlCommand) return requestURI } -func DeploymentLicense(mml *MmlCommand, requestURI, token, agent string) { - client := resty.New() - srcLicDep := &struct { - NeType string `json:"ne_type"` - NeID string `json:"ne_id"` - Capability string `json:"capability"` - }{ - NeType: fmt.Sprintf("%v", mml.NaMap["srcnetype"]), - NeID: fmt.Sprintf("%v", mml.NaMap["srcneid"]), - Capability: capability - strconv.Atoi(fmt.Sprintf("%v", mml.NaMap["number"])), - } - response, err := client.R(). - EnableTrace(). - SetHeaders(map[string]string{"accessToken": token}). - SetHeaders(map[string]string{"User-Agent": agent}). - SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). - SetBody(*body). - Put(requestURI) - if err != nil { - log.Error("Failed to Put:", err) - output = ParseErrorOutput(err) - } else { - output = ParseOutputResponse(omcMmlVar, outputJson, response) - } -} +// func DeploymentLicense(mml *MmlCommand, requestURI, token, agent string) { +// client := resty.New() +// srcLicDep := &struct { +// NeType string `json:"ne_type"` +// NeID string `json:"ne_id"` +// Capability string `json:"capability"` +// }{ +// NeType: fmt.Sprintf("%v", mml.NaMap["srcnetype"]), +// NeID: fmt.Sprintf("%v", mml.NaMap["srcneid"]), +// Capability: capability - strconv.Atoi(fmt.Sprintf("%v", mml.NaMap["number"])), +// } +// response, err := client.R(). +// EnableTrace(). +// SetHeaders(map[string]string{"accessToken": token}). +// SetHeaders(map[string]string{"User-Agent": agent}). +// SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). +// SetBody(*body). +// Put(requestURI) +// if err != nil { +// log.Error("Failed to Put:", err) +// output = ParseErrorOutput(err) +// } else { +// output = ParseOutputResponse(omcMmlVar, outputJson, response) +// } +// } func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) { log.Info("TransMml2HttpReq processing ...") @@ -435,13 +435,13 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) { body := ParseInputBody(inputJson, mml) log.Debugf("method: Put requestURI: %s", requestURI) - switch inputJson.CallFunc { - case "DeploymentLicense": - DeploymentLicense(inputJson, requestURI, omcMmlVar) - //output = ParseOutputResponse(inputJson, outputJson, response) - return output, nil - default: - } + // switch inputJson.CallFunc { + // case "DeploymentLicense": + // DeploymentLicense(inputJson, requestURI, omcMmlVar) + // //output = ParseOutputResponse(inputJson, outputJson, response) + // return output, nil + // default: + // } response, err := client.R(). EnableTrace(). diff --git a/makefile b/makefile index da7ec8a3..8c04c261 100644 --- a/makefile +++ b/makefile @@ -11,7 +11,7 @@ DebBuildDir = $(EmsBuildRoot)/debbuild RpmBuildDir = $(EmsBuildRoot)/rpmbuild OmcInstallDir = /usr/local/omc ReleaseDir = $(EmsBuildRoot)/release -EmsBEDir = $(GitLocalRoot)/be.ems +EmsBEDir = $(GitLocalRoot)/ems.agt EmsFEDir = $(GitLocalRoot)/fe.ems LibDir = $(EmsBEDir)/lib RESTAGENT = restagent diff --git a/mkpkg.sh b/mkpkg.sh index 091bc898..cc7ca6f1 100644 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -2,7 +2,7 @@ ProcList="restagent crontask sshsvc" GitLocalRoot=$HOME/local.git -EmsBEDir=$GitLocalRoot/be.ems +EmsBEDir=$GitLocalRoot/ems.agt EmsBuildRoot=$GitLocalRoot/build.ems EmsFEDir=$GitLocalRoot/fe.ems RpmArch=`arch` diff --git a/tools/misc/dumpdb.sh b/tools/misc/dumpdb.sh index a97252b2..33c91d61 100644 --- a/tools/misc/dumpdb.sh +++ b/tools/misc/dumpdb.sh @@ -2,7 +2,7 @@ Home=/home/simon GitLocalRoot=${Home}/local.git -EmsBEDir=${GitLocalRoot}/be.ems +EmsBEDir=${GitLocalRoot}/ems.agt user="root" password="1000omc@kp!" host="192.168.2.119" diff --git a/tools/misc/tables_s.lst b/tools/misc/tables_s.lst index 8c2f8797..fc4f2ad7 100644 --- a/tools/misc/tables_s.lst +++ b/tools/misc/tables_s.lst @@ -41,3 +41,7 @@ monitor_base monitor_io monitor_network sys_perf_data +sys_extended +sys_backup +pm_template +monitor_warn \ No newline at end of file