Skip to content

Commit a0c85fe

Browse files
jinquantianxiajinquantianxia
committed
fix(frontend): 集群拓扑、实例视图基本信息补充 #8830 
1 parent 232973d commit a0c85fe

File tree

18 files changed

+159
-56
lines changed

18 files changed

+159
-56
lines changed

‎dbm-ui/frontend/src/common/const/clusterTypeInfos.ts‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { MachineTypes } from './machineTypes';
99
export interface ClusterTypeInfoItem {
1010
id: ClusterTypes;
1111
name: string;
12+
architectureName: string; // 部署架构名称
1213
specClusterName: string; // 规格对应的集群名，磨平集群类型差异
1314
dbType: DBTypes;
1415
moduleId: ExtractedControllerDataKeys;
@@ -28,6 +29,7 @@ const mysql: InfoType = {
2829
[ClusterTypes.TENDBSINGLE]: {
2930
id: ClusterTypes.TENDBSINGLE,
3031
name: t('MySQL单节点'),
32+
architectureName: t('MySQL单节点集群'),
3133
specClusterName: 'MySQL',
3234
dbType: DBTypes.MYSQL,
3335
moduleId: 'mysql',
@@ -45,6 +47,7 @@ const mysql: InfoType = {
4547
[ClusterTypes.TENDBHA]: {
4648
id: ClusterTypes.TENDBHA,
4749
name: t('MySQL主从'),
50+
architectureName: t('MySQL高可用集群'),
4851
specClusterName: 'MySQL',
4952
dbType: DBTypes.MYSQL,
5053
moduleId: 'mysql',
@@ -65,6 +68,7 @@ const spider: InfoType = {
6568
[ClusterTypes.TENDBCLUSTER]: {
6669
id: ClusterTypes.TENDBCLUSTER,
6770
name: 'TenDBCluster',
71+
architectureName: t('TendbCluster集群'),
6872
specClusterName: 'TenDBCluster',
6973
dbType: DBTypes.TENDBCLUSTER,
7074
moduleId: 'mysql',
@@ -85,6 +89,7 @@ const redis: InfoType = {
8589
[ClusterTypes.TWEMPROXY_REDIS_INSTANCE]: {
8690
id: ClusterTypes.TWEMPROXY_REDIS_INSTANCE,
8791
name: 'TendisCache',
92+
architectureName: t('TendisCache集群'),
8893
specClusterName: 'Redis',
8994
dbType: DBTypes.REDIS,
9095
moduleId: 'redis',
@@ -102,6 +107,7 @@ const redis: InfoType = {
102107
[ClusterTypes.TWEMPROXY_TENDIS_SSD_INSTANCE]: {
103108
id: ClusterTypes.TWEMPROXY_TENDIS_SSD_INSTANCE,
104109
name: 'TendisSSD',
110+
architectureName: t('TendisSSD集群'),
105111
specClusterName: 'Redis',
106112
dbType: DBTypes.REDIS,
107113
moduleId: 'redis',
@@ -119,6 +125,7 @@ const redis: InfoType = {
119125
[ClusterTypes.PREDIXY_TENDISPLUS_CLUSTER]: {
120126
id: ClusterTypes.PREDIXY_TENDISPLUS_CLUSTER,
121127
name: 'Tendisplus',
128+
architectureName: t('Tendisplus存储版集群'),
122129
specClusterName: 'Redis',
123130
dbType: DBTypes.REDIS,
124131
moduleId: 'redis',
@@ -136,6 +143,7 @@ const redis: InfoType = {
136143
[ClusterTypes.PREDIXY_REDIS_CLUSTER]: {
137144
id: ClusterTypes.PREDIXY_REDIS_CLUSTER,
138145
name: 'RedisCluster',
146+
architectureName: t('RedisCluster集群'),
139147
specClusterName: 'Redis',
140148
dbType: DBTypes.REDIS,
141149
moduleId: 'redis',
@@ -153,6 +161,7 @@ const redis: InfoType = {
153161
[ClusterTypes.REDIS_INSTANCE]: {
154162
id: ClusterTypes.REDIS_INSTANCE,
155163
name: t('Redis主从'),
164+
architectureName: t('RedisCache主从版'),
156165
specClusterName: 'Redis',
157166
dbType: DBTypes.REDIS,
158167
moduleId: 'redis',
@@ -169,6 +178,7 @@ const bigdata: InfoType = {
169178
[ClusterTypes.ES]: {
170179
id: ClusterTypes.ES,
171180
name: 'ElasticSearch',
181+
architectureName: t('ES集群'),
172182
specClusterName: 'ElasticSearch',
173183
dbType: DBTypes.ES,
174184
moduleId: 'bigdata',
@@ -190,6 +200,7 @@ const bigdata: InfoType = {
190200
[ClusterTypes.KAFKA]: {
191201
id: ClusterTypes.KAFKA,
192202
name: 'Kafka',
203+
architectureName: t('Kafka集群'),
193204
specClusterName: 'Kafka',
194205
dbType: DBTypes.KAFKA,
195206
moduleId: 'bigdata',
@@ -207,6 +218,7 @@ const bigdata: InfoType = {
207218
[ClusterTypes.HDFS]: {
208219
id: ClusterTypes.HDFS,
209220
name: 'HDFS',
221+
architectureName: t('Hdfs集群'),
210222
specClusterName: 'HDFS',
211223
dbType: DBTypes.HDFS,
212224
moduleId: 'bigdata',
@@ -224,6 +236,7 @@ const bigdata: InfoType = {
224236
[ClusterTypes.INFLUXDB]: {
225237
id: ClusterTypes.INFLUXDB,
226238
name: 'InfuxDB',
239+
architectureName: t('Influxdb实例'),
227240
specClusterName: 'InfuxDB',
228241
dbType: DBTypes.INFLUXDB,
229242
moduleId: 'bigdata',
@@ -237,6 +250,7 @@ const bigdata: InfoType = {
237250
[ClusterTypes.PULSAR]: {
238251
id: ClusterTypes.PULSAR,
239252
name: 'Pulsar',
253+
architectureName: t('Pulsar集群'),
240254
specClusterName: 'Pulsar',
241255
dbType: DBTypes.PULSAR,
242256
moduleId: 'bigdata',
@@ -258,6 +272,7 @@ const bigdata: InfoType = {
258272
[ClusterTypes.DORIS]: {
259273
id: ClusterTypes.DORIS,
260274
name: 'Doris',
275+
architectureName: t('Doris集群'),
261276
specClusterName: 'Doris',
262277
dbType: DBTypes.DORIS,
263278
moduleId: 'bigdata',
@@ -279,6 +294,7 @@ const bigdata: InfoType = {
279294
[ClusterTypes.RIAK]: {
280295
id: ClusterTypes.RIAK,
281296
name: 'Riak',
297+
architectureName: t('Riak集群'),
282298
specClusterName: 'Riak',
283299
dbType: DBTypes.RIAK,
284300
moduleId: 'bigdata',
@@ -295,6 +311,7 @@ const mongodb: InfoType = {
295311
[ClusterTypes.MONGO_REPLICA_SET]: {
296312
id: ClusterTypes.MONGO_REPLICA_SET,
297313
name: t('Mongo副本集'),
314+
architectureName: t('Mongo副本集'),
298315
specClusterName: 'MongoDB',
299316
dbType: DBTypes.MONGODB,
300317
moduleId: 'mongodb',
@@ -307,7 +324,8 @@ const mongodb: InfoType = {
307324
},
308325
[ClusterTypes.MONGO_SHARED_CLUSTER]: {
309326
id: ClusterTypes.MONGO_SHARED_CLUSTER,
310-
name: t('Mongo 分片集群'),
327+
name: t('Mongo分片集群'),
328+
architectureName: t('Mongo分片集群'),
311329
specClusterName: 'MongoDB',
312330
dbType: DBTypes.MONGODB,
313331
moduleId: 'mongodb',
@@ -318,7 +336,7 @@ const mongodb: InfoType = {
318336
},
319337
{
320338
id: MachineTypes.MONGODB,
321-
name: '副本集/ShardSvr',
339+
name: t('副本集/ShardSvr'),
322340
},
323341
{
324342
id: MachineTypes.MONGO_CONFIG,
@@ -332,6 +350,7 @@ const sqlserver: InfoType = {
332350
[ClusterTypes.SQLSERVER_SINGLE]: {
333351
id: ClusterTypes.SQLSERVER_SINGLE,
334352
name: t('SQLServer单节点'),
353+
architectureName: t('sqlserver单节点版'),
335354
specClusterName: 'SQLServer',
336355
dbType: DBTypes.SQLSERVER,
337356
moduleId: 'sqlserver',
@@ -345,6 +364,7 @@ const sqlserver: InfoType = {
345364
[ClusterTypes.SQLSERVER_HA]: {
346365
id: ClusterTypes.SQLSERVER_HA,
347366
name: t('SQLServer主从'),
367+
architectureName: t('sqlserver主从版'),
348368
specClusterName: 'SQLServer',
349369
dbType: DBTypes.SQLSERVER,
350370
moduleId: 'sqlserver',

‎dbm-ui/frontend/src/locales/en.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,5 +1644,16 @@
16441644
"分片集群": "Sharded Cluster",
16451645
"主从管理": "HA Management",
16461646
"DB 重命名：database 重命名": "DB Rename：database rename",
1647+
"MySQL单节点集群": "",
1648+
"MySQL高可用集群": "",
1649+
"TendisCache集群": "",
1650+
"RedisCache主从版": "",
1651+
"Kafka集群": "",
1652+
"Hdfs集群": "",
1653+
"Pulsar集群": "",
1654+
"Riak集群": "",
1655+
"Mongo分片集群": "",
1656+
"sqlserver单节点版": "",
1657+
"sqlserver主从版": "",
16471658
"这行勿动！新增翻译请在上一行添加！": ""
16481659
}

‎dbm-ui/frontend/src/locales/zh-cn.json‎

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3857,49 +3857,26 @@
38573857
"数量：": "数量：",
38583858
"源 DB 名": "源 DB 名",
38593859
"产品文档": "产品文档",
3860-
"迁移提交成功": "迁移提交成功",
3861-
"集群架构：将集群的部分实例迁移到新机器，迁移保持规格、版本不变；主从架构：主从实例成对迁移到新机器上，可选择部分实例迁移，也可整机所有实例一起迁移。": "集群架构：将集群的部分实例迁移到新机器，迁移保持规格、版本不变；主从架构：主从实例成对迁移到新机器上，可选择部分实例迁移，也可整机所有实例一起迁移。",
3862-
"迁移": "迁移",
3863-
"实例迁移": "实例迁移",
3864-
"如 TendisCache 等，迁移过程保持规格、版本不变": "如 TendisCache 等，迁移过程保持规格、版本不变",
3865-
"支持部分或整机所有实例成对迁移至新主机，版本规格可变": "支持部分或整机所有实例成对迁移至新主机，版本规格可变",
3866-
"主从架构": "主从架构",
3867-
"只迁移目标实例": "只迁移目标实例",
3868-
"主机关联的所有实例一并迁移": "主机关联的所有实例一并迁移",
3869-
"整机迁移": "整机迁移",
3870-
"目标 Master 实例": "目标 Master 实例",
3871-
"实例选择": "实例选择",
3872-
"目标 Master 主机": "目标 Master 主机",
3873-
"关联的实例": "关联的实例",
3874-
"关联的主从实例": "关联的主从实例",
3875-
"目标实例输入格式有误": "目标实例输入格式有误",
3876-
"目标实例重复": "目标实例重复",
3877-
"Master 实例": "Master 实例",
3878-
"请先选择主机": "请先选择主机",
3879-
"集群或实例状态异常，不可选择": "集群或实例状态异常，不可选择",
3880-
"迁移提交成功": "迁移提交成功",
3881-
"集群架构：将集群的部分实例迁移到新机器，迁移保持规格、版本不变；主从架构：主从实例成对迁移到新机器上，可选择部分实例迁移，也可整机所有实例一起迁移。": "集群架构：将集群的部分实例迁移到新机器，迁移保持规格、版本不变；主从架构：主从实例成对迁移到新机器上，可选择部分实例迁移，也可整机所有实例一起迁移。",
3882-
"迁移": "迁移",
3883-
"实例迁移": "实例迁移",
3884-
"如 TendisCache 等，迁移过程保持规格、版本不变": "如 TendisCache 等，迁移过程保持规格、版本不变",
3885-
"支持部分或整机所有实例成对迁移至新主机，版本规格可变": "支持部分或整机所有实例成对迁移至新主机，版本规格可变",
3886-
"主从架构": "主从架构",
3887-
"只迁移目标实例": "只迁移目标实例",
3888-
"主机关联的所有实例一并迁移": "主机关联的所有实例一并迁移",
3889-
"整机迁移": "整机迁移",
3890-
"目标 Master 实例": "目标 Master 实例",
3891-
"实例选择": "实例选择",
3892-
"目标 Master 主机": "目标 Master 主机",
3893-
"关联的实例": "关联的实例",
3894-
"关联的主从实例": "关联的主从实例",
3895-
"目标实例输入格式有误": "目标实例输入格式有误",
3896-
"目标实例重复": "目标实例重复",
3897-
"Master 实例": "Master 实例",
3898-
"请先选择主机": "请先选择主机",
3899-
"集群或实例状态异常，不可选择": "集群或实例状态异常，不可选择",
39003860
"审批人": "审批人",
39013861
"协助人": "协助人",
39023862
"单据通知": "单据通知",
3863+
"去处理": "去处理",
3864+
"集群数量：": "集群数量：",
3865+
"每组主机部署集群：": "每组主机部署集群：",
3866+
"服务器选择：": "服务器选择：",
3867+
"后端存储规格：": "后端存储规格：",
3868+
"SQLServer起始端口：": "SQLServer起始端口：",
3869+
"高可用部署": "高可用部署",
3870+
"MySQL单节点集群": "MySQL 单节点集群",
3871+
"MySQL高可用集群": "MySQL 高可用集群",
3872+
"TendisCache集群": "TendisCache集群",
3873+
"RedisCache主从版": "RedisCache主从版",
3874+
"Kafka集群": "Kafka 集群",
3875+
"Hdfs集群": "Hdfs 集群",
3876+
"Pulsar集群": "Pulsar 集群",
3877+
"Riak集群": "Riak 集群",
3878+
"Mongo分片集群": "Mongo 分片集群",
3879+
"sqlserver单节点版": "sqlserver 单节点版",
3880+
"sqlserver主从版": "sqlserver 主从版",
39033881
"这行勿动！新增翻译请在上一行添加！": ""
3904-
39053882
}

‎dbm-ui/frontend/src/services/model/mongodb/mongodb-instance-detail.ts‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import { clusterTypeInfos } from '@common/const/clusterTypeInfos';
2+
import { ClusterTypes } from '@common/const/clusterTypes';
3+
14
export default class MongodbInstanceDetail {
25
bk_agent_id: string;
36
bk_cloud_id: number;
@@ -6,8 +9,10 @@ export default class MongodbInstanceDetail {
69
bk_disk: number;
710
bk_host_id: number;
811
bk_host_innerip: string;
9-
bk_idc_id: string;
12+
bk_idc_id: number;
1013
bk_idc_name: string;
14+
bk_idc_city_id: string;
15+
bk_idc_city_name: string;
1116
bk_mem: number;
1217
bk_os_name: string;
1318
cluster_id: number;
@@ -39,6 +44,8 @@ export default class MongodbInstanceDetail {
3944
this.bk_host_innerip = payload.bk_host_innerip;
4045
this.bk_idc_id = payload.bk_idc_id;
4146
this.bk_idc_name = payload.bk_idc_name;
47+
this.bk_idc_city_id = payload.bk_idc_city_id || '';
48+
this.bk_idc_city_name = payload.bk_idc_city_name || '';
4249
this.bk_mem = payload.bk_mem;
4350
this.bk_os_name = payload.bk_os_name;
4451
this.cluster_id = payload.cluster_id;
@@ -60,4 +67,8 @@ export default class MongodbInstanceDetail {
6067
this.status = payload.status;
6168
this.version = payload.version;
6269
}
70+
71+
get clusterTypeName() {
72+
return clusterTypeInfos[this.cluster_type as ClusterTypes].architectureName || '';
73+
}
6374
}

‎dbm-ui/frontend/src/services/model/mysql/tendbha-instance.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313

1414
import type { HostInfo, InstanceListSpecConfig, InstanceRelatedCluster } from '@services/types';
1515

16+
import { clusterTypeInfos } from '@common/const/clusterTypeInfos';
17+
import { ClusterTypes } from '@common/const/clusterTypes';
18+
1619
import { utcDisplayTime } from '@utils';
1720

1821
export default class TendbhaInstance {
@@ -22,6 +25,11 @@ export default class TendbhaInstance {
2225
db_version: string;
2326
bk_disk: number;
2427
bk_host_id: number;
28+
bk_host_innerip: string;
29+
bk_idc_id: number;
30+
bk_idc_name: string;
31+
bk_idc_city_id: string;
32+
bk_idc_city_name: string;
2533
bk_mem: number;
2634
bk_sub_zone: string;
2735
cluster_id: number;
@@ -53,6 +61,11 @@ export default class TendbhaInstance {
5361
this.bk_cpu = payload.bk_cpu || 0;
5462
this.bk_disk = payload.bk_disk || 0;
5563
this.bk_host_id = payload.bk_host_id || 0;
64+
this.bk_host_innerip = payload.bk_host_innerip || '';
65+
this.bk_idc_id = payload.bk_idc_id || 0;
66+
this.bk_idc_name = payload.bk_idc_name || '';
67+
this.bk_idc_city_id = payload.bk_idc_city_id || '';
68+
this.bk_idc_city_name = payload.bk_idc_city_name || '';
5669
this.bk_mem = payload.bk_mem || 0;
5770
this.bk_sub_zone = payload.bk_sub_zone || '';
5871
this.cluster_id = payload.cluster_id || 0;
@@ -81,4 +94,8 @@ export default class TendbhaInstance {
8194
get createAtDisplay() {
8295
return utcDisplayTime(this.create_at);
8396
}
97+
98+
get clusterTypeName() {
99+
return clusterTypeInfos[this.cluster_type as ClusterTypes].architectureName || '';
100+
}
84101
}

‎dbm-ui/frontend/src/services/model/redis/redis-instance.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import type { HostInfo, InstanceListSpecConfig, InstanceRelatedCluster } from '@services/types';
1515

1616
import { type ClusterInstStatus, clusterInstStatus } from '@common/const';
17+
import { clusterTypeInfos } from '@common/const/clusterTypeInfos';
18+
import { ClusterTypes } from '@common/const/clusterTypes';
1719

1820
import { isRecentDays, utcDisplayTime } from '@utils';
1921

@@ -23,6 +25,11 @@ export default class RedisInstance {
2325
bk_cpu: number;
2426
bk_disk: number;
2527
bk_host_id: number;
28+
bk_host_innerip: string;
29+
bk_idc_id: number;
30+
bk_idc_name: string;
31+
bk_idc_city_id: string;
32+
bk_idc_city_name: string;
2633
bk_mem: number;
2734
db_version: string;
2835
bk_sub_zone: string;
@@ -53,6 +60,11 @@ export default class RedisInstance {
5360
this.bk_cpu = payload.bk_cpu || 0;
5461
this.bk_disk = payload.bk_disk || 0;
5562
this.bk_host_id = payload.bk_host_id || 0;
63+
this.bk_host_innerip = payload.bk_host_innerip || '';
64+
this.bk_idc_id = payload.bk_idc_id || 0;
65+
this.bk_idc_name = payload.bk_idc_name || '';
66+
this.bk_idc_city_id = payload.bk_idc_city_id || '';
67+
this.bk_idc_city_name = payload.bk_idc_city_name || '';
5668
this.bk_mem = payload.bk_mem || 0;
5769
this.bk_sub_zone = payload.bk_sub_zone || '';
5870
this.cluster_id = payload.cluster_id || 0;
@@ -87,4 +99,8 @@ export default class RedisInstance {
8799
get getStatusInfo() {
88100
return clusterInstStatus[this.status] || clusterInstStatus.unavailable;
89101
}
102+
103+
get clusterTypeName() {
104+
return clusterTypeInfos[this.cluster_type as ClusterTypes].architectureName || '';
105+
}
90106
}

0 commit comments

Comments
 (0)