Skip to content

Commit f6a0c41

Browse files
committed
add flink status monitor
1 parent dd0e6db commit f6a0c41

5 files changed

Lines changed: 19 additions & 17 deletions

File tree

tis-datax/tis-datax-dolphinscheduler-plugin/src/main/java/com/qlangtech/tis/plugin/datax/doplinscheduler/DSWorkflowPayload.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.qlangtech.tis.coredefine.module.action.DistributeJobTriggerBuildResult;
2828
import com.qlangtech.tis.dao.ICommonDAOContext;
2929
import com.qlangtech.tis.datax.IDataxProcessor;
30-
import com.qlangtech.tis.datax.StoreResourceType;
3130
import com.qlangtech.tis.datax.job.DataXJobWorker;
3231
import com.qlangtech.tis.exec.ExecutePhaseRange;
3332
import com.qlangtech.tis.fullbuild.IFullBuildContext;
@@ -396,7 +395,7 @@ private void innerSaveJob(
396395
// URL url = new URL(this.exportCfg.processDefinition().toString());
397396
List<PostParam> params = Lists.newArrayList();
398397
// params.add(new PostParam("projectCode", 117370558003456l));
399-
params.add(new PostParam("name", this.exportCfg.processName));
398+
params.add(new PostParam("name", this.exportCfg.name));
400399
params.add(new PostParam("description", this.exportCfg.processDescription));
401400
params.add(new PostParam("globalParams", "[]"));
402401
params.add(new PostParam("locations", JsonUtil.toString(locationArray)));

tis-datax/tis-datax-dolphinscheduler-plugin/src/main/java/com/qlangtech/tis/plugin/datax/doplinscheduler/export/ExportTISPipelineToDolphinscheduler.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public class ExportTISPipelineToDolphinscheduler extends DefaultDataXProcessorMa
6666
public static final String FIELD_PROJECT_CODE = "projectCode";
6767

6868

69-
@FormField(ordinal = 1, identity = true, type = FormFieldType.INPUTTEXT, validate = {Validator.require, Validator.identity, Validator.forbid_start_with_number})
70-
public String processName;
69+
// @FormField(ordinal = 1, identity = true, type = FormFieldType.INPUTTEXT, validate = {Validator.require, Validator.identity, Validator.forbid_start_with_number})
70+
// public String processName;
7171

7272
@FormField(ordinal = 2, type = FormFieldType.SELECTABLE, validate = {Validator.require})
7373
public String dsEndpoint;
@@ -126,10 +126,10 @@ public DolphinSchedulerURLBuilder processDefinition() {
126126
// return new StringBuffer("http://192.168.28.201:12345/dolphinscheduler/projects/" + this.projectCode + "/process-definition");
127127
}
128128

129-
@Override
130-
public String identityValue() {
131-
return this.processName;
132-
}
129+
// @Override
130+
// public String identityValue() {
131+
// return this.processName;
132+
// }
133133

134134
public DolphinSchedulerEndpoint getDSEndpoint() {
135135
DolphinSchedulerEndpoint dsEndpoint = ParamsConfig.getItem(this.dsEndpoint, DolphinSchedulerEndpoint.DISPLAY_NAME);
@@ -362,7 +362,7 @@ protected boolean validateAll(IControlMsgHandler msgHandler, Context context, Po
362362
********************************************************/
363363
DolphinSchedulerResponse response = export.processDefinition()
364364
.appendSubPath("query-by-name")
365-
.appendQueryParam("name", export.processName).applyGet();
365+
.appendQueryParam("name", export.name).applyGet();
366366
if (!response.isSuccess()) {
367367
Status status = Status.findStatusBy(response.getCode());
368368
switch (status) {
@@ -386,7 +386,7 @@ protected boolean validateAll(IControlMsgHandler msgHandler, Context context, Po
386386
//http://192.168.28.201:12345/dolphinscheduler/swagger-ui/index.html?language=zh_CN&lang=cn#/%E6%B5%81%E7%A8%8B%E5%AE%9A%E4%B9%89%E7%9B%B8%E5%85%B3%E6%93%8D%E4%BD%9C/verifyProcessDefinitionName
387387
DolphinSchedulerResponse response = export.processDefinition()
388388
.appendSubPath("verify-name")
389-
.appendQueryParam("name", export.processName).applyGet();
389+
.appendQueryParam("name", export.name).applyGet();
390390

391391
if (!response.isSuccess()) {
392392
Status status = Status.findStatusBy(response.getCode());

tis-datax/tis-datax-dolphinscheduler-plugin/src/main/resources/com/qlangtech/tis/plugin/datax/doplinscheduler/export/ExportTISPipelineToDolphinscheduler.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"dftVal": "Default",
2828
"help": "对应的dolphinscheduler中工作流执行过程中需要回调TIS,设置相应参数"
2929
},
30-
"processName": {
30+
"name": {
3131
"label": "工作流名称",
3232
"help": "对应的dolphinscheduler中工作流名称,确保同一项目下工作流名称唯一,不能重复",
3333
"dftVal": "com.qlangtech.tis.plugin.datax.doplinscheduler.export.ExportTISPipelineToDolphinscheduler.dftProcessName():uncache_true"

tis-datax/tis-datax-kingbase-plugin/src/main/resources/com/qlangtech/tis/plugin/ds/kingbase/KingBaseDataSourceFactory.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@
66
"dispatch": {
77
"label": "读写分离",
88
"dftVal": "off"
9+
},
10+
"port": {
11+
"dftVal": 4321
912
}
1013
}

tis-incr/tis-realtime-flink/src/main/java/com/qlangtech/plugins/incr/flink/alert/AddMonitorForEvents.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public class AddMonitorForEvents extends DefaultDataXProcessorManipulate impleme
2626

2727
private static final String KEY_ALERT_CHANNEL = "alertChannel";
2828

29-
@FormField(ordinal = 1, identity = true, type = FormFieldType.INPUTTEXT, validate = {Validator.require, Validator.identity, Validator.forbid_start_with_number})
30-
public String name;
29+
// @FormField(ordinal = 1, identity = true, type = FormFieldType.INPUTTEXT, validate = {Validator.require, Validator.identity, Validator.forbid_start_with_number})
30+
// public String name;
3131

3232
/**
3333
* 是否启效
@@ -95,10 +95,10 @@ protected void afterManipuldateProcess(IPluginContext pluginContext, Optional<Co
9595

9696
}
9797

98-
@Override
99-
public String identityValue() {
100-
return this.name;
101-
}
98+
// @Override
99+
// public String identityValue() {
100+
// return this.name;
101+
// }
102102

103103
@TISExtension
104104
public static class DefaultDesc extends DefaultDataXProcessorManipulate.BasicDesc implements IEndTypeGetter {

0 commit comments

Comments
 (0)