Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INLONG-9016][Dashboard] Change the wrapWithInlongMsg to wrapType in data stream #9019

Merged
merged 12 commits into from
Oct 9, 2023
Merged

[INLONG-9016][Dashboard] Change the wrapWithInlongMsg to wrapType in data stream #9019

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
77e3649
[INLONG-9016][Dashboard] Data stream wrapWithInlongMsg ---> wrapType
bluewang Oct 7, 2023
5547fe1
Merge branch 'master' of https://github.com/apache/inlong into INLONG…
bluewang Oct 7, 2023
03e1e57
make some changes
bluewang Oct 7, 2023
63b30e6
make some changes
bluewang Oct 7, 2023
158e869
make some changes
bluewang Oct 7, 2023
17aa403
make some changes
bluewang Oct 7, 2023
d25dca0
Merge branch 'master' of https://github.com/apache/inlong into INLONG…
bluewang Oct 8, 2023
57ced09
Pead ---> Peak
bluewang Oct 8, 2023
fd1ebaf
make some changes
bluewang Oct 8, 2023
5842b1f
cls sink saveTime ---> storageDuration
bluewang Oct 9, 2023
ee64c2f
pulsar mq info changes
bluewang Oct 9, 2023
560d44d
make some changes
bluewang Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,24 +262,28 @@ export class StreamDefaultInfo implements DataWithBackend, RenderRow, RenderList
type: 'radio',
isPro: true,
rules: [{ required: true }],
initialValue: true,
initialValue: 'INLONG_MSG_VO',
bluewang marked this conversation as resolved.
Show resolved Hide resolved
tooltip: i18n.t('meta.Stream.WrapWithInlongMsgHelp'),
props: values => ({
disabled: [110].includes(values?.status),
options: [
{
label: i18n.t('basic.Yes'),
value: true,
label: 'InLongMsg V0',
value: 'INLONG_MSG_VO',
bluewang marked this conversation as resolved.
Show resolved Hide resolved
},
{
label: i18n.t('basic.No'),
value: false,
label: 'InLongMsg V1',
value: 'INLONG_MSG_V1',
},
{
label: 'Raw',
value: 'RAW',
},
],
}),
})
@I18n('meta.Stream.WrapWithInlongMsg')
wrapWithInlongMsg: boolean;
wrapType: string;

parse(data) {
return data;
Expand Down
4 changes: 2 additions & 2 deletions inlong-dashboard/src/ui/locales/cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,8 @@
"meta.Stream.ExecuteWorkflow": "执行工作流",
"meta.Stream.ExecuteConfirm": "确认执行工作流吗?",
"meta.Stream.ExecuteSuccess": "执行成功",
"meta.Stream.WrapWithInlongMsg": "InlongMsg 打包",
"meta.Stream.WrapWithInlongMsgHelp": "消息体使用 InlongMsg 打包",
"meta.Stream.WrapWithInlongMsg": "消息打包格式",
"meta.Stream.WrapWithInlongMsgHelp": "消息体打包类型，默认 InLongMsg V0。Raw：不对消息体进行任何协议打包，InLongMsg V0：六段式打包协议，InLongMsg V1：PB 打包协议",
"meta.Transform.Name": "转换名称",
"meta.Transform.NameRule": "只能包含英文字母、数字、点号(.)、中划线(-)、下划线(_)",
"meta.Transform.Type": "转换类型",
Expand Down
16 changes: 8 additions & 8 deletions inlong-dashboard/src/ui/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,13 +404,13 @@
"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.Pulsar.MaxMarkDeleteRateExtra": "Rate limit for mark delete operations",
"meta.Group.TubeMq.NumberOfAccess": "Number of Access",
"meta.Group.TubeMq.TenThousand/Day": "Ten Thousand / Day",
"meta.Group.TubeMq.AccessSize": "Access Size",
"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.TubeMq.AccessPeakPerSecond": "Peak records",
"meta.Group.TubeMq.Stripe/Second": "Records / Second",
"meta.Group.TubeMq.SingleStripMaximumLength": "Single max length",
"meta.Group.Kafka.Partition": "Number of partitions",
"meta.Group.Kafka.PartitionExtra": "Maximum limit is 100",
"meta.Group.Kafka.ReplicationFactor": "Replications",
Expand Down Expand Up @@ -455,8 +455,8 @@
"meta.Stream.ExecuteWorkflow": "ExecuteWorkflow",
"meta.Stream.ExecuteConfirm": "Are you sure to execute the workflow?",
"meta.Stream.ExecuteSuccess": "Execution Success",
"meta.Stream.WrapWithInlongMsg": "Wrap with InlongMsg",
"meta.Stream.WrapWithInlongMsgHelp": "The message body packaged with InlongMsg",
"meta.Stream.WrapWithInlongMsg": "Message type",
"meta.Stream.WrapWithInlongMsgHelp": "Message body packaging type, default InLongMsg V0. Raw: No protocol packaging of the message body, InLongMsg V0: Six-stage packaging protocol, InLongMsg V1: PB packaging protocol",
"meta.Transform.Name": "Transform name",
"meta.Transform.NameRule": "Only supports letters, numbers, dots(.), minus(-), and underscores(_)",
"meta.Transform.Type": "Transform Type",
Expand Down