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.

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

[Version Feature] Collection of features support in version 0.2.0 #28

Merged
merged 109 commits into from
Jun 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
890ff57
Consider the situation of no matched configuration in web page
Davidhua1996 Apr 17, 2022
76a1596
Enable the developer to update/insert the configuration of users; Att…
Davidhua1996 Apr 17, 2022
e733b94
Adjust the streamis_ddl.sql
Davidhua1996 Apr 17, 2022
640cd1a
Adjust the streamis_ddl.sql to accept large value of field
Davidhua1996 Apr 18, 2022
8477559
Redefine the project file regex; Filter and replace the specific para…
Davidhua1996 May 5, 2022
c91af20
Roll the version to "0.2.0"; Change the dependency version of linkis …
Davidhua1996 May 10, 2022
967fe52
Init the streamis AppConn
Davidhua1996 May 10, 2022
609269d
feat: 【前端】流式应用的 Yarn 执行日志展示
May 11, 2022
b89a6bb
feat: modify detail tab i18n
May 11, 2022
2f244d5
add streamis Appconn
May 11, 2022
0b66e4c
Merge branch 'dev-0.2.0' of https://github.com/WeDataSphere/Streamis …
May 11, 2022
313d593
feat: 初步写下前端逻辑,还剩进度条
May 12, 2022
d6c3055
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
May 12, 2022
f5dc2a0
update streamis Appconn
May 12, 2022
40b26f4
feat: 失败信息列表也加一下
May 13, 2022
9c78a5b
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
May 13, 2022
479e7f7
Adjust dependency and structure of the job launcher module and add Jo…
Davidhua1996 May 13, 2022
65274ca
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 May 13, 2022
a41f590
Refresh the TODO list
Davidhua1996 May 13, 2022
ce6373a
Adjust the module of job launcher for Linkis.
Davidhua1996 May 15, 2022
e1d7175
Note the progress of AbstractLinkisJobStateFetcher
Davidhua1996 May 16, 2022
116169e
feat: fake some code
May 16, 2022
3eb866c
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
May 16, 2022
6f8e782
fix: forget to change the test code
May 16, 2022
c7667ca
feat: temporarily create test.vue
May 16, 2022
f244855
update streamis Appconn
May 16, 2022
e61e030
Merge remote-tracking branch 'origin/dev-0.2.0' into dev-0.2.0
May 16, 2022
bffcbc0
Complete the jobState entities and jobState Manager. Add FlinkTrigger…
Davidhua1996 May 17, 2022
1f1513d
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 May 17, 2022
179bf19
Get the Checkpoint file information
May 18, 2022
33c4af2
Get the Checkpoint file information, update exception handling
May 18, 2022
3c1ad36
request parater validation
May 19, 2022
2c3efb4
Streamis scheduler module and Reconstruct the TaskService class (50%)
Davidhua1996 May 19, 2022
571723e
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 May 19, 2022
a94564e
update Get the Checkpoint file information
May 20, 2022
2980322
Resolve the JobStateResult.java compilation issues
May 20, 2022
8616190
Reconstruct the TaskService (100%); Bulk operation for job; Make the …
Davidhua1996 May 23, 2022
d8ecbf6
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 May 23, 2022
6d29028
feat: complete the i18n config
May 23, 2022
24d54dd
feat: complete the logic of batch restart
May 23, 2022
57d4785
feat: no need for jobid
May 23, 2022
bc34eaa
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
May 23, 2022
8d9177b
feat: the function of job list ready
May 24, 2022
56f116f
feat: config还有点问题,先遗留
May 24, 2022
9818dcf
fix: the child_def array empty problem
May 24, 2022
276bd69
feat: improve the functions comment by DH
May 25, 2022
e6c77cc
feat: improve style
May 25, 2022
aed65e9
fix: logic error
May 25, 2022
20c6133
fix: bugs
May 25, 2022
1743d94
fix: splice bug
May 25, 2022
2dc021a
feat: hide the extra checkbox
May 25, 2022
21539d9
feat: multi key warning
May 25, 2022
e9cc108
feat: add savepoint cgi and change the button load
May 25, 2022
be47d21
fix: remained bugs
May 26, 2022
218f0a4
feat: snapshot path & logs history problems
May 26, 2022
2db289e
fix: several warnings
May 26, 2022
6bb5f5b
feat: savepoint modal
May 26, 2022
4160adb
fix: endline logic problem
May 26, 2022
828024d
Strategy to fetch the JobState from Linkis server.
Davidhua1996 May 26, 2022
f12b5d3
Fix the compilation problem in modules.
Davidhua1996 May 26, 2022
d151736
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 May 26, 2022
e54aacf
feat: validate configs
May 26, 2022
3ebcbe0
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
May 26, 2022
28a98d2
feat: delete the extra logic
May 26, 2022
0518491
fix: the cognition bugs
May 30, 2022
bb23559
adjust appconn
May 30, 2022
9927c09
init projectPrivilege
May 30, 2022
136fec7
Merge remote-tracking branch 'origin/dev-0.2.0' into dev-0.2.0
May 30, 2022
2ee0ccd
Reconstruct the configuration module; Adjust the log4j2.xml
Davidhua1996 May 31, 2022
54e8053
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 May 31, 2022
6f306ad
Project Privilege Update
May 31, 2022
77b3cf9
Merge branch 'dev-0.2.0' of https://github.com/WeDataSphere/Streamis …
May 31, 2022
3cd041e
AppConn Update
Jun 2, 2022
fb214d8
Adjust the linkis.properties and log4j2.xml.
Davidhua1996 Jun 6, 2022
1e748c1
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 Jun 6, 2022
82ad10b
Store the linkis job id when the launched job has failed.
Davidhua1996 Jun 7, 2022
9ee1861
AppConn related table update
Jun 8, 2022
c2f2277
Flink the problem in JobRestfulApi; Enable to set flink application n…
Davidhua1996 Jun 8, 2022
9549887
Upgrade the .gitignore file
Davidhua1996 Jun 8, 2022
8ca567e
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 Jun 8, 2022
9edb534
privilege manage update
Jun 8, 2022
f54813b
Merge branch 'dev-0.2.0' of https://github.com/WeDataSphere/Streamis …
Jun 8, 2022
cde1984
resolving injection conflicts
Jun 8, 2022
f2df953
project privilege change
Jun 10, 2022
94beb3b
project privilege change
Jun 10, 2022
c4e2563
project privilege change
Jun 13, 2022
f3269d7
appconn init DDL update
Jun 13, 2022
837c4de
Adjust the stream job service and the strategy of data authority.
Davidhua1996 Jun 13, 2022
f316adb
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 Jun 13, 2022
9c5cc9d
Resolve the conflict in Job service.
Davidhua1996 Jun 13, 2022
76e4277
bug repair
Jun 13, 2022
8f695e9
bug repair
Jun 13, 2022
43a3b8d
adjusting privilefe service
Jun 13, 2022
8214683
bug repair 277118
Jun 14, 2022
3e21d53
Modify the assembly configuration of streamis Appconn.
Davidhua1996 Jun 14, 2022
e800a14
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Davidhua1996 Jun 14, 2022
d40d37a
bug repair 277133
Jun 14, 2022
2cb5c4a
Added switches for automatic restart of jobs and state recovery when …
Davidhua1996 Jun 16, 2022
e4b579f
Adjust the notification message
Davidhua1996 Jun 16, 2022
4bd96ff
Reduce the duplicated dependencies of streamis-appconn
Davidhua1996 Jun 22, 2022
4674082
update DeleteOperation and UpdateOperation Generic type
Jun 22, 2022
dc2bed4
adjust pom
Jun 22, 2022
cc025cf
Sync the latest ddl and dml sql for streamis
Davidhua1996 Jun 22, 2022
f9d777f
Remove the useless restful/mybatis configuration
Davidhua1996 Jun 23, 2022
e635eb3
Merge branch 'dev-0.2.0' of github.com:WeBankFinTech/Streamis into de…
Davidhua1996 Jun 23, 2022
064f8ad
Merge remote-tracking branch 'wedata/dev-0.2.0-webank' into dev-0.2.0
Davidhua1996 Jun 23, 2022
8c2e66d
update init.sql ip port
Jun 23, 2022
9afa8a3
Merge remote-tracking branch 'origin/dev-0.2.0-webank' into dev-0.2.0…
Jun 23, 2022
c1068c6
Merge branch 'dev-0.2.0-webank' into dev-0.2.0
Davidhua1996 Jun 23, 2022
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ streamis-jobmanager/streamis-projectmanager-server/target
streamis-project/streamis-project-common/target
streamis-project/streamis-project-server/target

streamis-server/target
streamis-server/target
streamis-appconn/target
2 changes: 1 addition & 1 deletion assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>streamis</artifactId>
<groupId>com.webank.wedatasphere.streamis</groupId>
<version>0.1.0</version>
<version>0.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
116 changes: 65 additions & 51 deletions db/streamis_ddl.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,47 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;

-- ----------------------------
-- Table structure for linkis_stream_configuration_config_key
-- ----------------------------
DROP TABLE IF EXISTS `linkis_stream_configuration_config_key`;
CREATE TABLE `linkis_stream_configuration_config_key` (
`id` bigint(20) NOT NULL,
`key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`default_value` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`validate_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`validate_range` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`is_hidden` tinyint(1) NULL DEFAULT NULL,
`is_advanced` tinyint(1) NULL DEFAULT NULL,
`level` tinyint(1) NULL DEFAULT NULL,
`treename` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`type` int(10) NULL DEFAULT NULL,
`sort` int(10) NULL DEFAULT NULL,
`status` tinyint(10) NULL DEFAULT NULL COMMENT '1 custom , 2 selected ',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `key_index`(`key`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '配置信息' ROW_FORMAT = Compact;


-- ----------------------------
-- Table structure for linkis_stream_configuration_config_value
-- ----------------------------
DROP TABLE IF EXISTS `linkis_stream_configuration_config_value`;
CREATE TABLE `linkis_stream_configuration_config_value` (
`id` bigint(20) NOT NULL,
`configkey_id` bigint(20) NULL DEFAULT NULL,
`config_value` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`type` int(10) NULL DEFAULT NULL,
`job_id` bigint(20) NULL DEFAULT NULL,
`job_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`config_key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE,
INDEX `key`(`config_key`) USING BTREE,
INDEX `keyid`(`configkey_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '配置信息' ROW_FORMAT = Compact;

-- ----------------------------
-- Records of linkis_stream_configuration_config_value
-- ----------------------------
--
-- Table structure for table `linkis_stream_job_config_def`
--

DROP TABLE IF EXISTS `linkis_stream_job_config_def`;
CREATE TABLE `linkis_stream_job_config_def` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`key` varchar(100) COLLATE utf8_bin NOT NULL,
`name` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT 'Equals option',
`type` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT 'NONE' COMMENT 'def type, NONE: 0, INPUT: 1, SELECT: 2',
`sort` int(10) DEFAULT '0' COMMENT 'In order to sort the configurations that have the same level',
`description` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT 'Description of configuration',
`validate_type` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT 'Method the validate the configuration',
`validate_rule` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT 'Value of validation rule',
`style` varchar(200) COLLATE utf8_bin DEFAULT '' COMMENT 'Display style',
`visiable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0: hidden, 1: display',
`level` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0: root, 1: leaf',
`unit` varchar(25) COLLATE utf8_bin DEFAULT NULL COMMENT 'Unit symbol',
`default_value` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT 'Default value',
`ref_values` varchar(200) COLLATE utf8_bin DEFAULT '',
`parent_ref` bigint(20) DEFAULT NULL COMMENT 'Parent key of configuration def',
`required` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'If the value of configuration is necessary',
`is_temp` tinyint(1) DEFAULT '0' COMMENT 'Temp configuration',
PRIMARY KEY (`id`),
UNIQUE KEY `config_def_key` (`key`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

--
-- Table structure for table `linkis_stream_job_config`
--

DROP TABLE IF EXISTS `linkis_stream_job_config`;
CREATE TABLE `linkis_stream_job_config` (
`job_id` bigint(20) NOT NULL,
`job_name` varchar(200) COLLATE utf8_bin NOT NULL COMMENT 'Just store the job name',
`key` varchar(100) COLLATE utf8_bin NOT NULL,
`value` varchar(500) COLLATE utf8_bin NOT NULL,
`ref_def_id` bigint(20) DEFAULT NULL COMMENT 'Refer to id in config_def table',
PRIMARY KEY (`job_id`,`key`),
KEY `config_def_id` (`ref_def_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

-- ----------------------------
-- Table structure for linkis_stream_job_alarm_send_history
Expand Down Expand Up @@ -129,8 +125,8 @@ DROP TABLE IF EXISTS `linkis_stream_job`;

CREATE TABLE `linkis_stream_job` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`project_name` varchar(50) DEFAULT NULL,
`name` varchar(50) DEFAULT NULL,
`project_name` varchar(100) DEFAULT NULL,
`name` varchar(200) DEFAULT NULL,
`status` tinyint(1) DEFAULT '0' COMMENT '1:已完成 ,2:等待重启 ,3:告警 ,4:慢任务 ,5:运行中 ,6:失败任务',
`create_by` varchar(50) DEFAULT NULL,
`create_time` datetime DEFAULT NULL,
Expand All @@ -139,7 +135,8 @@ CREATE TABLE `linkis_stream_job` (
`job_type` varchar(30) DEFAULT NULL COMMENT '目前只支持flink.sql、flink.jar',
`submit_user` varchar(100) DEFAULT NULL,
`workspace_name` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY(`project_name`, `name`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='作业表';

/*Table structure for table `linkis_stream_job_version` */
Expand All @@ -155,7 +152,8 @@ CREATE TABLE `linkis_stream_job_version` (
`comment` varchar(255) DEFAULT NULL,
`create_time` datetime DEFAULT NULL,
`create_by` varchar(32) DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY(`job_id`, `version`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='作业表';

/*Table structure for table `linkis_stream_job_version_files` */
Expand All @@ -182,7 +180,7 @@ DROP TABLE IF EXISTS `linkis_stream_project`;
CREATE TABLE `linkis_stream_project` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`workspace_id` bigint(20) DEFAULT NULL,
`name` varchar(50) DEFAULT NULL,
`name` varchar(100) DEFAULT NULL,
`create_by` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='项目表';
Expand Down Expand Up @@ -211,14 +209,14 @@ DROP TABLE IF EXISTS `linkis_stream_task`;
CREATE TABLE `linkis_stream_task` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`job_version_id` bigint(20) NOT NULL,
`job_id` varchar(50) DEFAULT NULL,
`job_id` varchar(200) DEFAULT NULL,
`version` varchar(50) DEFAULT NULL,
`status` int(3) DEFAULT NULL,
`start_time` datetime DEFAULT NULL,
`last_update_time` datetime DEFAULT NULL,
`err_desc` varchar(10240) DEFAULT NULL,
`submit_user` varchar(50) DEFAULT NULL,
`linkis_job_id` varchar(50) DEFAULT NULL,
`linkis_job_id` varchar(200) DEFAULT NULL,
`linkis_job_info` mediumtext,
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='任务表';
Expand All @@ -239,4 +237,20 @@ CREATE TABLE `linkis_stream_alert_record` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;

DROP TABLE IF EXISTS `linkis_stream_project_privilege`;

CREATE TABLE `linkis_stream_project_privilege` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`project_id` bigint(20) NOT NULL,
`user_name` varchar(100) NOT NULL,
`privilege` tinyint(1) DEFAULT '0' NOT NULL COMMENT '1:发布权限 ,2:编辑权限 ,3:查看权限',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='项目权限表';


ALTER TABLE `linkis_stream_project` ADD create_time datetime DEFAULT NULL;
ALTER TABLE `linkis_stream_project` ADD last_update_by varchar(50) DEFAULT NULL;
ALTER TABLE `linkis_stream_project` ADD last_update_time datetime DEFAULT NULL;
ALTER TABLE `linkis_stream_project` ADD is_deleted tinyint unsigned DEFAULT 0;

SET FOREIGN_KEY_CHECKS = 1;
43 changes: 23 additions & 20 deletions db/streamis_dml.sql
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
-- ----------------------------
-- Records of linkis_stream_configuration_config_key
-- Records of linkis_stream_job_config_def
-- ----------------------------
INSERT INTO `linkis_stream_configuration_config_key` VALUES (1, 'wds.linkis.flink.resource', '资源配置', '资源配置', NULL, 'None', NULL, 0, 0, 1, '资源配置', 1, 0, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (2, 'wds.linkis.flink.taskmanager.num', 'Task Managers数量', 'Task Managers数量', '4', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', 0, 0, 2, '资源配置', 1, 1, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (3, 'wds.linkis.flink.jobmanager.memory', 'JobManager Memory', 'JobManager Memory', '1.5', 'Regex', '^([1-9]\\d{0,2}|1000)(G|g)$', 0, 0, 2, '资源配置', 1, 2, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (4, 'wds.linkis.flink.taskmanager.memory', 'TaskManager Memory', 'TaskManager Memory', '1.5', 'Regex', '^([1-9]\\d{0,2}|1000)(G|g)$', 0, 0, 2, '资源配置', 1, 3, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (5, 'wds.linkis.flink.jobmanager.cpus', 'JobManager CPUs', 'JobManager CPUs', '1', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', 0, 0, 2, '资源配置', 1, 4, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (6, 'wds.linkis.flink.taskManager.cpus', 'TaskManager CPUs', 'TaskManager CPUs', '1', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', 0, 0, 2, '资源配置', 1, 5, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (7, 'wds.linkis.flink.custom', '自定义参数', '自定义参数', NULL, 'None', NULL, 0, 0, 1, '自定义参数', 2, 0, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (8, 'wds.linkis.flink.produce', '生产配置', '生产配置', NULL, 'None', NULL, 0, 0, 1, '生产配置', 3, 0, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (9, 'wds.linkis.flink.checkpoint.interval', 'Checkpoint间隔', 'Checkpoint间隔', NULL, NULL, NULL, 0, 0, 2, '生产配置', 3, 1, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (10, 'wds.linkis.flink.reboot.strategy', '重启策略', '重启策略', '不重启,基于Checkpoint自动重启,无Checkpoint不重启', 'None', NULL, 0, 0, 2, '重启策略', 3, 2, 2);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (11, 'wds.linkis.flink.alert', '告警设置', '告警设置', NULL, 'None', NULL, 0, 0, 1, '告警设置', 4, 0, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (12, 'wds.linkis.flink.alert.rule', '告警规则', '告警规则', '任务日志中出现ERROR/EXCEPTION,任务核心指标出现异常', 'None', NULL, 0, 0, 2, '告警规则', 4, 1, 2);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (13, 'wds.linkis.flink.alert.user', '告警用户', '告警用户', NULL, NULL, NULL, 0, 0, 2, '告警用户', 4, 3, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (14, 'wds.linkis.flink.alert.leve', '告警级别', '告警级别', 'CLEARED,INDETERMINATE,WARNING,MINOR,MAJOR,CRITICAL', 'None', NULL, 0, 0, 2, '告警级别', 4, 2, 2);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (15, 'wds.linkis.flink.alert.failure.level', '失败时告警级别', '失败时告警级别', 'CLEARED,INDETERMINATE,WARNING,MINOR,MAJOR,CRITICAL', 'None', NULL, 0, 0, 2, '失败时告警级别', 4, 4, 2);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (16, 'wds.linkis.flink.alert.failure.user', '失败时告警用户', '失败时告警用户', NULL, 'None', NULL, 0, 0, 2, '失败时告警用户', 4, 5, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (17, 'wds.linkis.flink.authority', '权限设置', '权限设置', NULL, 'None', NULL, 0, 0, 1, '权限设置', 5, 0, 1);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (18, 'wds.linkis.flink.authority.author', '授权模式', '授权模式', '私密,指定全员可见,指定人员可见', 'None', NULL, 0, 0, 2, '授权模式', 5, 1, 2);
INSERT INTO `linkis_stream_configuration_config_key` VALUES (19, 'wds.linkis.flink.authority.visible', '可见人员', '可见人员', NULL, 'None', NULL, 0, 0, 2, '可见人员', 5, 2, 1);

INSERT INTO `linkis_stream_job_config_def` VALUES (1,'wds.linkis.flink.resource','资源配置','NONE',0,'资源配置','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (2,'wds.linkis.flink.app.parallelism','Parallelism并行度','NUMBER',0,'Parallelism并行度','Regex','^([1-9]\\d{0,1}|100)$','',1,1,NULL,'4','',1,1,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (3,'wds.linkis.flink.jobmanager.memory','JobManager Memory (M)','NUMBER',0,'JobManager Memory (M)','Regex','^([1-9]\\d{0,4}|100000)$','',1,1,'M','1024','',1,1,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (4,'wds.linkis.flink.taskmanager.memory','TaskManager Memory (M)','NUMBER',0,'JobManager Memory (M)','Regex','^([1-9]\\d{0,4}|100000)$','',1,1,'M','4096','',1,1,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (5,'wds.linkis.flink.taskmanager.numberOfTaskSlots','TaskManager Slot数量','NUMBER',0,'TaskManager Slot数量','Regex','^([1-9]\\d{0,1}|100)$','',1,1,NULL,'2','',1,1,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (6,'wds.linkis.flink.taskmanager.cpus','TaskManager CPUs','NUMBER',0,'TaskManager CPUs','Regex','^([1-9]\\d{0,1}|100)$','',1,1,NULL,'2','',1,1,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (7,'wds.linkis.flink.custom','Flink参数','NONE',0,'Flink自定义参数','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (8,'wds.linkis.flink.produce','生产配置','NONE',0,'生产配置','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (9,'wds.linkis.flink.checkpoint.switch','Checkpoint开关','SELECT',0,'Checkpoint开关',NULL,NULL,'',1,1,'','OFF','ON,OFF',8,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (10,'wds.linkis.flink.savepoint.path','快照(Savepoint)文件位置【仅需恢复任务时指定】','INPUT',4,'快照(Savepoint)文件位置','None',NULL,'',1,1,NULL,NULL,'',8,0,1);
INSERT INTO `linkis_stream_job_config_def` VALUES (11,'wds.linkis.flink.alert','告警设置','NONE',0,'告警设置','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (12,'wds.linkis.flink.alert.rule','告警规则','NONE',0,'告警规则','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (13,'wds.linkis.flink.alert.user','告警用户','NONE',0,'告警用户',NULL,NULL,'',1,1,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (14,'wds.linkis.flink.alert.level','告警级别','NONE',0,'告警级别','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (15,'wds.linkis.flink.alert.failure.level','失败时告警级别','NONE',0,'失败时告警级别','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (16,'wds.linkis.flink.alert.failure.user','失败时告警用户','NONE',0,'失败时告警用户','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (32,'wds.linkis.flink.authority','权限设置','NONE',0,'权限设置','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (33,'wds.linkis.flink.authority.visible','可见人员','INPUT',0,'可见人员','None',NULL,'',1,1,NULL,NULL,'',32,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (34,'wds.linkis.rm.yarnqueue','使用Yarn队列','INPUT',0,'使用Yarn队列','None',NULL,'',1,1,NULL,NULL,'',1,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (35,'wds.linkis.flink.app.fail-restart.switch','作业失败自动拉起开关','SELECT',1,'作业失败自动拉起开关','None',NULL,'',1,1,NULL,'OFF','ON,OFF',8,0,0);
INSERT INTO `linkis_stream_job_config_def` VALUES (36,'wds.linkis.flink.app.start-auto-restore.switch','作业启动状态自恢复','SELECT',2,'作业启动状态自恢复','None',NULL,'',1,1,NULL,'ON','ON,OFF',8,0,0);
24 changes: 19 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>com.webank.wedatasphere.streamis</groupId>
<artifactId>streamis</artifactId>
<version>0.1.0</version>
<version>0.2.0</version>
<packaging>pom</packaging>

<name>Streamis Project Parent POM</name>
Expand All @@ -38,14 +38,16 @@

<modules>
<module>streamis-jobmanager</module>
<module>streamis-server</module>
<module>streamis-project</module>
<module>streamis-server</module>
<module>assembly</module>
<module>streamis-appconn</module>
</modules>

<properties>
<linkis.version>1.0.3</linkis.version>
<streamis.version>0.1.0</streamis.version>
<linkis.version>1.1.1</linkis.version>
<dss.version>1.1.0</dss.version>
<streamis.version>0.2.0</streamis.version>
<scala.version>2.11.12</scala.version>
<jdk.compile.version>1.8</jdk.compile.version>
<maven.version>3.3.3</maven.version>
Expand All @@ -67,8 +69,9 @@
<jersey-bean-validation.version>2.21</jersey-bean-validation.version>
<aspectj.version>1.9.5</aspectj.version>
<xstream.version>1.4.19</xstream.version>
<jobmanager.version>0.1.0</jobmanager.version>
<jobmanager.version>0.2.0</jobmanager.version>
<mysql.connector.version>5.1.47</mysql.connector.version>
<validation.api.version>2.0.1.Final</validation.api.version>
</properties>


Expand Down Expand Up @@ -105,6 +108,12 @@
<artifactId>linkis-mybatis</artifactId>
<version>${linkis.version}</version>
</dependency>
<!--scheduler module-->
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-scheduler</artifactId>
<version>${linkis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-module</artifactId>
Expand Down Expand Up @@ -152,6 +161,11 @@
<groupId>com.thoughtworks.xstream</groupId>
<version>${xstream.version}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${validation.api.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Loading