OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

dd

Browse Source
This commit is contained in:
simonzhangsz
2023-08-17 20:04:48 +08:00
parent d611be7d0e
commit cffafecbf8
12 changed files with 108 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crontask/gencmxml.go
View File

@@ -86,7 +86,7 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error {
nrmFile.FileHeader = cmschema.FileHeader{ nrmFile.FileHeader = cmschema.FileHeader{
TimeStamp: timestamp, TimeStamp: timestamp,
TimeZone: tzOffset, TimeZone: tzOffset,
VendorName: "Ruijie Network", VendorName: "RJ",
ElementType: neType, ElementType: neType,
CmVersion: global.Version, CmVersion: global.Version,
} }

32
database/upgrade/config.sql
View File

@@ -1,17 +1,17 @@
/* /*
Navicat Premium Data Transfer Navicat Premium Data Transfer
Source Server : 192.168.0.229 Source Server : local_mariadb
Source Server Type : MySQL Source Server Type : MariaDB
Source Server Version : 100335 Source Server Version : 100338 (10.3.38-MariaDB)
Source Host : 192.168.0.229:33066 Source Host : localhost:33066
Source Schema : omc_db Source Schema : omc_db
Target Server Type : MySQL Target Server Type : MariaDB
Target Server Version : 100335 Target Server Version : 100338 (10.3.38-MariaDB)
File Encoding : 65001 File Encoding : 65001
Date: 17/08/2023 18:26:28 Date: 17/08/2023 19:43:37
*/ */
SET NAMES utf8mb4; SET NAMES utf8mb4;
@@ -25,13 +25,13 @@ CREATE TABLE `config` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`module_name` varchar(32) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL, `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, `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` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
`value_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL, `value_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
`update_time` datetime(0) NULL DEFAULT current_timestamp(0) ON UPDATE CURRENT_TIMESTAMP(0), `update_time` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP,
`comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE 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 -- 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 (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 (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 (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 (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\":\"12\",\"Minor\":\"3\",\"Critical\":\"\",\"Warning\":\"\",\"Event\":\"\"}', '2023-08-17 16:28:46', 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 (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 (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\":\"23\",\"Minor\":\"\",\"Critical\":\"\",\"Warning\":\"\",\"Event\":\"\"}', '2023-08-17 16:28:49', 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 (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 (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 (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; SET FOREIGN_KEY_CHECKS = 1;

37
database/upgrade/pm_template.sql Normal file
View File

@@ -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;

4
features/dbrest/dbrest.go
View File

@@ -50,9 +50,9 @@ var (
CustomXormDataSQLUri = config.UriPrefix + "/dataManagement/{apiVersion}/{dataStorage}/{dataObject}" // for external 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 var xormResponse XormResponse

4
features/file/file.go
View File

@@ -21,10 +21,10 @@ var (
CustomUriFile = config.UriPrefix + "/fileManagement/{apiVersion}/{location}/file" 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() { // func init() {

12
features/monitor/monitor/monitor.go
View File

@@ -20,11 +20,17 @@ import (
var ( 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 可选网络 // Netoptions 可选网络

4
features/monitor/psnet/psnet.go
View File

@@ -13,9 +13,9 @@ import (
var ( var (
// websockte通信 // 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"
) )
// 进程管理 // 进程管理

64
lib/mmlp/parse.go
View File

@@ -330,31 +330,31 @@ func parseRequestUri(httpUri string, mmlMap *dborm.MmlHttpMap, mml *MmlCommand)
return requestURI return requestURI
} }
func DeploymentLicense(mml *MmlCommand, requestURI, token, agent string) { // func DeploymentLicense(mml *MmlCommand, requestURI, token, agent string) {
client := resty.New() // client := resty.New()
srcLicDep := &struct { // srcLicDep := &struct {
NeType string `json:"ne_type"` // NeType string `json:"ne_type"`
NeID string `json:"ne_id"` // NeID string `json:"ne_id"`
Capability string `json:"capability"` // Capability string `json:"capability"`
}{ // }{
NeType: fmt.Sprintf("%v", mml.NaMap["srcnetype"]), // NeType: fmt.Sprintf("%v", mml.NaMap["srcnetype"]),
NeID: fmt.Sprintf("%v", mml.NaMap["srcneid"]), // NeID: fmt.Sprintf("%v", mml.NaMap["srcneid"]),
Capability: capability - strconv.Atoi(fmt.Sprintf("%v", mml.NaMap["number"])), // Capability: capability - strconv.Atoi(fmt.Sprintf("%v", mml.NaMap["number"])),
} // }
response, err := client.R(). // response, err := client.R().
EnableTrace(). // EnableTrace().
SetHeaders(map[string]string{"accessToken": token}). // SetHeaders(map[string]string{"accessToken": token}).
SetHeaders(map[string]string{"User-Agent": agent}). // SetHeaders(map[string]string{"User-Agent": agent}).
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). // SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
SetBody(*body). // SetBody(*body).
Put(requestURI) // Put(requestURI)
if err != nil { // if err != nil {
log.Error("Failed to Put:", err) // log.Error("Failed to Put:", err)
output = ParseErrorOutput(err) // output = ParseErrorOutput(err)
} else { // } else {
output = ParseOutputResponse(omcMmlVar, outputJson, response) // output = ParseOutputResponse(omcMmlVar, outputJson, response)
} // }
} // }
func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) { func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) {
log.Info("TransMml2HttpReq processing ...") log.Info("TransMml2HttpReq processing ...")
@@ -435,13 +435,13 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) {
body := ParseInputBody(inputJson, mml) body := ParseInputBody(inputJson, mml)
log.Debugf("method: Put requestURI: %s", requestURI) log.Debugf("method: Put requestURI: %s", requestURI)
switch inputJson.CallFunc { // switch inputJson.CallFunc {
case "DeploymentLicense": // case "DeploymentLicense":
DeploymentLicense(inputJson, requestURI, omcMmlVar) // DeploymentLicense(inputJson, requestURI, omcMmlVar)
//output = ParseOutputResponse(inputJson, outputJson, response) // //output = ParseOutputResponse(inputJson, outputJson, response)
return output, nil // return output, nil
default: // default:
} // }
response, err := client.R(). response, err := client.R().
EnableTrace(). EnableTrace().

2
makefile
View File

@@ -11,7 +11,7 @@ DebBuildDir = $(EmsBuildRoot)/debbuild
RpmBuildDir = $(EmsBuildRoot)/rpmbuild RpmBuildDir = $(EmsBuildRoot)/rpmbuild
OmcInstallDir = /usr/local/omc OmcInstallDir = /usr/local/omc
ReleaseDir = $(EmsBuildRoot)/release ReleaseDir = $(EmsBuildRoot)/release
EmsBEDir = $(GitLocalRoot)/be.ems EmsBEDir = $(GitLocalRoot)/ems.agt
EmsFEDir = $(GitLocalRoot)/fe.ems EmsFEDir = $(GitLocalRoot)/fe.ems
LibDir = $(EmsBEDir)/lib LibDir = $(EmsBEDir)/lib
RESTAGENT = restagent RESTAGENT = restagent

2
mkpkg.sh
View File

@@ -2,7 +2,7 @@
ProcList="restagent crontask sshsvc" ProcList="restagent crontask sshsvc"
GitLocalRoot=$HOME/local.git GitLocalRoot=$HOME/local.git
EmsBEDir=$GitLocalRoot/be.ems EmsBEDir=$GitLocalRoot/ems.agt
EmsBuildRoot=$GitLocalRoot/build.ems EmsBuildRoot=$GitLocalRoot/build.ems
EmsFEDir=$GitLocalRoot/fe.ems EmsFEDir=$GitLocalRoot/fe.ems
RpmArch=`arch` RpmArch=`arch`

2
tools/misc/dumpdb.sh
View File

@@ -2,7 +2,7 @@
Home=/home/simon Home=/home/simon
GitLocalRoot=${Home}/local.git GitLocalRoot=${Home}/local.git
EmsBEDir=${GitLocalRoot}/be.ems EmsBEDir=${GitLocalRoot}/ems.agt
user="root" user="root"
password="1000omc@kp!" password="1000omc@kp!"
host="192.168.2.119" host="192.168.2.119"

4
tools/misc/tables_s.lst
View File

@@ -41,3 +41,7 @@ monitor_base
monitor_io monitor_io
monitor_network monitor_network
sys_perf_data sys_perf_data
sys_extended
sys_backup
pm_template
monitor_warn