This is an automated email from the ASF dual-hosted git repository.
leezng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 422065d38 [INLONG-6363][Dashboard] InLong Group supports Kafka MQ
(#6374)
422065d38 is described below
commit 422065d38c93ef73a30315615d18e682b4a6b038
Author: Lizhen <[email protected]>
AuthorDate: Thu Nov 3 15:17:30 2022 +0800
[INLONG-6363][Dashboard] InLong Group supports Kafka MQ (#6374)
---
inlong-dashboard/src/locales/cn.json | 42 +++++++++++-----------
inlong-dashboard/src/locales/en.json | 42 +++++++++++-----------
.../metas/groups/defaults/{TubeMq.ts => Kafka.ts} | 37 ++++---------------
.../src/metas/groups/defaults/Pulsar.ts | 26 +++++++-------
.../src/metas/groups/defaults/TubeMq.ts | 14 ++++----
.../src/metas/groups/defaults/index.ts | 5 +++
6 files changed, 75 insertions(+), 91 deletions(-)
diff --git a/inlong-dashboard/src/locales/cn.json
b/inlong-dashboard/src/locales/cn.json
index 1e2779c05..787b7f2c1 100644
--- a/inlong-dashboard/src/locales/cn.json
+++ b/inlong-dashboard/src/locales/cn.json
@@ -213,26 +213,28 @@
"meta.Group.InlongGroupOwnersExtra": "责任人，可查看、修改数据流组信息",
"meta.Group.InlongGroupIntroduction": "描述",
"meta.Group.MQType": "MQ类型",
- "meta.Group.QueueModule": "队列模型",
- "meta.Group.Parallel": "并行",
- "meta.Group.Serial": "顺序",
- "meta.Group.PartitionNum": "Topic分区数",
- "meta.Group.EnsembleSuffix": "节点数",
- "meta.Group.EnsembleExtra": "Topic保存到多少个节点，最高可配置10个",
- "meta.Group.WriteQuorumSuffix": "副本数",
- "meta.Group.WriteQuorumExtra": "每条消息保存多少个副本，最高可配置10个",
- "meta.Group.AckQuorumSuffix": "响应数",
- "meta.Group.AckQuorumExtra": "写请求成功所需的ack数，最高可配置10个",
- "meta.Group.RetentionTimeExtra": "处于ack状态的消息的保存时⻓，超过此值时消息会被删除（最多保留14天）",
- "meta.Group.TtlExtra": "消息的time-to-live时⻓，超过此值的消息会被标记为ack（最多保留14天）",
- "meta.Group.RetentionSizeExtra": "处于ack状态的消息容量，超过此值的消息会被删除（-1表示永不删除）",
- "meta.Group.NumberOfAccess": "按天接入条数",
- "meta.Group.TenThousand/Day": "万条/天",
- "meta.Group.AccessSize": "按天接入大小",
- "meta.Group.GB/Day": "GB/天",
- "meta.Group.AccessPeakPerSecond": "每秒接入峰值",
- "meta.Group.Stripe/Second": "条/秒",
- "meta.Group.SingleStripMaximumLength": "单条最大长度",
+ "meta.Group.Pulsar.QueueModule": "队列模型",
+ "meta.Group.Pulsar.Parallel": "并行",
+ "meta.Group.Pulsar.Serial": "顺序",
+ "meta.Group.Pulsar.PartitionNum": "Topic分区数",
+ "meta.Group.Pulsar.EnsembleSuffix": "节点数",
+ "meta.Group.Pulsar.EnsembleExtra": "Topic保存到多少个节点，最高可配置10个",
+ "meta.Group.Pulsar.WriteQuorumSuffix": "副本数",
+ "meta.Group.Pulsar.WriteQuorumExtra": "每条消息保存多少个副本，最高可配置10个",
+ "meta.Group.Pulsar.AckQuorumSuffix": "响应数",
+ "meta.Group.Pulsar.AckQuorumExtra": "写请求成功所需的ack数，最高可配置10个",
+ "meta.Group.Pulsar.RetentionTimeExtra":
"处于ack状态的消息的保存时⻓，超过此值时消息会被删除（最多保留14天）",
+ "meta.Group.Pulsar.TtlExtra": "消息的time-to-live时⻓，超过此值的消息会被标记为ack（最多保留14天）",
+ "meta.Group.Pulsar.RetentionSizeExtra": "处于ack状态的消息容量，超过此值的消息会被删除（-1表示永不删除）",
+ "meta.Group.TubeMq.NumberOfAccess": "按天接入条数",
+ "meta.Group.TubeMq.TenThousand/Day": "万条/天",
+ "meta.Group.TubeMq.AccessSize": "按天接入大小",
+ "meta.Group.TubeMq.GB/Day": "GB/天",
+ "meta.Group.TubeMq.AccessPeakPerSecond": "每秒接入峰值",
+ "meta.Group.TubeMq.Stripe/Second": "条/秒",
+ "meta.Group.TubeMq.SingleStripMaximumLength": "单条最大长度",
+ "meta.Group.Kafka.Partition": "分区数",
+ "meta.Group.Kafka.ReplicationFactor": "副本数",
"meta.Group.Status.Approved": "审批通过",
"meta.Group.Status.Draft": "草稿",
"meta.Group.Status.Cancel": "取消",
diff --git a/inlong-dashboard/src/locales/en.json
b/inlong-dashboard/src/locales/en.json
index 8c469d485..73a0541f6 100644
--- a/inlong-dashboard/src/locales/en.json
+++ b/inlong-dashboard/src/locales/en.json
@@ -213,26 +213,28 @@
"meta.Group.InlongGroupOwnersExtra": "Can view, modify group info",
"meta.Group.InlongGroupIntroduction": "Description",
"meta.Group.MQType": "MQ Type",
- "meta.Group.QueueModule": "Queue Module",
- "meta.Group.Parallel": "Parallel",
- "meta.Group.Serial": "Serial",
- "meta.Group.PartitionNum": "Topic Part Nums",
- "meta.Group.EnsembleSuffix": "Number of nodes",
- "meta.Group.EnsembleExtra": "How many nodes are Topic saved to, up to 10 can
be configured",
- "meta.Group.WriteQuorumSuffix": "Number of copies",
- "meta.Group.WriteQuorumExtra": "How many copies of each message are saved,
up to 10 can be configured",
- "meta.Group.AckQuorumSuffix": "Number of responses",
- "meta.Group.AckQuorumExtra": "The number of ack required for a successful
write request, up to 10 can be configured",
- "meta.Group.RetentionTimeExtra": "The save time of the message in the ack
state, the message will be deleted when this value is exceeded (up to 14 days)",
- "meta.Group.TtlExtra": "The time-to-live time of the message, messages
exceeding this value will be marked as ack (retained for up to 14 days)",
- "meta.Group.RetentionSizeExtra": "Message capacity in ack state, messages
exceeding this value will be deleted (-1 means never delete)",
- "meta.Group.NumberOfAccess": "Number of Access",
- "meta.Group.TenThousand/Day": "Ten Thousand / Day",
- "meta.Group.AccessSize": "Access Size",
- "meta.Group.GB/Day": "GB / Day",
- "meta.Group.AccessPeakPerSecond": "PeakRecords",
- "meta.Group.Stripe/Second": "Stripe / Second",
- "meta.Group.SingleStripMaximumLength": "Single Max Length",
+ "meta.Group.Pulsar.QueueModule": "Queue Module",
+ "meta.Group.Pulsar.Parallel": "Parallel",
+ "meta.Group.Pulsar.Serial": "Serial",
+ "meta.Group.Pulsar.PartitionNum": "Topic Part Nums",
+ "meta.Group.Pulsar.EnsembleSuffix": "Number of nodes",
+ "meta.Group.Pulsar.EnsembleExtra": "How many nodes are Topic saved to, up to
10 can be configured",
+ "meta.Group.Pulsar.WriteQuorumSuffix": "Number of copies",
+ "meta.Group.Pulsar.WriteQuorumExtra": "How many copies of each message are
saved, up to 10 can be configured",
+ "meta.Group.Pulsar.AckQuorumSuffix": "Number of responses",
+ "meta.Group.Pulsar.AckQuorumExtra": "The number of ack required for a
successful write request, up to 10 can be configured",
+ "meta.Group.Pulsar.RetentionTimeExtra": "The save time of the message in the
ack state, the message will be deleted when this value is exceeded (up to 14
days)",
+ "meta.Group.Pulsar.TtlExtra": "The time-to-live time of the message,
messages exceeding this value will be marked as ack (retained for up to 14
days)",
+ "meta.Group.Pulsar.RetentionSizeExtra": "Message capacity in ack state,
messages exceeding this value will be deleted (-1 means never delete)",
+ "meta.Group.TubeMq.NumberOfAccess": "Number of Access",
+ "meta.Group.TubeMq.TenThousand/Day": "Ten Thousand / Day",
+ "meta.Group.TubeMq.AccessSize": "Access Size",
+ "meta.Group.TubeMq.GB/Day": "GB / Day",
+ "meta.Group.TubeMq.AccessPeakPerSecond": "PeakRecords",
+ "meta.Group.TubeMq.Stripe/Second": "Stripe / Second",
+ "meta.Group.TubeMq.SingleStripMaximumLength": "Single Max Length",
+ "meta.Group.Kafka.Partition": "Number of partitions",
+ "meta.Group.Kafka.ReplicationFactor": "Replications",
"meta.Group.Status.Approved": "Approved",
"meta.Group.Status.Draft": "Draft",
"meta.Group.Status.Cancel": "Cancel",
diff --git a/inlong-dashboard/src/metas/groups/defaults/TubeMq.ts
b/inlong-dashboard/src/metas/groups/defaults/Kafka.ts
similarity index 62%
copy from inlong-dashboard/src/metas/groups/defaults/TubeMq.ts
copy to inlong-dashboard/src/metas/groups/defaults/Kafka.ts
index e38ef6889..f809c65b3 100644
--- a/inlong-dashboard/src/metas/groups/defaults/TubeMq.ts
+++ b/inlong-dashboard/src/metas/groups/defaults/Kafka.ts
@@ -23,52 +23,27 @@ import { GroupInfo } from '../common/GroupInfo';
const { I18n, FormField } = DataWithBackend;
-export default class TubeMqGroup extends GroupInfo implements DataWithBackend {
+export default class KafkaGroup extends GroupInfo implements DataWithBackend {
@FormField({
type: 'inputnumber',
rules: [{ required: true }],
- suffix: i18n.t('meta.Group.TenThousand/Day'),
props: {
min: 1,
precision: 0,
},
})
- @I18n('meta.Group.NumberOfAccess')
- dailyRecords: number;
+ @I18n('meta.Group.Kafka.Partition')
+ numPartitions: number;
@FormField({
type: 'inputnumber',
rules: [{ required: true }],
- suffix: i18n.t('meta.Group.GB/Day'),
+ initialValue: 1,
props: {
min: 1,
precision: 0,
},
})
- @I18n('meta.Group.AccessSize')
- dailyStorage: number;
-
- @FormField({
- type: 'inputnumber',
- rules: [{ required: true }],
- suffix: i18n.t('meta.Group.Stripe/Second'),
- props: {
- min: 1,
- precision: 0,
- },
- })
- @I18n('meta.Group.AccessPeakPerSecond')
- peakRecords: number;
-
- @FormField({
- type: 'inputnumber',
- rules: [{ required: true }],
- suffix: 'Byte',
- props: {
- min: 1,
- precision: 0,
- },
- })
- @I18n('meta.Group.SingleStripMaximumLength')
- maxLength: number;
+ @I18n('meta.Group.Kafka.ReplicationFactor')
+ replicationFactor: number;
}
diff --git a/inlong-dashboard/src/metas/groups/defaults/Pulsar.ts
b/inlong-dashboard/src/metas/groups/defaults/Pulsar.ts
index d62249492..635c9601e 100644
--- a/inlong-dashboard/src/metas/groups/defaults/Pulsar.ts
+++ b/inlong-dashboard/src/metas/groups/defaults/Pulsar.ts
@@ -31,17 +31,17 @@ export default class PulsarGroup extends GroupInfo
implements DataWithBackend {
props: {
options: [
{
- label: i18n.t('meta.Group.Parallel'),
+ label: i18n.t('meta.Group.Pulsar.Parallel'),
value: 'PARALLEL',
},
{
- label: i18n.t('meta.Group.Serial'),
+ label: i18n.t('meta.Group.Pulsar.Serial'),
value: 'SERIAL',
},
],
},
})
- @I18n('meta.Group.QueueModule')
+ @I18n('meta.Group.Pulsar.QueueModule')
queueModule: string;
@FormField({
@@ -55,14 +55,14 @@ export default class PulsarGroup extends GroupInfo
implements DataWithBackend {
},
visible: values => values.queueModule === 'PARALLEL',
})
- @I18n('meta.Group.PartitionNum')
+ @I18n('meta.Group.Pulsar.PartitionNum')
partitionNum: number;
@FormField({
type: 'inputnumber',
initialValue: 3,
- suffix: i18n.t('meta.Group.EnsembleSuffix'),
- extra: i18n.t('meta.Group.EnsembleExtra'),
+ suffix: i18n.t('meta.Group.Pulsar.EnsembleSuffix'),
+ extra: i18n.t('meta.Group.Pulsar.EnsembleExtra'),
rules: [
({ getFieldValue }) => ({
validator(_, val) {
@@ -89,8 +89,8 @@ export default class PulsarGroup extends GroupInfo implements
DataWithBackend {
@FormField({
type: 'inputnumber',
initialValue: 3,
- suffix: i18n.t('meta.Group.WriteQuorumSuffix'),
- extra: i18n.t('meta.Group.WriteQuorumExtra'),
+ suffix: i18n.t('meta.Group.Pulsar.WriteQuorumSuffix'),
+ extra: i18n.t('meta.Group.Pulsar.WriteQuorumExtra'),
props: {
min: 1,
max: 10,
@@ -103,8 +103,8 @@ export default class PulsarGroup extends GroupInfo
implements DataWithBackend {
@FormField({
type: 'inputnumber',
initialValue: 2,
- suffix: i18n.t('meta.Group.AckQuorumSuffix'),
- extra: i18n.t('meta.Group.AckQuorumExtra'),
+ suffix: i18n.t('meta.Group.Pulsar.AckQuorumSuffix'),
+ extra: i18n.t('meta.Group.Pulsar.AckQuorumExtra'),
props: {
min: 1,
max: 10,
@@ -146,7 +146,7 @@ export default class PulsarGroup extends GroupInfo
implements DataWithBackend {
],
},
},
- extra: i18n.t('meta.Group.TtlExtra'),
+ extra: i18n.t('meta.Group.Pulsar.TtlExtra'),
props: {
min: 1,
precision: 0,
@@ -195,7 +195,7 @@ export default class PulsarGroup extends GroupInfo
implements DataWithBackend {
],
},
},
- extra: i18n.t('meta.Group.RetentionTimeExtra'),
+ extra: i18n.t('meta.Group.Pulsar.RetentionTimeExtra'),
props: {
min: -1,
precision: 0,
@@ -228,7 +228,7 @@ export default class PulsarGroup extends GroupInfo
implements DataWithBackend {
],
},
},
- extra: i18n.t('meta.Group.RetentionSizeExtra'),
+ extra: i18n.t('meta.Group.Pulsar.RetentionSizeExtra'),
props: {
min: -1,
precision: 0,
diff --git a/inlong-dashboard/src/metas/groups/defaults/TubeMq.ts
b/inlong-dashboard/src/metas/groups/defaults/TubeMq.ts
index e38ef6889..796536374 100644
--- a/inlong-dashboard/src/metas/groups/defaults/TubeMq.ts
+++ b/inlong-dashboard/src/metas/groups/defaults/TubeMq.ts
@@ -27,37 +27,37 @@ export default class TubeMqGroup extends GroupInfo
implements DataWithBackend {
@FormField({
type: 'inputnumber',
rules: [{ required: true }],
- suffix: i18n.t('meta.Group.TenThousand/Day'),
+ suffix: i18n.t('meta.Group.TubeMq.TenThousand/Day'),
props: {
min: 1,
precision: 0,
},
})
- @I18n('meta.Group.NumberOfAccess')
+ @I18n('meta.Group.TubeMq.NumberOfAccess')
dailyRecords: number;
@FormField({
type: 'inputnumber',
rules: [{ required: true }],
- suffix: i18n.t('meta.Group.GB/Day'),
+ suffix: i18n.t('meta.Group.TubeMq.GB/Day'),
props: {
min: 1,
precision: 0,
},
})
- @I18n('meta.Group.AccessSize')
+ @I18n('meta.Group.TubeMq.AccessSize')
dailyStorage: number;
@FormField({
type: 'inputnumber',
rules: [{ required: true }],
- suffix: i18n.t('meta.Group.Stripe/Second'),
+ suffix: i18n.t('meta.Group.TubeMq.Stripe/Second'),
props: {
min: 1,
precision: 0,
},
})
- @I18n('meta.Group.AccessPeakPerSecond')
+ @I18n('meta.Group.TubeMq.AccessPeakPerSecond')
peakRecords: number;
@FormField({
@@ -69,6 +69,6 @@ export default class TubeMqGroup extends GroupInfo implements
DataWithBackend {
precision: 0,
},
})
- @I18n('meta.Group.SingleStripMaximumLength')
+ @I18n('meta.Group.TubeMq.SingleStripMaximumLength')
maxLength: number;
}
diff --git a/inlong-dashboard/src/metas/groups/defaults/index.ts
b/inlong-dashboard/src/metas/groups/defaults/index.ts
index adab3a02b..3877a4b78 100644
--- a/inlong-dashboard/src/metas/groups/defaults/index.ts
+++ b/inlong-dashboard/src/metas/groups/defaults/index.ts
@@ -25,6 +25,11 @@ export const allDefaultGroups: MetaExportWithBackendList = [
value: '',
LoadEntity: () => import('../common/GroupInfo').then(r => ({ default:
r.GroupInfo })),
},
+ {
+ label: 'Kafka',
+ value: 'KAFKA',
+ LoadEntity: () => import('./Kafka'),
+ },
{
label: 'Pulsar',
value: 'PULSAR',
