From 6dcc26f52e9ea59057db25a44bc65ded65bc5dfd Mon Sep 17 00:00:00 2001 From: Chenshuai <785659165@qq.com> Date: Fri, 15 Sep 2023 17:30:25 +0800 Subject: [PATCH] feat: add task priority in alert info (#14919) Co-authored-by: Jim Chen Co-authored-by: Aaron Wang --- .../dolphinscheduler/dao/entity/ProcessAlertContent.java | 2 ++ .../apache/dolphinscheduler/dao/entity/TaskAlertContent.java | 2 ++ .../dolphinscheduler/service/alert/ProcessAlertManager.java | 3 +++ 3 files changed, 7 insertions(+) diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java index 31f89d1348..4382f17f8f 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java @@ -91,6 +91,8 @@ public class ProcessAlertContent implements Serializable { private Date taskEndTime; @JsonProperty("taskHost") private String taskHost; + @JsonProperty("taskPriority") + private String taskPriority; @JsonProperty("logPath") private String logPath; diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java index 5d2f1c8e08..d1490b8fde 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java @@ -60,6 +60,8 @@ public class TaskAlertContent implements Serializable { private Date endTime; @JsonProperty("host") private String host; + @JsonProperty("taskPriority") + private String taskPriority; @JsonProperty("logPath") private String logPath; diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java index 02dcdfa962..4a403215ba 100644 --- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java +++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java @@ -144,6 +144,7 @@ public class ProcessAlertManager { .taskStartTime(task.getStartTime()) .taskEndTime(task.getEndTime()) .taskHost(task.getHost()) + .taskPriority(task.getTaskInstancePriority().getDescp()) .logPath(task.getLogPath()) .build(); failedTaskList.add(processAlertContent); @@ -173,6 +174,7 @@ public class ProcessAlertManager { .taskCode(taskInstance.getTaskCode()) .taskName(taskInstance.getName()) .taskHost(taskInstance.getHost()) + .taskPriority(taskInstance.getTaskInstancePriority().getDescp()) .retryTimes(taskInstance.getRetryTimes()) .build(); toleranceTaskInstanceList.add(processAlertContent); @@ -387,6 +389,7 @@ public class ProcessAlertManager { .startTime(taskInstance.getStartTime()) .endTime(taskInstance.getEndTime()) .host(taskInstance.getHost()) + .taskPriority(taskInstance.getTaskInstancePriority().getDescp()) .logPath(taskInstance.getLogPath()) .build();