Skip to content

Commit 03c7e2f

Browse files
snakorseCounterflowwind
authored and
erda-bot
committed
* modify msp menu * modify msp menu add MicroServiceOverview * overview and memberManagement * overview * get params * bugfix: micro-service menu * bugfix: micro-service menu * optimize: modify unit test Co-authored-by: pjy <[email protected]>
1 parent 21ef5de commit 03c7e2f

File tree

3 files changed

+33
-13
lines changed

3 files changed

+33
-13
lines changed

‎.erda/migrations/msp/20211117-menu.sql

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
UPDATE `tb_tmc_ini` SET `ini_value` = '[{"key":"Overview","cnName":"全局拓扑","enName":"Overview","exists":true,"mustExists":true},{"key":"MonitorCenter","cnName":"监控中心","enName":"MonitorCenter","children":[{"key":"ServiceMonitor","cnName":"服务监控","enName":"ServiceMonitor","mustExists":true,"exists":true},{"key":"FrontMonitor","cnName":"前端监控","enName":"FrontMonitor","onlyK8S":true,"onlyNotK8S":false,"exists":false},{"key":"ActiveMonitor","cnName":"主动监控","enName":"ActiveMonitor","onlyK8S":true,"onlyNotK8S":false,"exists":false}],"exists":true,"mustExists":true},{"key":"AlertCenter","cnName":"告警中心","enName":"AlertCenter","children":[{"key":"AlertStrategy","cnName":"告警策略","enName":"AlertStrategy","exists":true,"mustExists":true},{"key":"AlarmHistory","cnName":"告警历史","enName":"AlarmHistory","exists":true,"mustExists":true},{"key":"RuleManagement","cnName":"规则管理","enName":"RuleManagement","exists":true,"mustExists":true},{"key":"NotifyGroupManagement","cnName":"通知组管理","enName":"NotifyGroupManagement","exists":true,"mustExists":true}],"exists":true,"mustExists":true},{"key":"DiagnoseAnalyzer","cnName":"诊断分析","enName":"DiagnoseAnalyzer","children":[{"key":"Tracing","cnName":"链路追踪","enName":"Tracing","exists":true,"mustExists":true},{"key":"LogAnalyze","cnName":"日志分析","enName":"LogAnalyze","exists":true,"mustExists":true,"onlyK8S":true,"onlyNotK8S":false},{"key":"ErrorInsight","cnName":"错误分析","enName":"ErrorInsight","exists":true,"mustExists":true},{"key":"Dashboard","cnName":"自定义大盘","enName":"Dashboard","exists":true,"mustExists":true}],"exists":true,"mustExists":true},{"key":"ServiceManage","cnName":"服务治理","enName":"ServiceManage","children":[{"key":"APIGateway","cnName":"API网关","enName":"APIGateway","exists":true,"mustExists":true},{"key":"RegisterCenter","cnName":"注册中心","enName":"RegisterCenter","exists":true,"mustExists":true},{"key":"ConfigCenter","cnName":"配置中心","enName":"ConfigCenter","exists":true,"mustExists":true}],"exists":true,"mustExists":true},{"key":"EnvironmentSet","cnName":"环境设置","enName":"EnvironmentSet","children":[{"key":"AccessConfig","cnName":"接入配置","enName":"AccessConfig","onlyK8S":true,"onlyNotK8S":true,"exists":true},{"key":"MemberManagement","cnName":"成员管理","enName":"MemberManagement","onlyK8S":true,"onlyNotK8S":true,"exists":true},{"key":"ComponentInfo","cnName":"组件信息","enName":"ComponentInfo","onlyK8S":true,"onlyNotK8S":false,"exists":false}],"exists":true,"mustExists":true}]' WHERE `ini_name` = 'MS_MENU';
2+
UPDATE `tb_tmc_ini` SET `ini_value` = 'MonitorCenter' WHERE `ini_name` = 'MK_monitor';

‎modules/msp/menu/menu.service.go

+30-12
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,19 @@ type menuService struct {
3939
}
4040

4141
var NotExist = map[string]bool{
42-
"LogAnalyze": true,
43-
"APIGateway": true,
44-
"RegisterCenter": true,
45-
"ConfigCenter": true,
46-
"AlarmManagement": true,
42+
//"LogAnalyze": true,
43+
//"APIGateway": true,
44+
//"RegisterCenter": true,
45+
//"ConfigCenter": true,
46+
//"AlarmManagement": true,
47+
"AlertCenter": true,
48+
"ServiceManage": true,
49+
}
50+
51+
var DopMenu = map[string]bool{
52+
"MonitorCenter": true,
53+
"ServiceManage": true,
54+
"EnvironmentSet": true,
4755
}
4856

4957
type componentInfo struct {
@@ -52,8 +60,8 @@ type componentInfo struct {
5260
}
5361

5462
var ComponentInfo = map[string]*componentInfo{
55-
"AppMonitor": {
56-
enName: "AppMonitor",
63+
"MonitorCenter": {
64+
enName: "MonitorCenter",
5765
cnName: "应用监控",
5866
},
5967
"LogAnalyze": {
@@ -78,6 +86,7 @@ var splitEDAS = strings.ToLower(os.Getenv("SPLIT_EDAS_CLUSTER_TYPE")) == "true"
7886

7987
//GetMenu api
8088
func (s *menuService) GetMenu(ctx context.Context, req *pb.GetMenuRequest) (*pb.GetMenuResponse, error) {
89+
//监控中心保留服务监控，诊断分析保留链路追踪、错误分析
8190
// get menu items
8291
items, err := s.getMenuItems()
8392
if err != nil {
@@ -117,7 +126,7 @@ func (s *menuService) GetMenu(ctx context.Context, req *pb.GetMenuRequest) (*pb.
117126
menuMap := make(map[string]*pb.MenuItem)
118127
for _, item := range items {
119128
isK8s := clusterInfo.IsK8S() || (!splitEDAS && clusterInfo.IsEDAS())
120-
if item.EnName == "EnvironmentSet" {
129+
if DopMenu[item.Key] {
121130
for _, child := range item.Children {
122131
child.Params = item.Params
123132
// 反转exists字段，隐藏引导页，显示功能子菜单
@@ -139,6 +148,7 @@ func (s *menuService) GetMenu(ctx context.Context, req *pb.GetMenuRequest) (*pb.
139148
if len(child.Href) > 0 {
140149
child.Href = s.version + child.Href
141150
}
151+
menuMap[child.Key] = child
142152
}
143153
menuMap[item.Key] = item
144154
}
@@ -173,6 +183,9 @@ func (s *menuService) GetMenu(ctx context.Context, req *pb.GetMenuRequest) (*pb.
173183
item.Params[k] = fmt.Sprint(v)
174184
}
175185
}
186+
if engine != "monitor" {
187+
item.Params["_enabled"] = "true"
188+
}
176189

177190
// setup exists
178191
isK8s := clusterInfo.IsK8S() || (!splitEDAS && clusterInfo.IsEDAS())
@@ -325,18 +338,23 @@ func (s *menuService) adjustMenuParams(items []*pb.MenuItem) []*pb.MenuItem {
325338
var monitor, loghub *pb.MenuItem
326339
setParams := make([]*pb.MenuItem, 0)
327340
for _, item := range items {
328-
switch item.Key {
329-
case "EnvironmentalOverview", "AlarmManagement", "QueryAnalysis":
341+
if item.Params == nil {
330342
setParams = append(setParams, item)
331-
case "AppMonitor":
343+
}
344+
switch item.Key {
345+
case "MonitorCenter":
332346
monitor = item
333-
case "LogAnalyze":
347+
case "DiagnoseAnalyzer":
334348
loghub = item
335349
}
336350
}
337351
if monitor != nil {
338352
for _, item := range setParams {
353+
item.Params = monitor.Params
339354
for _, child := range item.Children {
355+
if child.Params != nil {
356+
continue
357+
}
340358
child.Params = monitor.Params
341359
}
342360
}

‎modules/msp/menu/menu.service_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func Test_menuService_GetMenu(t *testing.T) {
8383
ID: 13,
8484
IniName: "MS_MENU",
8585
IniDesc: "微服务治理菜单列表",
86-
IniValue: "[{\"key\":\"EnvironmentalOverview\",\"cnName\":\"环境总览\",\"enName\":\"MicroService\",\"children\":[{\"key\":\"Overview\",\"cnName\":\"全局拓扑\",\"enName\":\"Overview\",\"exists\":true,\"mustExists\":true},{\"key\":\"ServiceList\",\"cnName\":\"服务列表\",\"enName\":\"ServiceList\",\"exists\":true,\"mustExists\":true}],\"exists\":true,\"mustExists\":true},{\"key\":\"ServiceObservation\",\"cnName\":\"服务观测\",\"enName\":\"ServiceObservation\",\"children\":[{\"key\":\"ServiceAnalysis\",\"cnName\":\"服务分析\",\"enName\":\"ServiceAnalysis\",\"exists\":true},{\"key\":\"ErrorInsight\",\"cnName\":\"错误分析\",\"enName\":\"ErrorInsight\",\"exists\":true},{\"key\":\"Transaction\",\"cnName\":\"链路追踪\",\"enName\":\"Transaction\",\"exists\":true}],\"exists\":true,\"mustExists\":true},{\"key\":\"QueryAnalysis\",\"cnName\":\"查询分析\",\"enName\":\"QueryAnalysis\",\"exists\":true,\"children\":[{\"cnName\":\"仪表盘\",\"enName\":\"Dashboard\",\"key\":\"Dashboard\",\"exists\":true},{\"cnName\":\"快速查询\",\"enName\":\"QuickQuery\",\"key\":\"QuickQuery\",\"exists\":true}]},{\"key\":\"LogAnalyze\",\"cnName\":\"日志分析\",\"enName\":\"LogAnalyze\",\"exists\":true,\"children\":[{\"cnName\":\"日志查询\",\"enName\":\"LogQuery\",\"key\":\"LogQuery\",\"exists\":false},{\"cnName\":\"分析规则\",\"enName\":\"AnalyzeRule\",\"key\":\"AnalyzeRule\",\"exists\":false}]},{\"key\":\"APIGateway\",\"cnName\":\"API网关\",\"enName\":\"APIGateway\",\"children\":[{\"key\":\"GatewayIntro\",\"cnName\":\"使用引导\",\"enName\":\"GatewayIntro\",\"href\":\"/manual/microservice/api-gateway.html\",\"exists\":true},{\"key\":\"Endpoints\",\"cnName\":\"流量入口管理\",\"enName\":\"Endpoints\",\"exists\":false,\"onlyK8S\":true},{\"key\":\"APIs\",\"cnName\":\"微服务API管理\",\"enName\":\"APIs\",\"exists\":false},{\"key\":\"ConsumerACL\",\"cnName\":\"调用方管理\",\"enName\":\"ConsumerACL\",\"exists\":false,\"onlyK8S\":true},{\"key\":\"OldPolicies\",\"cnName\":\"API策略\",\"enName\":\"Policies\",\"exists\":false,\"onlyNotK8S\":true},{\"key\":\"OldConsumerACL\",\"cnName\":\"调用者授权\",\"enName\":\"ConsumerACL\",\"exists\":false,\"onlyNotK8S\":true}],\"exists\":true,\"mustExists\":true},{\"key\":\"RegisterCenter\",\"cnName\":\"注册中心\",\"enName\":\"RegisterCenter\",\"children\":[{\"key\":\"RegisterIntro\",\"cnName\":\"使用引导\",\"enName\":\"RegisterIntro\",\"href\":\"/manual/microservice/dubbo.html\",\"exists\":true},{\"key\":\"Services\",\"cnName\":\"服务注册列表\",\"enName\":\"Services\",\"exists\":false}],\"exists\":true,\"mustExists\":true},{\"key\":\"ConfigCenter\",\"cnName\":\"配置中心\",\"enName\":\"ConfigCenter\",\"children\":[{\"key\":\"ConfigIntro\",\"cnName\":\"使用引导\",\"href\":\"/manual/deploy/config-center.html\",\"enName\":\"ConfigIntro\",\"exists\":true},{\"key\":\"Configs\",\"cnName\":\"配置管理\",\"enName\":\"Configs\",\"exists\":false}],\"exists\":true,\"mustExists\":true},{\"key\":\"AlarmManagement\",\"cnName\":\"告警管理\",\"enName\":\"AlarmManagement\",\"children\":[{\"key\":\"AlertStrategy\",\"cnName\":\"告警策略\",\"enName\":\"AlertStrategy\",\"exists\":false},{\"key\":\"AlarmHistory\",\"cnName\":\"告警历史\",\"enName\":\"AlarmHistory\",\"exists\":false},{\"key\":\"RuleManagement\",\"cnName\":\"规则管理\",\"enName\":\"RuleManagement\",\"exists\":false},{\"key\":\"NotifyGroupManagement\",\"cnName\":\"通知组管理\",\"enName\":\"NotifyGroupManagement\",\"exists\":false}],\"exists\":true,\"mustExists\":true},{\"key\":\"EnvironmentSet\",\"cnName\":\"环境设置\",\"enName\":\"EnvironmentSet\",\"children\":[{\"key\":\"AccessConfig\",\"cnName\":\"接入配置\",\"enName\":\"AccessConfig\",\"onlyK8S\":true,\"onlyNotK8S\":true,\"exists\":false},{\"key\":\"MemberManagement\",\"cnName\":\"成员管理\",\"enName\":\"MemberManagement\",\"onlyK8S\":true,\"onlyNotK8S\":true,\"exists\":false},{\"key\":\"ComponentInfo\",\"cnName\":\"组件信息\",\"enName\":\"ComponentInfo\",\"onlyK8S\":true,\"onlyNotK8S\":false,\"exists\":false}],\"exists\":true,\"mustExists\":true}]",
86+
IniValue: "[{\"key\":\"Overview\",\"cnName\":\"全局拓扑\",\"enName\":\"Overview\",\"exists\":true,\"mustExists\":true},{\"key\":\"MonitorCenter\",\"cnName\":\"监控中心\",\"enName\":\"MonitorCenter\",\"children\":[{\"key\":\"ServiceMonitor\",\"cnName\":\"服务监控\",\"enName\":\"ServiceMonitor\",\"mustExists\":true,\"exists\":true},{\"key\":\"FrontMonitor\",\"cnName\":\"前端监控\",\"enName\":\"FrontMonitor\",\"onlyK8S\":true,\"onlyNotK8S\":false,\"exists\":false},{\"key\":\"ActiveMonitor\",\"cnName\":\"主动监控\",\"enName\":\"ActiveMonitor\",\"onlyK8S\":true,\"onlyNotK8S\":false,\"exists\":false}],\"exists\":true,\"mustExists\":true},{\"key\":\"AlertCenter\",\"cnName\":\"告警中心\",\"enName\":\"AlertCenter\",\"children\":[{\"key\":\"AlertStrategy\",\"cnName\":\"告警策略\",\"enName\":\"AlertStrategy\",\"exists\":true,\"mustExists\":true},{\"key\":\"AlarmHistory\",\"cnName\":\"告警历史\",\"enName\":\"AlarmHistory\",\"exists\":true,\"mustExists\":true},{\"key\":\"RuleManagement\",\"cnName\":\"规则管理\",\"enName\":\"RuleManagement\",\"exists\":true,\"mustExists\":true},{\"key\":\"NotifyGroupManagement\",\"cnName\":\"通知组管理\",\"enName\":\"NotifyGroupManagement\",\"exists\":true,\"mustExists\":true}],\"exists\":true,\"mustExists\":true},{\"key\":\"DiagnoseAnalyzer\",\"cnName\":\"诊断分析\",\"enName\":\"DiagnoseAnalyzer\",\"children\":[{\"key\":\"Tracing\",\"cnName\":\"链路追踪\",\"enName\":\"Tracing\",\"exists\":true,\"mustExists\":true},{\"key\":\"LogAnalyze\",\"cnName\":\"日志分析\",\"enName\":\"LogAnalyze\",\"exists\":true,\"mustExists\":true,\"onlyK8S\":true,\"onlyNotK8S\":false},{\"key\":\"ErrorInsight\",\"cnName\":\"错误分析\",\"enName\":\"ErrorInsight\",\"exists\":true,\"mustExists\":true},{\"key\":\"Dashboard\",\"cnName\":\"自定义大盘\",\"enName\":\"Dashboard\",\"exists\":true,\"mustExists\":true}],\"exists\":true,\"mustExists\":true},{\"key\":\"ServiceManage\",\"cnName\":\"服务治理\",\"enName\":\"ServiceManage\",\"children\":[{\"key\":\"APIGateway\",\"cnName\":\"API网关\",\"enName\":\"APIGateway\",\"exists\":true,\"mustExists\":true},{\"key\":\"RegisterCenter\",\"cnName\":\"注册中心\",\"enName\":\"RegisterCenter\",\"exists\":true,\"mustExists\":true},{\"key\":\"ConfigCenter\",\"cnName\":\"配置中心\",\"enName\":\"ConfigCenter\",\"exists\":true,\"mustExists\":true}],\"exists\":true,\"mustExists\":true},{\"key\":\"EnvironmentSet\",\"cnName\":\"环境设置\",\"enName\":\"EnvironmentSet\",\"children\":[{\"key\":\"AccessConfig\",\"cnName\":\"接入配置\",\"enName\":\"AccessConfig\",\"onlyK8S\":true,\"onlyNotK8S\":true,\"exists\":true},{\"key\":\"MemberManagement\",\"cnName\":\"成员管理\",\"enName\":\"MemberManagement\",\"onlyK8S\":true,\"onlyNotK8S\":true,\"exists\":true},{\"key\":\"ComponentInfo\",\"cnName\":\"组件信息\",\"enName\":\"ComponentInfo\",\"onlyK8S\":true,\"onlyNotK8S\":false,\"exists\":false}],\"exists\":true,\"mustExists\":true}]",
8787
CreateTime: time.Now(),
8888
UpdateTime: time.Now(),
8989
IsDeleted: "N",

0 commit comments

Comments
 (0)