This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from c8d5454 merge form dev
add c1875e8 [Feature-4596] Add a description for the system env path in
common.properties (#4638)
add ef0def3 [Feature-3826]sql node adds alarm group field (#4602)
add 243ad38 [Improvement][alert-spi]plugin instance only saves the main
information
add 5f23ca5 [Improvement][alert-spi]plugin instance only saves the main
information
add 82340b3 code style
add 81e2b82 Store plug-in information when loading plug-in, query
database when removing alert
add a1e6a0f Merge branch 'dev' into alert_param_reduce
add 40e3795 Store plug-in information when loading plug-in, query
database when removing alert Delete unused class
add a0725e9 fix ut error
add 65779f0 fix ut error
add 6877073 add ut
add 8300444 code style
add 9072e88 removed unused fields
add dc04f88 Merge branch 'dev' into alert_param_reduce
add fbb77c5 merge current
add a3bbfdb Capture when the alarm is abnormal
add 947dcb9 Merge pull request #4616 from CalvinKirs/alert_param_reduce
add ffdda00 [Feature-3826]sql node adds alarm group field
add 79779da Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 5ab9c8d Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add b912c98 fix
add 54c0ec0 fix
add 0dea95e Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 5acf718 [Improvement-3878][ui] Fixed the problem that custom
parameters could not be edited and zk displayed abnormally when the workflow
started
add 3d3796e fix
add a150d7a fix
add ee09ac6 Merge pull request #4644 from break60/dev
add 3c461fb [Improvement][UI] Support more file types in file detail page
add 6a40b75 Merge pull request #4646 from chengshiwen/improve-file-type
add e05d93a fix ui warningInstance title support internationalization.
add 7db8ca2 imp ui alert groups description add filter null.
add 3a3abdd remove abandoned fields.
add 86ee8ff Merge pull request #4639 from
zhuangchong/dev-fix-ui-warning-instance-i18n
add 6a49d81 [Fix-4566][worker] worker-server logback partial logs are not
printed (#4567)
add 988649a Merge remote-tracking branch 'upstream/dev' into spilit
No new revisions were added by this update.
Summary of changes:
.../alert/dingtalk/DingTalkAlertChannel.java | 7 +-
.../plugin/alert/email/EmailAlertChannel.java | 7 +-
.../alert/email/EmailAlertChannelFactoryTest.java | 23 +----
.../plugin/alert/email/EmailAlertChannelTest.java | 6 +-
.../plugin/alert/feishu/FeiShuAlertChannel.java | 7 +-
.../plugin/alert/http/HttpAlertChannel.java | 7 +-
.../plugin/alert/http/HttpAlertChannelTest.java | 7 +-
.../plugin/alert/script/ScriptAlertChannel.java | 7 +-
.../script/ScriptAlertChannelFactoryTest.java | 2 -
.../plugin/alert/wechat/WeChatAlertChannel.java | 7 +-
.../apache/dolphinscheduler/alert/AlertServer.java | 7 +-
.../alert/manager/EmailManager.java | 55 -----------
.../dolphinscheduler/alert/manager/MsgManager.java | 40 --------
.../alert/plugin/AlertPluginManager.java | 13 ++-
.../alert/processor/AlertRequestProcessor.java | 9 +-
.../dolphinscheduler/alert/runner/AlertSender.java | 26 +++--
.../dolphinscheduler/alert/AlertServerTest.java | 9 +-
.../alert/plugin/EmailAlertPluginTest.java | 2 +-
.../alert/processor/AlertRequestProcessorTest.java | 11 +--
.../alert/runner/AlertSenderTest.java | 36 +++----
.../impl/AlertPluginInstanceServiceImpl.java | 65 ++++++++++--
.../service/AlertPluginInstanceServiceTest.java | 109 ++++++++++++++++++++-
.../src/main/resources/common.properties | 2 +-
.../org/apache/dolphinscheduler/dao/PluginDao.java | 18 ++--
.../src/main/resources/logback-master.xml | 4 +-
.../src/main/resources/logback-worker.xml | 9 +-
.../dolphinscheduler/spi/alert/AlertInfo.java | 8 +-
.../dolphinscheduler/spi/alert/AlertResult.java | 8 ++
.../spi/params/base/PluginParams.java | 4 +
.../formModel/tasks/_source/dependItemList.vue | 30 +++---
.../formModel/tasks/_source/localParams.vue | 2 +-
.../_source/warningGroups.vue} | 28 +++---
.../dag/_source/formModel/tasks/dependent.vue | 1 -
.../home/pages/dag/_source/formModel/tasks/sql.vue | 80 ++++-----------
.../home/pages/dag/_source/startingParam/index.vue | 2 +-
.../js/conf/home/pages/dag/definitionDetails.vue | 4 +-
.../src/js/conf/home/pages/dag/index.vue | 4 +-
.../src/js/conf/home/pages/dag/instanceDetails.vue | 4 +-
.../pages/servers/_source/zookeeperDirectories.vue | 8 +-
.../home/pages/monitor/pages/servers/worker.vue | 2 +-
.../pages/definition/pages/list/_source/list.vue | 1 +
.../pages/definition/pages/list/_source/start.vue | 6 +-
.../pages/definition/pages/list/_source/timing.vue | 7 +-
.../projects/pages/definition/timing/index.vue | 4 +-
.../resource/pages/file/pages/_source/common.js | 2 +-
.../resource/pages/file/pages/details/index.vue | 10 +-
.../pages/resource/pages/file/pages/edit/index.vue | 10 +-
.../security/pages/warningGroups/_source/list.vue | 6 +-
.../_source/createWarningInstance.vue | 10 +-
.../pages/security/pages/warningInstance/index.vue | 6 +-
.../src/js/conf/home/store/security/actions.js | 13 +++
.../src/js/conf/home/store/security/state.js | 1 +
.../src/js/module/i18n/locale/en_US.js | 7 +-
.../src/js/module/i18n/locale/zh_CN.js | 7 +-
54 files changed, 417 insertions(+), 353 deletions(-)
delete mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java
delete mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java
copy
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/{_source/workerGroups.vue
=> tasks/_source/warningGroups.vue} (72%)
