You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ga...@apache.org on 2020/09/28 04:07:52 UTC
[incubator-dolphinscheduler] branch alert_plugin_design updated
(2c67b41 -> 392e9f5)
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a change to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
discard 2c67b41 [Feature-3189][alert,spi,dao,plugin-api] base code of dolphinscheduler spi and alert plugin implement (#3601)
discard ff3d3f0 [feature][ui]Alert plugin design (#3734)
discard 94ef848 fix
discard 2e486ca fix
discard 99abbf7 Modify node version
discard efec7f3 Add form-create plug-in and alarm group management add sample demo
discard 8de96ac [feature-3665][ui]Add element-ui (#3666)
add 8ef0431 done (#3752)
add 375ec12 [Feature-3773][processInstance, taskInstance] Change title name : Replacement System.currentTimeMillis () (#3774)
add db663a1 [Improvement][remote]load balance warm up (#3770)
add 3b58145 [Feature]Add Python task "task variable / result transfer" implementation (#3659)
add eb597e6 [Improvement][API] simplify with stream (#3764)
add 11d3c2c [Improvement][server]lower weight round robin support weight (#3768)
new a9e3792 [feature-3665][ui]Add element-ui (#3666)
new 2e117bb Add form-create plug-in and alarm group management add sample demo
new 50bfb30 Modify node version
new 9221b24 fix
new 8ac1462 fix
new 3d5c34a [feature][ui]Alert plugin design (#3734)
new 392e9f5 [Feature-3189][alert,spi,dao,plugin-api] base code of dolphinscheduler spi and alert plugin implement (#3601)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2c67b41)
\
N -- N -- N refs/heads/alert_plugin_design (392e9f5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../service/impl/ProcessDefinitionServiceImpl.java | 37 ++--
.../api/service/ProcessDefinitionServiceTest.java | 84 ++++++++
.../apache/dolphinscheduler/common/Constants.java | 4 +
.../dolphinscheduler/common/task/TaskParams.java | 78 ++++++++
.../dolphinscheduler/common/utils/DateUtils.java | 10 +
.../common/utils/VarPoolUtils.java | 124 ++++++++++++
.../common/utils/DateUtilsTest.java | 19 +-
.../common/utils/VarPoolUtilsTest.java | 73 +++++++
.../dao/entity/ProcessInstance.java | 213 ++++++++++++++-------
.../dolphinscheduler/dao/entity/TaskInstance.java | 12 ++
.../remote/command/TaskExecuteResponseCommand.java | 12 ++
.../dolphinscheduler/remote/utils/Constants.java | 5 +
.../apache/dolphinscheduler/remote/utils/Host.java | 48 ++++-
.../master/dispatch/host/assign/HostWeight.java | 44 +++--
.../host/assign/LowerWeightRoundRobin.java | 13 +-
.../master/processor/TaskResponseProcessor.java | 3 +-
.../master/processor/queue/TaskResponseEvent.java | 18 +-
.../processor/queue/TaskResponseService.java | 3 +-
.../server/master/runner/MasterExecThread.java | 15 +-
.../server/worker/registry/WorkerRegistry.java | 44 +++--
.../server/worker/runner/TaskExecuteThread.java | 1 +
.../worker/task/AbstractCommandExecutor.java | 15 +-
.../server/worker/task/AbstractTask.java | 13 ++
.../server/worker/task/python/PythonTask.java | 189 +++++++++---------
.../host/assign/LowerWeightRoundRobinTest.java | 51 ++++-
.../dispatch/host/assign/RandomSelectorTest.java | 16 +-
.../host/assign/RoundRobinSelectorTest.java | 70 ++++---
.../dolphinscheduler/server/utils/HostTest.java | 29 ++-
.../service/process/ProcessService.java | 5 +-
pom.xml | 2 +
sql/dolphinscheduler-postgre.sql | 2 +
sql/dolphinscheduler_mysql.sql | 2 +
.../1.3.3_schema/mysql/dolphinscheduler_ddl.sql | 40 ++++
.../postgresql/dolphinscheduler_ddl.sql | 36 ++++
tools/dependencies/check-LICENSE.sh | 4 +-
35 files changed, 1024 insertions(+), 310 deletions(-)
create mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskParams.java
create mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/VarPoolUtils.java
create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/VarPoolUtilsTest.java
copy dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/NettyUtilTest.java => dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/HostTest.java (58%)
[incubator-dolphinscheduler] 04/07: fix
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 9221b24d5703062269f6ad0553f4b562b07299c6
Author: break60 <79...@qq.com>
AuthorDate: Mon Sep 7 15:34:51 2020 +0800
fix
---
dolphinscheduler-ui/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 2aaf946..7aaa69a 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -29,7 +29,7 @@
<name>${project.artifactId}</name>
<properties>
- <node.version>v10.16.0</node.version>
+ <node.version>v10.16.2</node.version>
<npm.version>6.11.3</npm.version>
<sonar.sources>src</sonar.sources>
</properties>
[incubator-dolphinscheduler] 05/07: fix
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 8ac14629b51b6ba4ddb1365b277416bdea0fc2df
Author: break60 <79...@qq.com>
AuthorDate: Mon Sep 7 15:37:54 2020 +0800
fix
---
dolphinscheduler-ui/pom.xml | 2 +-
dolphinscheduler-ui/src/js/conf/home/index.js | 2 +-
dolphinscheduler-ui/src/js/conf/login/index.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 7aaa69a..13644ba 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -29,7 +29,7 @@
<name>${project.artifactId}</name>
<properties>
- <node.version>v10.16.2</node.version>
+ <node.version>v12.12.0</node.version>
<npm.version>6.11.3</npm.version>
<sonar.sources>src</sonar.sources>
</properties>
diff --git a/dolphinscheduler-ui/src/js/conf/home/index.js b/dolphinscheduler-ui/src/js/conf/home/index.js
index d62ac47..6d76554 100644
--- a/dolphinscheduler-ui/src/js/conf/home/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/index.js
@@ -48,7 +48,7 @@ Vue.use(ElementUI)
// Vue.use(ans)
Vue.use(ans, useOpt)
-Vue.use(formCreate)
+Vue.use(formCreate, {maker})
sync(store, router)
diff --git a/dolphinscheduler-ui/src/js/conf/login/index.js b/dolphinscheduler-ui/src/js/conf/login/index.js
index 7e94ddf..ab721a7 100644
--- a/dolphinscheduler-ui/src/js/conf/login/index.js
+++ b/dolphinscheduler-ui/src/js/conf/login/index.js
@@ -35,7 +35,7 @@ Vue.use(ElementUI)
Vue.use(ans)
-Vue.use(formCreate)
+Vue.use(formCreate, {maker})
Vue.config.devtools = true
Vue.config.productionTip = true
[incubator-dolphinscheduler] 07/07: [Feature-3189][alert, spi, dao,
plugin-api] base code of dolphinscheduler spi and alert plugin
implement (#3601)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 392e9f5fb26912bacdb7d8831ea77deee7b9953a
Author: gaojun2048 <32...@users.noreply.github.com>
AuthorDate: Sat Sep 26 16:54:20 2020 +0800
[Feature-3189][alert,spi,dao,plugin-api] base code of dolphinscheduler spi and alert plugin implement (#3601)
* DS SPI
* Add DolphinScheduler SPI , and rebuilt the code of the Alert plug-in based on SPI
* Add DolphinScheduler SPI , and rebuilt the code of the Alert plug-in based on SPI
* add TODO
* delete
* compile
* spi commit
* Plugin Alert
* fix some bug
* add todo
* change web ui from alpacajs to form-create
* remove module
* add plugin schema
* add license header
* update alert and spi module version
* update the alert plugin sub module version
* comment the maven.local.repository param
* move utils from spi to common module
* add license header
* add license header and delete some chinese comment
* update spi packages
* delete no use alert_xx.properties
* update mysql.connector.version back to 5.1.34
* delete no use comment in pom.xml
* update email stmp password
* add license
* add semicolon to sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql file
* format the code style
* format new clase file with checkstyle
* update plugin params to Builder model
* move JSONUtils to SPI because plugin can not dependency common module
* move JSONUtils to SPI because plugin can not dependency common module
* delete collection dependency
* replace PluginParamsTransfer to spi PluginParamsTransfer
* update dolphinscheduler-maven-plugin to 1.0.0
* update license
* update apache-rat-plugin add exclude '.iml' file
* check license
* ArtifactResolver only use in development and configPlugins is not empty
* ArtifactResolver only use in development and configPlugins is not empty
* ArtifactResolver only use in development and configPlugins is not empty
* default datasource should be postgresql
* add license files
* add license files
* postgresql port should be 5432
* postgresql test
* mv show_type to spi
add license header to AlertConstants
* check style fix
* copy check style file from branch dev
* alert show_type set by plugin
* alert show_type set by plugin
* add PluginDefineMapper to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/registry/DependencyConfig.java
* add Bean to TaskCallbackServiceTestConfig
* add Bean to TaskCallbackServiceTestConfig
* fix check style
* check style fix
* [feature-3665][ui]Add element-ui (#3666)
* [feature-3665][ui]Add element-ui
* add license
* fix check style
* [Feature-3682][ui]Add form-create plug-in and alarm group management add sample demo (#3683)
* Add form-create plug-in and alarm group management add sample demo
* Modify node version
* fix
* fix
* check style fix
* rollback test change
* rollback test change
* rollback dao pom change
* [feature-3665][ui]Add element-ui (#3666)
* [feature-3665][ui]Add element-ui
* add license
* Add form-create plug-in and alarm group management add sample demo
* Modify node version
* fix
* fix
* add ut to pom.xml
* add upgrade schema to global schema
* fix ut failed
* fix ut failed
* fix ut failed
* fix ut failed
* add test EmailAlertPluginTest to pom.xml
* fix ut failed
* fix ut failed
* fix check style
* update license header to presto license header
* presto license header not check
* fix ut coverage
* fix ut coverage
* fix ut
* fix ut
* fix ut
* fix ut coverage
* fix ut coverage
* fix ut coverage
* fix ut coverage
* fix ut coverage
* fix ut coverage
Co-authored-by: break60 <79...@qq.com>
---
LICENSE | 4 +
.../dolphinscheduler-alert-dingtalk/pom.xml | 32 +
.../dolphinscheduler-alert-email}/pom.xml | 107 +--
.../plugin/alert/email/EmailAlertChannel.java | 69 ++
.../alert/email/EmailAlertChannelFactory.java | 137 ++++
.../plugin/alert/email/EmailAlertPlugin.java | 25 +-
.../plugin/alert/email/EmailConstants.java | 75 ++
.../plugin/alert/email/ExcelUtils.java | 149 ++++
.../plugin/alert/email/MailParamsConstants.java | 61 ++
.../plugin/alert/email/MailSender.java | 429 ++++++++++++
.../alert/email}/template/AlertTemplate.java | 21 +-
.../alert/email/template}/DefaultHTMLTemplate.java | 96 +--
.../alert/email/EmailAlertChannelFactoryTest.java | 75 ++
.../plugin/alert/email/EmailAlertChannelTest.java | 174 +++++
.../plugin/alert/email}/ExcelUtilsTest.java | 14 +-
.../plugin/alert/email/MailUtilsTest.java | 136 ++++
.../email/template/DefaultHTMLTemplateTest.java | 105 +++
.../dolphinscheduler-alert-wechat/pom.xml | 32 +
.../pom.xml | 45 +-
dolphinscheduler-alert/pom.xml | 80 ++-
.../apache/dolphinscheduler/alert/AlertServer.java | 81 ++-
.../alert/manager/DingTalkManager.java | 14 +-
.../alert/manager/EmailManager.java | 110 +--
.../alert/manager/EnterpriseWeChatManager.java | 20 +-
.../dolphinscheduler/alert/manager/MsgManager.java | 10 +-
.../alert/plugin/AbstractDolphinPluginManager.java | 18 +-
.../alert/plugin/AlertPluginManager.java | 98 +++
.../alert/plugin/DolphinPluginClassLoader.java | 136 ++++
.../alert/plugin/DolphinPluginDiscovery.java | 136 ++++
.../alert/plugin/DolphinPluginLoader.java | 191 ++++++
.../alert/plugin/DolphinPluginManagerConfig.java | 121 ++++
.../alert/plugin/EmailAlertPlugin.java | 141 ----
.../dolphinscheduler/alert/runner/AlertSender.java | 91 +--
.../dolphinscheduler/alert/utils/Constants.java | 57 +-
.../alert/utils/DingTalkUtils.java | 18 +-
.../alert/utils/EnterpriseWeChatUtils.java | 38 +-
.../dolphinscheduler/alert/utils/ExcelUtils.java | 140 ----
.../dolphinscheduler/alert/utils/FuncUtils.java | 3 +-
.../dolphinscheduler/alert/utils/MailUtils.java | 704 +++++++++----------
.../alert/utils/PropertyUtils.java | 66 +-
.../src/main/resources/alert.properties | 49 +-
.../alert/plugin/AlertPluginManagerTest.java | 63 ++
.../alert/plugin/DolphinPluginLoaderTest.java | 58 ++
.../alert/plugin/EmailAlertPluginTest.java | 255 +++++--
.../alert/template/AlertTemplateFactoryTest.java | 65 --
.../template/impl/DefaultHTMLTemplateTest.java | 96 ---
.../alert/utils/DingTalkUtilsTest.java | 34 +-
.../alert/utils/EnterpriseWeChatUtilsTest.java | 40 +-
.../alert/utils/FuncUtilsTest.java | 10 +-
.../alert/utils/MailUtilsTest.java | 190 ------
.../alert/utils/PropertyUtilsTest.java | 17 +-
dolphinscheduler-common/pom.xml | 5 -
.../apache/dolphinscheduler/common/Constants.java | 11 +-
.../common/plugin/FilePluginManager.java | 107 ---
.../common/plugin/PluginClassLoader.java | 154 -----
.../common/plugin/FilePluginManagerTest.java | 72 --
.../common/plugin/PluginClassLoaderTest.java | 61 --
dolphinscheduler-dao/pom.xml | 242 +++----
.../org/apache/dolphinscheduler/dao/AlertDao.java | 64 +-
.../org/apache/dolphinscheduler/dao/PluginDao.java | 96 +++
.../apache/dolphinscheduler/dao/entity/Alert.java | 78 ++-
.../dao/entity/AlertPluginInstance.java | 145 ++++
.../dolphinscheduler/dao/entity/PluginDefine.java | 125 ++++
.../dao/mapper/AlertPluginInstanceMapper.java | 35 +-
.../dao/mapper/PluginDefineMapper.java | 40 +-
.../src/main/resources/datasource.properties | 8 +-
.../dao/mapper/AlertPluginInstanceMapper.xml | 32 +
.../dao/mapper/PluginDefineMapper.xml | 38 ++
.../apache/dolphinscheduler/dao/AlertDaoTest.java | 16 +-
.../dao/mapper/AlertMapperTest.java | 64 +-
.../dao/mapper/AlertPluginInstanceMapperTest.java | 118 ++++
.../dao/mapper/PluginDefineTest.java | 77 +++
dolphinscheduler-dist/release-docs/LICENSE | 13 +-
dolphinscheduler-dist/release-docs/NOTICE | 23 -
.../release-docs/licenses/LICENSE-aether-api.txt | 86 +++
.../LICENSE-animal-sniffer-annotations.txt | 21 +
.../licenses/LICENSE-checker-compat-qual.txt | 22 +
.../licenses/LICENSE-j2objc-annotations.txt | 21 +-
.../release-docs/licenses/LICENSE-javax.mail.txt | 759 ---------------------
.../release-docs/licenses/LICENSE-resolver.txt | 18 +-
.../plugin/utils/PropertyUtils.java | 190 ------
.../plugin/model/AlertDataTest.java | 80 ---
.../plugin/model/AlertInfoTest.java | 54 --
.../plugin/utils/PropertyUtilsTest.java | 83 ---
.../src/test/resources/plugin.properties | 22 -
dolphinscheduler-server/pom.xml | 325 ++++-----
.../server/utils/AlertManager.java | 16 +-
.../server/worker/task/sql/SqlTask.java | 217 +++---
.../server/registry/DependencyConfig.java | 79 ++-
.../processor/TaskCallbackServiceTestConfig.java | 65 +-
.../pom.xml | 34 +-
.../spi/DolphinSchedulerPlugin.java | 38 ++
.../dolphinscheduler/spi/alert/AlertChannel.java | 17 +-
.../spi/alert/AlertChannelFactory.java | 35 +-
.../dolphinscheduler/spi/alert/AlertConstants.java | 17 +-
.../dolphinscheduler/spi/alert}/AlertData.java | 56 +-
.../dolphinscheduler/spi/alert/AlertInfo.java | 37 +-
.../dolphinscheduler/spi/alert/AlertResult.java | 30 +-
.../dolphinscheduler/spi/alert}/ShowType.java | 8 +-
.../spi/classloader/ThreadContextClassLoader.java | 32 +-
.../dolphinscheduler/spi/params/InputParam.java | 94 +++
.../dolphinscheduler/spi/params/PasswordParam.java | 89 +++
.../spi/params/PluginParamsTransfer.java | 53 ++
.../dolphinscheduler/spi/params/RadioParam.java | 106 +++
.../dolphinscheduler/spi/params/base/DataType.java | 24 +-
.../dolphinscheduler/spi/params/base/FormType.java | 25 +-
.../spi/params/base/ParamsOptions.java | 72 ++
.../spi/params/base/ParamsProps.java | 48 +-
.../spi/params/base/PluginParams.java | 155 +++++
.../spi/params/base/PropsType.java | 24 +-
.../spi/params/base/TriggerType.java | 23 +-
.../dolphinscheduler/spi/params/base/Validate.java | 137 ++++
.../dolphinscheduler/spi/utils/JSONUtils.java | 156 +++++
.../dolphinscheduler/spi/utils/StringUtils.java | 32 +-
.../spi/params/PluginParamsTransferTest.java | 202 ++++++
pom.xml | 107 ++-
sql/dolphinscheduler-postgre.sql | 32 +-
sql/dolphinscheduler_mysql.sql | 31 +
.../1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 43 ++
.../1.4.0_schema/mysql/dolphinscheduler_dml.sql | 21 +-
.../postgresql/dolphinscheduler_ddl.sql | 48 +-
.../postgresql/dolphinscheduler_dml.sql | 19 +-
style/checkstyle.xml | 8 +-
style/intellij-java-code-style.xml | 2 -
tools/dependencies/known-dependencies.txt | 15 +-
125 files changed, 6415 insertions(+), 4073 deletions(-)
diff --git a/LICENSE b/LICENSE
index 9a0c6aa..5d7c9f4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -216,3 +216,7 @@ The text of each license is the standard Apache 2.0 license.
ScriptRunner from https://github.com/mybatis/mybatis-3 Apache 2.0
mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
PropertyPlaceholderHelper from https://github.com/spring-projects/spring-framework Apache 2.0
+ DolphinPluginClassLoader from https://github.com/prestosql/presto Apache 2.0
+ DolphinPluginDiscovery from https://github.com/prestosql/presto Apache 2.0
+ DolphinPluginLoader from https://github.com/prestosql/presto Apache 2.0
+
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/pom.xml
new file mode 100644
index 0000000..7a42257
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>dolphinscheduler-alert-plugin</artifactId>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <version>1.3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-dingtalk</artifactId>
+
+
+</project>
\ No newline at end of file
diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml
similarity index 70%
copy from dolphinscheduler-alert/pom.xml
copy to dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml
index 215916d..61b8371 100644
--- a/dolphinscheduler-alert/pom.xml
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml
@@ -15,50 +15,61 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
+ <artifactId>dolphinscheduler-alert-plugin</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
- <artifactId>dolphinscheduler</artifactId>
<version>1.3.2-SNAPSHOT</version>
</parent>
- <artifactId>dolphinscheduler-alert</artifactId>
- <name>${project.artifactId}</name>
- <packaging>jar</packaging>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-email</artifactId>
+ <!-- can be load as a Alert Plugin when development and run server in IDE -->
+ <packaging>dolphinscheduler-plugin</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-spi</artifactId>
+ <scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <type>jar</type>
- <scope>test</scope>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
@@ -68,46 +79,46 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <artifactId>jackson-annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <type>jar</type>
+ <scope>test</scope>
</dependency>
- <!--excel poi-->
<dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.dolphinscheduler</groupId>
- <artifactId>dolphinscheduler-dao</artifactId>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>log4j-api</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
new file mode 100644
index 0000000..c793af5
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+import org.apache.dolphinscheduler.spi.alert.AlertChannel;
+import org.apache.dolphinscheduler.spi.alert.AlertData;
+import org.apache.dolphinscheduler.spi.alert.AlertInfo;
+import org.apache.dolphinscheduler.spi.alert.AlertResult;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * email alert channel . use email to seed the alertInfo
+ */
+public class EmailAlertChannel implements AlertChannel {
+ private static final Logger logger = LoggerFactory.getLogger(EmailAlertChannel.class);
+
+ @Override
+ public AlertResult process(AlertInfo info) {
+
+ AlertData alert = info.getAlertData();
+ String alertParams = info.getAlertParams();
+ Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertParams);
+ MailSender mailSender = new MailSender(paramsMap);
+ AlertResult alertResult = mailSender.sendMails(alert.getTitle(), alert.getContent());
+
+ //send flag
+ boolean flag = false;
+
+ if (alertResult == null) {
+ alertResult = new AlertResult();
+ alertResult.setStatus("false");
+ alertResult.setMessage("alert send error.");
+ logger.info("alert send error : {}", alertResult.getMessage());
+ return alertResult;
+ }
+
+ flag = Boolean.parseBoolean(String.valueOf(alertResult.getStatus()));
+
+ if (flag) {
+ logger.info("alert send success");
+ alertResult.setMessage("email send success.");
+ } else {
+ alertResult.setMessage("alert send error.");
+ logger.info("alert send error : {}", alertResult.getMessage());
+ }
+
+ return alertResult;
+ }
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java
new file mode 100644
index 0000000..dc38fc0
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java
@@ -0,0 +1,137 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+import org.apache.dolphinscheduler.spi.alert.AlertChannel;
+import org.apache.dolphinscheduler.spi.alert.AlertChannelFactory;
+import org.apache.dolphinscheduler.spi.alert.AlertConstants;
+import org.apache.dolphinscheduler.spi.alert.ShowType;
+import org.apache.dolphinscheduler.spi.params.InputParam;
+import org.apache.dolphinscheduler.spi.params.PasswordParam;
+import org.apache.dolphinscheduler.spi.params.RadioParam;
+import org.apache.dolphinscheduler.spi.params.base.DataType;
+import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
+import org.apache.dolphinscheduler.spi.params.base.PluginParams;
+import org.apache.dolphinscheduler.spi.params.base.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * email alert factory
+ */
+public class EmailAlertChannelFactory implements AlertChannelFactory {
+ @Override
+ public String getName() {
+ return "email alert";
+ }
+
+ @Override
+ public List<PluginParams> getParams() {
+
+ List<PluginParams> paramsList = new ArrayList<>();
+ InputParam receivesParam = InputParam.newBuilder(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERS, MailParamsConstants.PLUGIN_DEFAULT_EMAIL_RECEIVERS)
+ .setPlaceholder("please input receives")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
+
+ InputParam receiveCcsParam = InputParam.newBuilder(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERCCS, MailParamsConstants.PLUGIN_DEFAULT_EMAIL_RECEIVERCCS)
+ .build();
+
+ InputParam mailSmtpHost = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_HOST, MailParamsConstants.MAIL_SMTP_HOST)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ InputParam mailSmtpPort = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_PORT, MailParamsConstants.MAIL_SMTP_PORT)
+ .setValue(25)
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .setType(DataType.NUMBER.getDataType())
+ .build())
+ .build();
+
+ InputParam mailSender = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SENDER, MailParamsConstants.MAIL_SENDER)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ RadioParam enableSmtpAuth = RadioParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_AUTH, MailParamsConstants.MAIL_SMTP_AUTH)
+ .addParamsOptions(new ParamsOptions("YES", true, false))
+ .addParamsOptions(new ParamsOptions("NO", false, false))
+ .setValue(true)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ InputParam mailUser = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_USER, MailParamsConstants.MAIL_USER)
+ .setPlaceholder("if enable use authentication, you need input user")
+ .build();
+
+ PasswordParam mailPassword = PasswordParam.newBuilder(MailParamsConstants.NAME_MAIL_PASSWD, MailParamsConstants.MAIL_PASSWD)
+ .setPlaceholder("if enable use authentication, you need input password")
+ .build();
+
+ RadioParam enableTls = RadioParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_STARTTLS_ENABLE, MailParamsConstants.MAIL_SMTP_STARTTLS_ENABLE)
+ .addParamsOptions(new ParamsOptions("YES", true, false))
+ .addParamsOptions(new ParamsOptions("NO", false, false))
+ .setValue(false)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ RadioParam enableSsl = RadioParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_SSL_ENABLE, MailParamsConstants.MAIL_SMTP_SSL_ENABLE)
+ .addParamsOptions(new ParamsOptions("YES", true, false))
+ .addParamsOptions(new ParamsOptions("NO", false, false))
+ .setValue(false)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ InputParam sslTrust = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_SSL_TRUST, MailParamsConstants.MAIL_SMTP_SSL_TRUST)
+ .setValue("*")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ RadioParam showType = RadioParam.newBuilder(AlertConstants.SHOW_TYPE, AlertConstants.SHOW_TYPE)
+ .addParamsOptions(new ParamsOptions(ShowType.TABLE.getDescp(), ShowType.TABLE.getDescp(), false))
+ .addParamsOptions(new ParamsOptions(ShowType.TEXT.getDescp(), ShowType.TEXT.getDescp(), false))
+ .addParamsOptions(new ParamsOptions(ShowType.ATTACHMENT.getDescp(), ShowType.ATTACHMENT.getDescp(), false))
+ .addParamsOptions(new ParamsOptions(ShowType.TABLEATTACHMENT.getDescp(), ShowType.TABLEATTACHMENT.getDescp(), false))
+ .setValue(ShowType.TABLE.getDescp())
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ paramsList.add(receivesParam);
+ paramsList.add(receiveCcsParam);
+ paramsList.add(mailSmtpHost);
+ paramsList.add(mailSmtpPort);
+ paramsList.add(mailSender);
+ paramsList.add(enableSmtpAuth);
+ paramsList.add(mailUser);
+ paramsList.add(mailPassword);
+ paramsList.add(enableTls);
+ paramsList.add(enableSsl);
+ paramsList.add(sslTrust);
+ paramsList.add(showType);
+
+ return paramsList;
+ }
+
+ @Override
+ public AlertChannel create() {
+ return new EmailAlertChannel();
+ }
+}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertPlugin.java
similarity index 63%
copy from dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java
copy to dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertPlugin.java
index 3594926..175b518 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertPlugin.java
@@ -14,23 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.alert.manager;
-import org.apache.dolphinscheduler.dao.entity.Alert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+import org.apache.dolphinscheduler.spi.DolphinSchedulerPlugin;
+import org.apache.dolphinscheduler.spi.alert.AlertChannelFactory;
+
+import com.google.common.collect.ImmutableList;
/**
- * SMS send manager
+ * email alert plugin
*/
-public class MsgManager {
-
- private static final Logger logger = LoggerFactory.getLogger(MsgManager.class);
- /**
- * SMS send
- * @param alert the alert
- */
- public void send(Alert alert){
- logger.info("send message {}",alert);
+public class EmailAlertPlugin implements DolphinSchedulerPlugin {
+ @Override
+ public Iterable<AlertChannelFactory> getAlertChannelFactorys() {
+ return ImmutableList.of(new EmailAlertChannelFactory());
}
}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.java
new file mode 100644
index 0000000..d0e85ff
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+public class EmailConstants {
+
+
+ public static final String XLS_FILE_PATH = "xls.file.path";
+
+ public static final String MAIL_TRANSPORT_PROTOCOL = "mail.transport.protocol";
+
+ public static final String DEFAULT_SMTP_PORT = "25";
+
+ public static final String TEXT_HTML_CHARSET_UTF_8 = "text/html;charset=utf-8";
+
+ public static final int NUMBER_1000 = 1000;
+
+ public static final String TR = "<tr>";
+
+ public static final String TD = "<td>";
+
+ public static final String TD_END = "</td>";
+
+ public static final String TR_END = "</tr>";
+
+ public static final String TITLE = "title";
+
+ public static final String CONTENT = "content";
+
+ public static final String TH = "<th>";
+
+ public static final String TH_END = "</th>";
+
+ public static final String MARKDOWN_QUOTE = ">";
+
+ public static final String MARKDOWN_ENTER = "\n";
+
+ public static final String HTML_HEADER_PREFIX = new StringBuilder("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>")
+ .append("<html>")
+ .append("<head>")
+ .append("<title>dolphinscheduler</title>")
+ .append("<meta name='Keywords' content=''>")
+ .append("<meta name='Description' content=''>")
+ .append("<style type=\"text/css\">")
+ .append("table {margin-top:0px;padding-top:0px;border:1px solid;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;}")
+ .append("table th {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #dedede;text-align: left;}")
+ .append("table td {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #ffffff;text-align: left;}")
+ .append("</style>")
+ .append("</head>")
+ .append("<body style=\"margin:0;padding:0\"><table border=\"1px\" cellpadding=\"5px\" cellspacing=\"-10px\"> ")
+ .toString();
+
+ public static final String TABLE_BODY_HTML_TAIL = "</table></body></html>";
+
+ public static final String UTF_8 = "UTF-8";
+
+ public static final String EXCEL_SUFFIX_XLS = ".xls";
+
+ public static final String SINGLE_SLASH = "/";
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.java
new file mode 100644
index 0000000..0ca8ae8
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * excel utils
+ */
+public class ExcelUtils {
+
+ private static final Logger logger = LoggerFactory.getLogger(ExcelUtils.class);
+
+ /**
+ * generate excel file
+ *
+ * @param content the content
+ * @param title the title
+ * @param xlsFilePath the xls path
+ */
+ public static void genExcelFile(String content, String title, String xlsFilePath) {
+ List<LinkedHashMap> itemsList;
+
+ //The JSONUtils.toList has been try catch ex
+ itemsList = JSONUtils.toList(content, LinkedHashMap.class);
+
+ if (CollectionUtils.isEmpty(itemsList)) {
+ logger.error("itemsList is null");
+ throw new RuntimeException("itemsList is null");
+ }
+
+ LinkedHashMap<String, Object> headerMap = itemsList.get(0);
+
+ List<String> headerList = new ArrayList<>();
+
+ Iterator<Map.Entry<String, Object>> iter = headerMap.entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry<String, Object> en = iter.next();
+ headerList.add(en.getKey());
+ }
+
+ HSSFWorkbook wb = null;
+ FileOutputStream fos = null;
+ try {
+ // declare a workbook
+ wb = new HSSFWorkbook();
+ // generate a table
+ HSSFSheet sheet = wb.createSheet();
+ HSSFRow row = sheet.createRow(0);
+ //set the height of the first line
+ row.setHeight((short) 500);
+
+ //set Horizontal right
+ CellStyle cellStyle = wb.createCellStyle();
+ cellStyle.setAlignment(HorizontalAlignment.RIGHT);
+
+ //setting excel headers
+ for (int i = 0; i < headerList.size(); i++) {
+ HSSFCell cell = row.createCell(i);
+ cell.setCellStyle(cellStyle);
+ cell.setCellValue(headerList.get(i));
+ }
+
+ //setting excel body
+ int rowIndex = 1;
+ for (LinkedHashMap<String, Object> itemsMap : itemsList) {
+ Object[] values = itemsMap.values().toArray();
+ row = sheet.createRow(rowIndex);
+ //setting excel body height
+ row.setHeight((short) 500);
+ rowIndex++;
+ for (int j = 0; j < values.length; j++) {
+ HSSFCell cell1 = row.createCell(j);
+ cell1.setCellStyle(cellStyle);
+ cell1.setCellValue(String.valueOf(values[j]));
+ }
+ }
+
+ for (int i = 0; i < headerList.size(); i++) {
+ sheet.setColumnWidth(i, headerList.get(i).length() * 800);
+ }
+
+ File file = new File(xlsFilePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+
+ //setting file output
+ fos = new FileOutputStream(xlsFilePath + EmailConstants.SINGLE_SLASH + title + EmailConstants.EXCEL_SUFFIX_XLS);
+
+ wb.write(fos);
+
+ } catch (Exception e) {
+ logger.error("generate excel error", e);
+ throw new RuntimeException("generate excel error", e);
+ } finally {
+ if (wb != null) {
+ try {
+ wb.close();
+ } catch (IOException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+ if (fos != null) {
+ try {
+ fos.close();
+ } catch (IOException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
new file mode 100644
index 0000000..87e691c
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+/**
+ * mail plugin params json use
+ */
+public class MailParamsConstants {
+
+ public static final String PLUGIN_DEFAULT_EMAIL_RECEIVERS = "receivers";
+ public static final String NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERS = "receivers";
+
+ public static final String PLUGIN_DEFAULT_EMAIL_RECEIVERCCS = "receiverCcs";
+ public static final String NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERCCS = "receiverCcs";
+
+ public static final String MAIL_PROTOCOL = "mail.transport.protocol";
+ public static final String NAME_MAIL_PROTOCOL = "mailProtocol";
+
+ public static final String MAIL_SMTP_HOST = "mail.smtp.host";
+ public static final String NAME_MAIL_SMTP_HOST = "mailServerHost";
+
+ public static final String MAIL_SMTP_PORT = "mail.smtp.port";
+ public static final String NAME_MAIL_SMTP_PORT = "mailServerPort";
+
+ public static final String MAIL_SENDER = "mail.sender";
+ public static final String NAME_MAIL_SENDER = "mailSender";
+
+ public static final String MAIL_SMTP_AUTH = "mail.smtp.auth";
+ public static final String NAME_MAIL_SMTP_AUTH = "enableSmtpAuth";
+
+ public static final String MAIL_USER = "mail.user";
+ public static final String NAME_MAIL_USER = "mailUser";
+
+ public static final String MAIL_PASSWD = "mail.passwd";
+ public static final String NAME_MAIL_PASSWD = "mailPasswd";
+
+ public static final String MAIL_SMTP_STARTTLS_ENABLE = "mail.smtp.starttls.enable";
+ public static final String NAME_MAIL_SMTP_STARTTLS_ENABLE = "starttlsEnable";
+
+ public static final String MAIL_SMTP_SSL_ENABLE = "mail.smtp.ssl.enable";
+ public static final String NAME_MAIL_SMTP_SSL_ENABLE = "sslEnable";
+
+ public static final String MAIL_SMTP_SSL_TRUST = "mail.smtp.ssl.trust";
+ public static final String NAME_MAIL_SMTP_SSL_TRUST = "mailSmtpSslTrust";
+
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.java
new file mode 100644
index 0000000..03765b2
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.java
@@ -0,0 +1,429 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+import static java.util.Objects.requireNonNull;
+
+import org.apache.dolphinscheduler.plugin.alert.email.template.AlertTemplate;
+import org.apache.dolphinscheduler.plugin.alert.email.template.DefaultHTMLTemplate;
+import org.apache.dolphinscheduler.spi.alert.AlertConstants;
+import org.apache.dolphinscheduler.spi.alert.AlertResult;
+import org.apache.dolphinscheduler.spi.alert.ShowType;
+import org.apache.dolphinscheduler.spi.utils.StringUtils;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.mail.EmailException;
+import org.apache.commons.mail.HtmlEmail;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.mail.Authenticator;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import javax.mail.internet.MimeUtility;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.sun.mail.smtp.SMTPProvider;
+
+/**
+ * mail utils
+ */
+public class MailSender {
+
+ public static final Logger logger = LoggerFactory.getLogger(MailSender.class);
+
+ private List<String> receivers;
+ private List<String> receiverCcs;
+ private String mailProtocol = "SMTP";
+ private String mailSmtpHost;
+ private String mailSmtpPort;
+ private String mailSender;
+ private String enableSmtpAuth;
+ private String mailUser;
+ private String mailPasswd;
+ private String mailUseStartTLS;
+ private String mailUseSSL;
+ private String xlsFilePath;
+ private String sslTrust;
+ private String showType;
+ private AlertTemplate alertTemplate;
+
+ public MailSender(Map<String, String> config) {
+
+ String receiversConfig = config.get(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERS);
+ if (receiversConfig == null || "".equals(receiversConfig)) {
+ throw new RuntimeException(MailParamsConstants.PLUGIN_DEFAULT_EMAIL_RECEIVERS + "must not be null");
+ }
+
+ receivers = Arrays.asList(receiversConfig.split(","));
+
+ String receiverCcsConfig = config.get(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERCCS);
+
+ receiverCcs = new ArrayList<>();
+ if (receiverCcsConfig != null && !"".equals(receiverCcsConfig)) {
+ receiverCcs = Arrays.asList(receiverCcsConfig.split(","));
+ }
+
+ mailSmtpHost = config.get(MailParamsConstants.NAME_MAIL_SMTP_HOST);
+ requireNonNull(mailSmtpHost, MailParamsConstants.MAIL_SMTP_HOST + " must not null");
+
+ mailSmtpPort = config.get(MailParamsConstants.NAME_MAIL_SMTP_PORT);
+ requireNonNull(mailSmtpPort, MailParamsConstants.MAIL_SMTP_PORT + " must not null");
+
+ mailSender = config.get(MailParamsConstants.NAME_MAIL_SENDER);
+ requireNonNull(mailSender, MailParamsConstants.MAIL_SENDER + " must not null");
+
+ enableSmtpAuth = config.get(MailParamsConstants.NAME_MAIL_SMTP_AUTH);
+
+ mailUser = config.get(MailParamsConstants.NAME_MAIL_USER);
+ requireNonNull(mailUser, MailParamsConstants.MAIL_USER + " must not null");
+
+ mailPasswd = config.get(MailParamsConstants.NAME_MAIL_PASSWD);
+ requireNonNull(mailPasswd, MailParamsConstants.MAIL_PASSWD + " must not null");
+
+ mailUseStartTLS = config.get(MailParamsConstants.NAME_MAIL_SMTP_STARTTLS_ENABLE);
+ requireNonNull(mailUseStartTLS, MailParamsConstants.MAIL_SMTP_STARTTLS_ENABLE + " must not null");
+
+ mailUseSSL = config.get(MailParamsConstants.NAME_MAIL_SMTP_SSL_ENABLE);
+ requireNonNull(mailUseSSL, MailParamsConstants.MAIL_SMTP_SSL_ENABLE + " must not null");
+
+ sslTrust = config.get(MailParamsConstants.NAME_MAIL_SMTP_SSL_TRUST);
+ requireNonNull(sslTrust, MailParamsConstants.MAIL_SMTP_SSL_TRUST + " must not null");
+
+ showType = config.get(AlertConstants.SHOW_TYPE);
+ requireNonNull(showType, AlertConstants.SHOW_TYPE + " must not null");
+
+ xlsFilePath = config.get(EmailConstants.XLS_FILE_PATH);
+ if (StringUtils.isBlank(xlsFilePath)) {
+ xlsFilePath = "/tmp/xls";
+ }
+
+ alertTemplate = new DefaultHTMLTemplate();
+ }
+
+ /**
+ * send mail to receivers
+ *
+ * @param title title
+ * @param content content
+ * @return
+ */
+ public AlertResult sendMails(String title, String content) {
+ return sendMails(this.receivers, this.receiverCcs, title, content);
+ }
+
+ /**
+ * send mail to receivers
+ *
+ * @param title email title
+ * @param content email content
+ * @return
+ */
+ public AlertResult sendMailsToReceiverOnly(String title, String content) {
+ return sendMails(this.receivers, null, title, content);
+ }
+
+ /**
+ * send mail
+ *
+ * @param receivers receivers
+ * @param receiverCcs receiverCcs
+ * @param title title
+ * @param content content
+ * @return
+ */
+ public AlertResult sendMails(List<String> receivers, List<String> receiverCcs, String title, String content) {
+ AlertResult alertResult = new AlertResult();
+ alertResult.setStatus("false");
+
+ // if there is no receivers && no receiversCc, no need to process
+ if (CollectionUtils.isEmpty(receivers) && CollectionUtils.isEmpty(receiverCcs)) {
+ return alertResult;
+ }
+
+ receivers.removeIf(StringUtils::isEmpty);
+
+ if (showType.equals(ShowType.TABLE.getDescp()) || showType.equals(ShowType.TEXT.getDescp())) {
+ // send email
+ HtmlEmail email = new HtmlEmail();
+
+ try {
+ Session session = getSession();
+ email.setMailSession(session);
+ email.setFrom(mailSender);
+ email.setCharset(EmailConstants.UTF_8);
+ if (CollectionUtils.isNotEmpty(receivers)) {
+ // receivers mail
+ for (String receiver : receivers) {
+ email.addTo(receiver);
+ }
+ }
+
+ if (CollectionUtils.isNotEmpty(receiverCcs)) {
+ //cc
+ for (String receiverCc : receiverCcs) {
+ email.addCc(receiverCc);
+ }
+ }
+ // sender mail
+ return getStringObjectMap(title, content, alertResult, email);
+ } catch (Exception e) {
+ handleException(alertResult, e);
+ }
+ } else if (showType.equals(ShowType.ATTACHMENT.getDescp()) || showType.equals(ShowType.TABLEATTACHMENT.getDescp())) {
+ try {
+
+ String partContent = (showType.equals(ShowType.ATTACHMENT.getDescp()) ? "Please see the attachment " + title + EmailConstants.EXCEL_SUFFIX_XLS : htmlTable(content, false));
+
+ attachment(title, content, partContent);
+
+ alertResult.setStatus("true");
+ return alertResult;
+ } catch (Exception e) {
+ handleException(alertResult, e);
+ return alertResult;
+ }
+ }
+ return alertResult;
+
+ }
+
+ /**
+ * html table content
+ *
+ * @param content the content
+ * @param showAll if show the whole content
+ * @return the html table form
+ */
+ private String htmlTable(String content, boolean showAll) {
+ return alertTemplate.getMessageFromTemplate(content, ShowType.TABLE, showAll);
+ }
+
+ /**
+ * html table content
+ *
+ * @param content the content
+ * @return the html table form
+ */
+ private String htmlTable(String content) {
+ return htmlTable(content, true);
+ }
+
+ /**
+ * html text content
+ *
+ * @param content the content
+ * @return text in html form
+ */
+ private String htmlText(String content) {
+ return alertTemplate.getMessageFromTemplate(content, ShowType.TEXT);
+ }
+
+ /**
+ * send mail as Excel attachment
+ *
+ * @param title
+ * @param content
+ * @param partContent
+ * @throws Exception
+ */
+ private void attachment(String title, String content, String partContent) throws Exception {
+ MimeMessage msg = getMimeMessage();
+
+ attachContent(title, content, partContent, msg);
+ }
+
+ /**
+ * get MimeMessage
+ *
+ * @return
+ * @throws MessagingException
+ */
+ private MimeMessage getMimeMessage() throws MessagingException {
+
+ // 1. The first step in creating mail: creating session
+ Session session = getSession();
+ // Setting debug mode, can be turned off
+ session.setDebug(false);
+
+ // 2. creating mail: Creating a MimeMessage
+ MimeMessage msg = new MimeMessage(session);
+ // 3. set sender
+ msg.setFrom(new InternetAddress(mailSender));
+ // 4. set receivers
+ for (String receiver : receivers) {
+ msg.addRecipients(Message.RecipientType.TO, InternetAddress.parse(receiver));
+ }
+ return msg;
+ }
+
+ /**
+ * get session
+ *
+ * @return the new Session
+ */
+ private Session getSession() {
+ Properties props = new Properties();
+ props.setProperty(MailParamsConstants.MAIL_SMTP_HOST, mailSmtpHost);
+ props.setProperty(MailParamsConstants.MAIL_SMTP_PORT, mailSmtpPort);
+ props.setProperty(MailParamsConstants.MAIL_SMTP_AUTH, enableSmtpAuth);
+ props.setProperty(EmailConstants.MAIL_TRANSPORT_PROTOCOL, mailProtocol);
+ props.setProperty(MailParamsConstants.MAIL_SMTP_STARTTLS_ENABLE, mailUseStartTLS);
+ props.setProperty(MailParamsConstants.MAIL_SMTP_SSL_ENABLE, mailUseSSL);
+ props.setProperty(MailParamsConstants.MAIL_SMTP_SSL_TRUST, sslTrust);
+
+ Authenticator auth = new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ // mail username and password
+ return new PasswordAuthentication(mailUser, mailPasswd);
+ }
+ };
+
+ Session session = Session.getInstance(props, auth);
+ session.addProvider(new SMTPProvider());
+ return session;
+ }
+
+ /**
+ * attach content
+ *
+ * @param title
+ * @param content
+ * @param partContent
+ * @param msg
+ * @throws MessagingException
+ * @throws IOException
+ */
+ private void attachContent(String title, String content, String partContent, MimeMessage msg) throws MessagingException, IOException {
+ /**
+ * set receiverCc
+ */
+ if (CollectionUtils.isNotEmpty(receiverCcs)) {
+ for (String receiverCc : receiverCcs) {
+ msg.addRecipients(Message.RecipientType.CC, InternetAddress.parse(receiverCc));
+ }
+ }
+
+ // set subject
+ msg.setSubject(title);
+ MimeMultipart partList = new MimeMultipart();
+ // set signature
+ MimeBodyPart part1 = new MimeBodyPart();
+ part1.setContent(partContent, EmailConstants.TEXT_HTML_CHARSET_UTF_8);
+ // set attach file
+ MimeBodyPart part2 = new MimeBodyPart();
+ File file = new File(xlsFilePath + EmailConstants.SINGLE_SLASH + title + EmailConstants.EXCEL_SUFFIX_XLS);
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+ // make excel file
+
+ ExcelUtils.genExcelFile(content, title, xlsFilePath);
+
+ part2.attachFile(file);
+ part2.setFileName(MimeUtility.encodeText(title + EmailConstants.EXCEL_SUFFIX_XLS, EmailConstants.UTF_8, "B"));
+ // add components to collection
+ partList.addBodyPart(part1);
+ partList.addBodyPart(part2);
+ msg.setContent(partList);
+ // 5. send Transport
+ Transport.send(msg);
+ // 6. delete saved file
+ deleteFile(file);
+ }
+
+ /**
+ * the string object map
+ *
+ * @param title
+ * @param content
+ * @param alertResult
+ * @param email
+ * @return
+ * @throws EmailException
+ */
+ private AlertResult getStringObjectMap(String title, String content, AlertResult alertResult, HtmlEmail email) throws EmailException {
+
+ /**
+ * the subject of the message to be sent
+ */
+ email.setSubject(title);
+ /**
+ * to send information, you can use HTML tags in mail content because of the use of HtmlEmail
+ */
+ if (showType.equals(ShowType.TABLE.getDescp())) {
+ email.setMsg(htmlTable(content));
+ } else if (showType.equals(ShowType.TEXT.getDescp())) {
+ email.setMsg(htmlText(content));
+ }
+
+ // send
+ email.setDebug(true);
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+ email.send();
+
+ alertResult.setStatus("true");
+
+ return alertResult;
+ }
+
+ /**
+ * file delete
+ *
+ * @param file the file to delete
+ */
+ public void deleteFile(File file) {
+ if (file.exists()) {
+ if (file.delete()) {
+ logger.info("delete success: {}", file.getAbsolutePath() + file.getName());
+ } else {
+ logger.info("delete fail: {}", file.getAbsolutePath() + file.getName());
+ }
+ } else {
+ logger.info("file not exists: {}", file.getAbsolutePath() + file.getName());
+ }
+ }
+
+ /**
+ * handle exception
+ *
+ * @param alertResult
+ * @param e
+ */
+ private void handleException(AlertResult alertResult, Exception e) {
+ logger.error("Send email to {} failed", receivers, e);
+ alertResult.setMessage("Send email to {" + String.join(",", receivers) + "} failed，" + e.toString());
+ }
+
+}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplate.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/AlertTemplate.java
similarity index 72%
rename from dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplate.java
rename to dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/AlertTemplate.java
index 81b5e65..dec993d 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplate.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/AlertTemplate.java
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.alert.template;
-import org.apache.dolphinscheduler.common.enums.ShowType;
+package org.apache.dolphinscheduler.plugin.alert.email.template;
+
+import org.apache.dolphinscheduler.spi.alert.ShowType;
/**
* alert message template
@@ -25,20 +26,22 @@ public interface AlertTemplate {
/**
* get a message from a specified alert template
- * @param content alert message content
- * @param showType show type
- * @param showAll whether to show all
+ *
+ * @param content alert message content
+ * @param showType show type
+ * @param showAll whether to show all
* @return a message from a specified alert template
*/
- String getMessageFromTemplate(String content, ShowType showType,boolean showAll);
+ String getMessageFromTemplate(String content, ShowType showType, boolean showAll);
/**
* default showAll is true
- * @param content alert message content
+ *
+ * @param content alert message content
* @param showType show type
* @return a message from a specified alert template
*/
- default String getMessageFromTemplate(String content,ShowType showType){
- return getMessageFromTemplate(content,showType,true);
+ default String getMessageFromTemplate(String content, ShowType showType) {
+ return getMessageFromTemplate(content, showType, true);
}
}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.java
similarity index 52%
rename from dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java
rename to dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.java
index a01f301..06decd6 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.java
@@ -14,21 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.alert.template.impl;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import org.apache.dolphinscheduler.alert.template.AlertTemplate;
-import org.apache.dolphinscheduler.alert.utils.Constants;
-import org.apache.dolphinscheduler.common.enums.ShowType;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
+package org.apache.dolphinscheduler.plugin.alert.email.template;
+
+import static java.util.Objects.requireNonNull;
+
+import org.apache.dolphinscheduler.plugin.alert.email.EmailConstants;
+import org.apache.dolphinscheduler.spi.alert.ShowType;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+import org.apache.dolphinscheduler.spi.utils.StringUtils;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.dolphinscheduler.common.utils.*;
-import java.util.*;
-
-import static org.apache.dolphinscheduler.common.utils.Preconditions.*;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
/**
* the default html alert message template
@@ -37,33 +43,33 @@ public class DefaultHTMLTemplate implements AlertTemplate {
public static final Logger logger = LoggerFactory.getLogger(DefaultHTMLTemplate.class);
-
@Override
- public String getMessageFromTemplate(String content, ShowType showType,boolean showAll) {
+ public String getMessageFromTemplate(String content, ShowType showType, boolean showAll) {
- switch (showType){
+ switch (showType) {
case TABLE:
- return getTableTypeMessage(content,showAll);
+ return getTableTypeMessage(content, showAll);
case TEXT:
- return getTextTypeMessage(content,showAll);
+ return getTextTypeMessage(content, showAll);
default:
- throw new IllegalArgumentException(String.format("not support showType: %s in DefaultHTMLTemplate",showType));
+ throw new IllegalArgumentException(String.format("not support showType: %s in DefaultHTMLTemplate", showType));
}
}
/**
* get alert message which type is TABLE
+ *
* @param content message content
* @param showAll weather to show all
* @return alert message
*/
- private String getTableTypeMessage(String content,boolean showAll){
+ private String getTableTypeMessage(String content, boolean showAll) {
- if (StringUtils.isNotEmpty(content)){
+ if (StringUtils.isNotEmpty(content)) {
List<LinkedHashMap> mapItemsList = JSONUtils.toList(content, LinkedHashMap.class);
- if(!showAll && mapItemsList.size() > Constants.NUMBER_1000){
- mapItemsList = mapItemsList.subList(0,Constants.NUMBER_1000);
+ if (!showAll && mapItemsList.size() > EmailConstants.NUMBER_1000) {
+ mapItemsList = mapItemsList.subList(0, EmailConstants.NUMBER_1000);
}
StringBuilder contents = new StringBuilder(200);
@@ -71,31 +77,31 @@ public class DefaultHTMLTemplate implements AlertTemplate {
boolean flag = true;
String title = "";
- for (LinkedHashMap mapItems : mapItemsList){
+ for (LinkedHashMap mapItems : mapItemsList) {
Set<Map.Entry<String, Object>> entries = mapItems.entrySet();
Iterator<Map.Entry<String, Object>> iterator = entries.iterator();
- StringBuilder t = new StringBuilder(Constants.TR);
- StringBuilder cs = new StringBuilder(Constants.TR);
- while (iterator.hasNext()){
+ StringBuilder t = new StringBuilder(EmailConstants.TR);
+ StringBuilder cs = new StringBuilder(EmailConstants.TR);
+ while (iterator.hasNext()) {
Map.Entry<String, Object> entry = iterator.next();
- t.append(Constants.TH).append(entry.getKey()).append(Constants.TH_END);
- cs.append(Constants.TD).append(String.valueOf(entry.getValue())).append(Constants.TD_END);
+ t.append(EmailConstants.TH).append(entry.getKey()).append(EmailConstants.TH_END);
+ cs.append(EmailConstants.TD).append(String.valueOf(entry.getValue())).append(EmailConstants.TD_END);
}
- t.append(Constants.TR_END);
- cs.append(Constants.TR_END);
- if (flag){
+ t.append(EmailConstants.TR_END);
+ cs.append(EmailConstants.TR_END);
+ if (flag) {
title = t.toString();
}
flag = false;
contents.append(cs);
}
- return getMessageFromHtmlTemplate(title,contents.toString());
+ return getMessageFromHtmlTemplate(title, contents.toString());
}
return content;
@@ -103,22 +109,23 @@ public class DefaultHTMLTemplate implements AlertTemplate {
/**
* get alert message which type is TEXT
+ *
* @param content message content
* @param showAll weather to show all
* @return alert message
*/
- private String getTextTypeMessage(String content,boolean showAll){
+ private String getTextTypeMessage(String content, boolean showAll) {
- if (StringUtils.isNotEmpty(content)){
+ if (StringUtils.isNotEmpty(content)) {
ArrayNode list = JSONUtils.parseArray(content);
StringBuilder contents = new StringBuilder(100);
- for (JsonNode jsonNode : list){
- contents.append(Constants.TR);
- contents.append(Constants.TD).append(jsonNode.toString()).append(Constants.TD_END);
- contents.append(Constants.TR_END);
+ for (JsonNode jsonNode : list) {
+ contents.append(EmailConstants.TR);
+ contents.append(EmailConstants.TD).append(jsonNode.toString()).append(EmailConstants.TD_END);
+ contents.append(EmailConstants.TR_END);
}
- return getMessageFromHtmlTemplate(null,contents.toString());
+ return getMessageFromHtmlTemplate(null, contents.toString());
}
@@ -127,16 +134,17 @@ public class DefaultHTMLTemplate implements AlertTemplate {
/**
* get alert message from a html template
- * @param title message title
- * @param content message content
+ *
+ * @param title message title
+ * @param content message content
* @return alert message which use html template
*/
- private String getMessageFromHtmlTemplate(String title,String content){
+ private String getMessageFromHtmlTemplate(String title, String content) {
- checkNotNull(content);
- String htmlTableThead = StringUtils.isEmpty(title) ? "" : String.format("<thead>%s</thead>\n",title);
+ requireNonNull(content, "content must not null");
+ String htmlTableThead = StringUtils.isEmpty(title) ? "" : String.format("<thead>%s</thead>\n", title);
- return Constants.HTML_HEADER_PREFIX +htmlTableThead + content + Constants.TABLE_BODY_HTML_TAIL;
+ return EmailConstants.HTML_HEADER_PREFIX + htmlTableThead + content + EmailConstants.TABLE_BODY_HTML_TAIL;
}
}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.java
new file mode 100644
index 0000000..91a8df4
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+import org.apache.dolphinscheduler.spi.alert.AlertChannel;
+import org.apache.dolphinscheduler.spi.params.base.PluginParams;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * EmailAlertChannelFactory Tester.
+ *
+ * @version 1.0
+ * @since <pre>Aug 20, 2020</pre>
+ */
+public class EmailAlertChannelFactoryTest {
+
+ @Before
+ public void before() throws Exception {
+ }
+
+ @After
+ public void after() throws Exception {
+ }
+
+ /**
+ * Method: getName()
+ */
+ @Test
+ public void testGetName() throws Exception {
+ }
+
+ /**
+ * Method: getParams()
+ */
+ @Test
+ public void testGetParams() throws Exception {
+ EmailAlertChannelFactory emailAlertChannelFactory = new EmailAlertChannelFactory();
+ List<PluginParams> params = emailAlertChannelFactory.getParams();
+ JSONUtils.toJsonString(params);
+ Assert.assertEquals(12, params.size());
+ }
+
+ /**
+ * Method: create()
+ */
+ @Test
+ public void testCreate() throws Exception {
+ EmailAlertChannelFactory emailAlertChannelFactory = new EmailAlertChannelFactory();
+ AlertChannel alertChannel = emailAlertChannelFactory.create();
+ Assert.assertNotNull(alertChannel);
+ }
+
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java
new file mode 100644
index 0000000..bc5f230
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+import org.apache.dolphinscheduler.spi.alert.AlertConstants;
+import org.apache.dolphinscheduler.spi.alert.AlertData;
+import org.apache.dolphinscheduler.spi.alert.AlertInfo;
+import org.apache.dolphinscheduler.spi.alert.AlertResult;
+import org.apache.dolphinscheduler.spi.alert.ShowType;
+import org.apache.dolphinscheduler.spi.params.InputParam;
+import org.apache.dolphinscheduler.spi.params.PasswordParam;
+import org.apache.dolphinscheduler.spi.params.RadioParam;
+import org.apache.dolphinscheduler.spi.params.base.DataType;
+import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
+import org.apache.dolphinscheduler.spi.params.base.PluginParams;
+import org.apache.dolphinscheduler.spi.params.base.Validate;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * EmailAlertChannel Tester.
+ *
+ * @version 1.0
+ * @since <pre>Aug 20, 2020</pre>
+ */
+public class EmailAlertChannelTest {
+
+ @Before
+ public void before() throws Exception {
+ }
+
+ @After
+ public void after() throws Exception {
+ }
+
+ /**
+ * Method: process(AlertInfo info)
+ */
+ @Test
+ public void testProcess() throws Exception {
+ EmailAlertChannel emailAlertChannel = new EmailAlertChannel();
+ AlertData alertData = new AlertData();
+ LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
+ map1.put("mysql service name", "mysql200");
+ map1.put("mysql address", "192.168.xx.xx");
+ map1.put("port", "3306");
+ map1.put("no index of number", "80");
+ map1.put("database client connections", "190");
+ List<LinkedHashMap<String, Object>> maps = new ArrayList<>();
+ maps.add(0, map1);
+ String mapjson = JSONUtils.toJsonString(maps);
+
+ alertData.setId(10)
+ .setContent(mapjson)
+ .setLog("10")
+ .setTitle("test");
+ AlertInfo alertInfo = new AlertInfo();
+ alertInfo.setAlertData(alertData);
+ alertInfo.setAlertParams(getEmailAlertParams());
+ AlertResult alertResult = emailAlertChannel.process(alertInfo);
+ Assert.assertNotNull(alertResult);
+ Assert.assertEquals("false", alertResult.getStatus());
+ }
+
+ public String getEmailAlertParams() {
+ List<PluginParams> paramsList = new ArrayList<>();
+ InputParam receivesParam = InputParam.newBuilder("receivers", "receivers")
+ .setValue("540957506@qq.com")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ InputParam mailSmtpHost = InputParam.newBuilder("mailServerHost", "mail.smtp.host")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue("smtp.126.com")
+ .build();
+
+ InputParam mailSmtpPort = InputParam.newBuilder("mailServerPort", "mail.smtp.port")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .setType(DataType.NUMBER.getDataType())
+ .build())
+ .setValue(25)
+ .build();
+
+ InputParam mailSender = InputParam.newBuilder("mailSender", "mail.sender")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue("dolphinscheduler@126.com")
+ .build();
+
+ RadioParam enableSmtpAuth = RadioParam.newBuilder("enableSmtpAuth", "mail.smtp.auth")
+ .addParamsOptions(new ParamsOptions("YES", true, false))
+ .addParamsOptions(new ParamsOptions("NO", false, false))
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue(false)
+ .build();
+
+ InputParam mailUser = InputParam.newBuilder("mailUser", "mail.user")
+ .setPlaceholder("if enable use authentication, you need input user")
+ .setValue("dolphinscheduler@126.com")
+ .build();
+
+ PasswordParam mailPassword = PasswordParam.newBuilder("mailPasswd", "mail.passwd")
+ .setPlaceholder("if enable use authentication, you need input password")
+ .setValue("escheduler123")
+ .build();
+
+ RadioParam enableTls = RadioParam.newBuilder("starttlsEnable", "mail.smtp.starttls.enable")
+ .addParamsOptions(new ParamsOptions("YES", true, false))
+ .addParamsOptions(new ParamsOptions("NO", false, false))
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue(true)
+ .build();
+
+ RadioParam enableSsl = RadioParam.newBuilder("sslEnable", "mail.smtp.ssl.enable")
+ .addParamsOptions(new ParamsOptions("YES", true, false))
+ .addParamsOptions(new ParamsOptions("NO", false, false))
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue(true)
+ .build();
+
+ InputParam sslTrust = InputParam.newBuilder("mailSmtpSslTrust", "mail.smtp.ssl.trust")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue("smtp.126.com")
+ .build();
+
+ List<ParamsOptions> emailShowTypeList = new ArrayList<>();
+ emailShowTypeList.add(new ParamsOptions(ShowType.TABLE.getDescp(), ShowType.TABLE.getDescp(), false));
+ emailShowTypeList.add(new ParamsOptions(ShowType.TEXT.getDescp(), ShowType.TEXT.getDescp(), false));
+ emailShowTypeList.add(new ParamsOptions(ShowType.ATTACHMENT.getDescp(), ShowType.ATTACHMENT.getDescp(), false));
+ emailShowTypeList.add(new ParamsOptions(ShowType.TABLEATTACHMENT.getDescp(), ShowType.TABLEATTACHMENT.getDescp(), false));
+ RadioParam showType = RadioParam.newBuilder(AlertConstants.SHOW_TYPE, "showType")
+ .setParamsOptionsList(emailShowTypeList)
+ .setValue(ShowType.TABLE.getDescp())
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ paramsList.add(receivesParam);
+ paramsList.add(mailSmtpHost);
+ paramsList.add(mailSmtpPort);
+ paramsList.add(mailSender);
+ paramsList.add(enableSmtpAuth);
+ paramsList.add(mailUser);
+ paramsList.add(mailPassword);
+ paramsList.add(enableTls);
+ paramsList.add(enableSsl);
+ paramsList.add(sslTrust);
+ paramsList.add(showType);
+
+ return JSONUtils.toJsonString(paramsList);
+ }
+}
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtilsTest.java
similarity index 89%
rename from dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java
rename to dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtilsTest.java
index 8ee6235..5c8b195 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtilsTest.java
@@ -15,7 +15,11 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.alert.utils;
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
import org.junit.After;
import org.junit.Before;
@@ -25,8 +29,6 @@ import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import static org.junit.Assert.assertTrue;
public class ExcelUtilsTest {
@@ -61,7 +63,7 @@ public class ExcelUtilsTest {
//Define dest file path
String xlsFilePath = rootPath + System.getProperty("file.separator");
- logger.info("xlsFilePath: "+xlsFilePath);
+ logger.info("xlsFilePath: " + xlsFilePath);
//Define correctContent
String correctContent = "[{\"name\":\"ds name\",\"value\":\"ds value\"}]";
@@ -76,7 +78,7 @@ public class ExcelUtilsTest {
ExcelUtils.genExcelFile(correctContent, title, xlsFilePath);
//Test file exists
- File xlsFile = new File(xlsFilePath + Constants.SINGLE_SLASH + title + Constants.EXCEL_SUFFIX_XLS);
+ File xlsFile = new File(xlsFilePath + EmailConstants.SINGLE_SLASH + title + EmailConstants.EXCEL_SUFFIX_XLS);
assertTrue(xlsFile.exists());
//Expected RuntimeException
@@ -96,7 +98,7 @@ public class ExcelUtilsTest {
@Test
public void testGenExcelFileByCheckDir() {
ExcelUtils.genExcelFile("[{\"a\": \"a\"},{\"a\": \"a\"}]", "t", "/tmp/xls");
- File file = new File("/tmp/xls" + Constants.SINGLE_SLASH + "t" + Constants.EXCEL_SUFFIX_XLS);
+ File file = new File("/tmp/xls" + EmailConstants.SINGLE_SLASH + "t" + EmailConstants.EXCEL_SUFFIX_XLS);
file.delete();
}
}
\ No newline at end of file
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java
new file mode 100644
index 0000000..e19c819
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email;
+
+import org.apache.dolphinscheduler.plugin.alert.email.template.AlertTemplate;
+import org.apache.dolphinscheduler.plugin.alert.email.template.DefaultHTMLTemplate;
+import org.apache.dolphinscheduler.spi.alert.AlertConstants;
+import org.apache.dolphinscheduler.spi.alert.ShowType;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ */
+public class MailUtilsTest {
+ private static final Logger logger = LoggerFactory.getLogger(MailUtilsTest.class);
+
+ private static Map<String, String> emailConfig = new HashMap<>();
+
+ private static AlertTemplate alertTemplate;
+
+ static MailSender mailSender;
+
+ @BeforeClass
+ public static void initEmailConfig() {
+ emailConfig.put(MailParamsConstants.NAME_MAIL_PROTOCOL, "smtp");
+ emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_HOST, "xxx.xxx.com");
+ emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_PORT, "25");
+ emailConfig.put(MailParamsConstants.NAME_MAIL_SENDER, "xxx1.xxx.com");
+ emailConfig.put(MailParamsConstants.NAME_MAIL_USER, "xxx2.xxx.com");
+ emailConfig.put(MailParamsConstants.NAME_MAIL_PASSWD, "111111");
+ emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_STARTTLS_ENABLE, "true");
+ emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_SSL_ENABLE, "false");
+ emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_SSL_TRUST, "false");
+ emailConfig.put(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERS, "347801120@qq.com");
+ emailConfig.put(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERCCS, "347801120@qq.com");
+ emailConfig.put(AlertConstants.SHOW_TYPE, ShowType.TEXT.getDescp());
+ alertTemplate = new DefaultHTMLTemplate();
+ mailSender = new MailSender(emailConfig);
+ }
+
+ @Test
+ public void testSendMails() {
+
+ String content = "[\"id:69\","
+ + "\"name:UserBehavior-0--1193959466\","
+ + "\"Job name: Start workflow\","
+ + "\"State: SUCCESS\","
+ + "\"Recovery:NO\","
+ + "\"Run time: 1\","
+ + "\"Start time: 2018-08-06 10:31:34.0\","
+ + "\"End time: 2018-08-06 10:31:49.0\","
+ + "\"Host: 192.168.xx.xx\","
+ + "\"Notify group :4\"]";
+
+ mailSender.sendMails(
+ "Mysql Exception",
+ content);
+ }
+
+ public String list2String() {
+
+ LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
+ map1.put("mysql service name", "mysql200");
+ map1.put("mysql address", "192.168.xx.xx");
+ map1.put("port", "3306");
+ map1.put("no index of number", "80");
+ map1.put("database client connections", "190");
+
+ LinkedHashMap<String, Object> map2 = new LinkedHashMap<>();
+ map2.put("mysql service name", "mysql210");
+ map2.put("mysql address", "192.168.xx.xx");
+ map2.put("port", "3306");
+ map2.put("no index of number", "10");
+ map2.put("database client connections", "90");
+
+ List<LinkedHashMap<String, Object>> maps = new ArrayList<>();
+ maps.add(0, map1);
+ maps.add(1, map2);
+ String mapjson = JSONUtils.toJsonString(maps);
+ logger.info(mapjson);
+
+ return mapjson;
+
+ }
+
+ @Test
+ public void testSendTableMail() {
+ String title = "Mysql Exception";
+ String content = list2String();
+ emailConfig.put(AlertConstants.SHOW_TYPE, ShowType.TABLE.getDescp());
+ mailSender = new MailSender(emailConfig);
+ mailSender.sendMails(title, content);
+ }
+
+ @Test
+ public void testAttachmentFile() throws Exception {
+ String content = list2String();
+ emailConfig.put(AlertConstants.SHOW_TYPE, ShowType.ATTACHMENT.getDescp());
+ mailSender = new MailSender(emailConfig);
+ mailSender.sendMails("gaojing", content);
+ }
+
+ @Test
+ public void testTableAttachmentFile() throws Exception {
+ String content = list2String();
+ emailConfig.put(AlertConstants.SHOW_TYPE, ShowType.TABLEATTACHMENT.getDescp());
+ mailSender = new MailSender(emailConfig);
+ mailSender.sendMails("gaojing", content);
+ }
+
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplateTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplateTest.java
new file mode 100644
index 0000000..3d94196
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplateTest.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.email.template;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.dolphinscheduler.plugin.alert.email.EmailConstants;
+import org.apache.dolphinscheduler.spi.alert.ShowType;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * test class for DefaultHTMLTemplate
+ */
+public class DefaultHTMLTemplateTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultHTMLTemplateTest.class);
+
+ /**
+ * only need test method GetMessageFromTemplate
+ */
+ @Test
+ public void testGetMessageFromTemplate() {
+
+ DefaultHTMLTemplate template = new DefaultHTMLTemplate();
+
+ String tableTypeMessage = template.getMessageFromTemplate(list2String(), ShowType.TABLE, true);
+
+ assertEquals(tableTypeMessage, generateMockTableTypeResultByHand());
+
+ String textTypeMessage = template.getMessageFromTemplate(list2String(), ShowType.TEXT, true);
+
+ assertEquals(textTypeMessage, generateMockTextTypeResultByHand());
+ }
+
+ /**
+ * generate some simulation data
+ */
+ private String list2String() {
+
+ LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
+ map1.put("mysql service name", "mysql200");
+ map1.put("mysql address", "192.168.xx.xx");
+ map1.put("database client connections", "190");
+ map1.put("port", "3306");
+ map1.put("no index of number", "80");
+
+ LinkedHashMap<String, Object> map2 = new LinkedHashMap<>();
+ map2.put("mysql service name", "mysql210");
+ map2.put("mysql address", "192.168.xx.xx");
+ map2.put("database client connections", "90");
+ map2.put("port", "3306");
+ map2.put("no index of number", "10");
+
+ List<LinkedHashMap<String, Object>> maps = new ArrayList<>();
+ maps.add(0, map1);
+ maps.add(1, map2);
+ String mapjson = JSONUtils.toJsonString(maps);
+ logger.info(mapjson);
+
+ return mapjson;
+ }
+
+ private String generateMockTableTypeResultByHand() {
+
+ return EmailConstants.HTML_HEADER_PREFIX
+ + "<thead>"
+ + "<tr><th>mysql service name</th><th>mysql address</th><th>database client connections</th><th>port</th><th>no index of number</th></tr>"
+ + "</thead>\n"
+ + "<tr><td>mysql200</td><td>192.168.xx.xx</td><td>190</td><td>3306</td><td>80</td></tr>"
+ + "<tr><td>mysql210</td><td>192.168.xx.xx</td><td>90</td><td>3306</td><td>10</td></tr>"
+ + EmailConstants.TABLE_BODY_HTML_TAIL;
+
+ }
+
+ private String generateMockTextTypeResultByHand() {
+
+ return EmailConstants.HTML_HEADER_PREFIX
+ + "<tr><td>{\"mysql service name\":\"mysql200\",\"mysql address\":\"192.168.xx.xx\",\"database client connections\":\"190\",\"port\":\"3306\",\"no index of number\":\"80\"}</td></tr>"
+ + "<tr><td>{\"mysql service name\":\"mysql210\",\"mysql address\":\"192.168.xx.xx\",\"database client connections\":\"90\",\"port\":\"3306\",\"no index of number\":\"10\"}</td></tr>"
+ + EmailConstants.TABLE_BODY_HTML_TAIL;
+ }
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml
new file mode 100644
index 0000000..62ac776
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>dolphinscheduler-alert-plugin</artifactId>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <version>1.3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-wechat</artifactId>
+
+
+</project>
\ No newline at end of file
diff --git a/dolphinscheduler-plugin-api/pom.xml b/dolphinscheduler-alert-plugin/pom.xml
similarity index 52%
copy from dolphinscheduler-plugin-api/pom.xml
copy to dolphinscheduler-alert-plugin/pom.xml
index 7db15e7..d2fbca3 100644
--- a/dolphinscheduler-plugin-api/pom.xml
+++ b/dolphinscheduler-alert-plugin/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
@@ -15,38 +15,25 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler</artifactId>
+ <groupId>org.apache.dolphinscheduler</groupId>
<version>1.3.2-SNAPSHOT</version>
</parent>
- <artifactId>dolphinscheduler-plugin-api</artifactId>
- <name>${project.artifactId}</name>
- <packaging>jar</packaging>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugin</artifactId>
+ <packaging>pom</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <modules>
+ <module>dolphinscheduler-alert-email</module>
+ <module>dolphinscheduler-alert-wechat</module>
+ <module>dolphinscheduler-alert-dingtalk</module>
+ </modules>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml
index 215916d..e79c9a2 100644
--- a/dolphinscheduler-alert/pom.xml
+++ b/dolphinscheduler-alert/pom.xml
@@ -32,38 +32,13 @@
</properties>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-spi</artifactId>
</dependency>
-
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
</dependency>
<dependency>
@@ -108,6 +83,53 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>io.airlift.resolver</groupId>
+ <artifactId>resolver</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
index 347336c..ccd359d 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
@@ -14,21 +14,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert;
-import org.apache.dolphinscheduler.alert.plugin.EmailAlertPlugin;
+import org.apache.dolphinscheduler.alert.plugin.AlertPluginManager;
+import org.apache.dolphinscheduler.alert.plugin.DolphinPluginLoader;
+import org.apache.dolphinscheduler.alert.plugin.DolphinPluginManagerConfig;
import org.apache.dolphinscheduler.alert.runner.AlertSender;
import org.apache.dolphinscheduler.alert.utils.Constants;
import org.apache.dolphinscheduler.alert.utils.PropertyUtils;
-import org.apache.dolphinscheduler.common.plugin.FilePluginManager;
import org.apache.dolphinscheduler.common.thread.Stopper;
import org.apache.dolphinscheduler.dao.AlertDao;
import org.apache.dolphinscheduler.dao.DaoFactory;
+import org.apache.dolphinscheduler.dao.PluginDao;
import org.apache.dolphinscheduler.dao.entity.Alert;
+import org.apache.dolphinscheduler.spi.utils.StringUtils;
+
+import java.util.List;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
+import com.google.common.collect.ImmutableList;
/**
* alert of start
@@ -40,35 +47,59 @@ public class AlertServer {
*/
private AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
+ private PluginDao pluginDao = DaoFactory.getDaoInstance(PluginDao.class);
+
private AlertSender alertSender;
private static AlertServer instance;
- private FilePluginManager alertPluginManager;
+ private AlertPluginManager alertPluginManager;
+
+ private DolphinPluginManagerConfig alertPluginManagerConfig;
+
+ public static final String ALERT_PLUGIN_BINDING = "alert.plugin.binding";
+
+ public static final String ALERT_PLUGIN_DIR = "alert.plugin.dir";
+
+ public static final String MAVEN_LOCAL_REPOSITORY = "maven.local.repository";
+
+ private static class AlertServerHolder {
+ private static final AlertServer INSTANCE = new AlertServer();
+ }
+
+ public static final AlertServer getInstance() {
+ return AlertServerHolder.INSTANCE;
- private static final String[] whitePrefixes = new String[]{"org.apache.dolphinscheduler.plugin.utils."};
+ }
- private static final String[] excludePrefixes = new String[]{
- "org.apache.dolphinscheduler.plugin.",
- "ch.qos.logback.",
- "org.slf4j."
- };
+ private AlertServer() {
- public AlertServer() {
- alertPluginManager =
- new FilePluginManager(PropertyUtils.getString(Constants.PLUGIN_DIR), whitePrefixes, excludePrefixes);
- // add default alert plugins
- alertPluginManager.addPlugin(new EmailAlertPlugin());
}
- public synchronized static AlertServer getInstance() {
- if (null == instance) {
- instance = new AlertServer();
+ private void initPlugin() {
+ alertPluginManager = new AlertPluginManager();
+ alertPluginManagerConfig = new DolphinPluginManagerConfig();
+ alertPluginManagerConfig.setPlugins(PropertyUtils.getString(ALERT_PLUGIN_BINDING));
+ if (StringUtils.isNotBlank(PropertyUtils.getString(ALERT_PLUGIN_DIR))) {
+ alertPluginManagerConfig.setInstalledPluginsDir(PropertyUtils.getString(ALERT_PLUGIN_DIR, Constants.ALERT_PLUGIN_PATH).trim());
+ }
+
+ if (StringUtils.isNotBlank(PropertyUtils.getString(MAVEN_LOCAL_REPOSITORY))) {
+ alertPluginManagerConfig.setMavenLocalRepository(PropertyUtils.getString(MAVEN_LOCAL_REPOSITORY).trim());
+ }
+
+ DolphinPluginLoader alertPluginLoader = new DolphinPluginLoader(alertPluginManagerConfig, ImmutableList.of(alertPluginManager));
+ try {
+ alertPluginLoader.loadPlugins();
+ } catch (Exception e) {
+ throw new RuntimeException("load Alert Plugin Failed !", e);
}
- return instance;
}
public void start() {
+
+ initPlugin();
+
logger.info("alert server ready start ");
while (Stopper.isRunning()) {
try {
@@ -77,14 +108,18 @@ public class AlertServer {
logger.error(e.getMessage(), e);
Thread.currentThread().interrupt();
}
- List<Alert> alerts = alertDao.listWaitExecutionAlert();
- alertSender = new AlertSender(alerts, alertDao, alertPluginManager);
- alertSender.run();
+ if (alertPluginManager == null || alertPluginManager.getAlertChannelMap().size() == 0) {
+ logger.warn("No Alert Plugin . Can not send alert info. ");
+ } else {
+ List<Alert> alerts = alertDao.listWaitExecutionAlert();
+ alertSender = new AlertSender(alerts, alertDao, alertPluginManager, pluginDao);
+ alertSender.run();
+ }
}
}
-
public static void main(String[] args) {
+ System.out.println(System.getProperty("user.dir"));
AlertServer alertServer = AlertServer.getInstance();
alertServer.start();
}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/DingTalkManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/DingTalkManager.java
index 6840794..07de6a0 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/DingTalkManager.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/DingTalkManager.java
@@ -14,33 +14,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.manager;
import org.apache.dolphinscheduler.alert.utils.Constants;
import org.apache.dolphinscheduler.alert.utils.DingTalkUtils;
-import org.apache.dolphinscheduler.plugin.model.AlertInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.dolphinscheduler.spi.alert.AlertInfo;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Ding Talk Manager
*/
public class DingTalkManager {
private static final Logger logger = LoggerFactory.getLogger(EnterpriseWeChatManager.class);
- public Map<String,Object> send(AlertInfo alert) {
- Map<String,Object> retMap = new HashMap<>();
+ public Map<String, Object> send(AlertInfo alert) {
+ Map<String, Object> retMap = new HashMap<>();
retMap.put(Constants.STATUS, false);
logger.info("send message {}", alert.getAlertData().getTitle());
try {
String msg = buildMessage(alert);
DingTalkUtils.sendDingTalkMsg(msg, Constants.UTF_8);
} catch (IOException e) {
- logger.error(e.getMessage(),e);
+ logger.error(e.getMessage(), e);
}
retMap.put(Constants.STATUS, true);
return retMap;
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java
index 22f4b7a..874b866 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java
@@ -1,55 +1,55 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.alert.manager;
-
-import org.apache.dolphinscheduler.alert.utils.MailUtils;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * email send manager
- */
-public class EmailManager {
- /**
- * email send
- * @param receiversList the receiver list
- * @param receiversCcList the cc List
- * @param title the title
- * @param content the content
- * @param showType the showType
- * @return the send result
- */
- public Map<String,Object> send(List<String> receiversList,List<String> receiversCcList,String title,String content,String showType){
-
- return MailUtils.sendMails(receiversList, receiversCcList, title, content, showType);
- }
-
- /**
- * msg send
- * @param receiversList the receiver list
- * @param title the title
- * @param content the content
- * @param showType the showType
- * @return the send result
- */
- public Map<String,Object> send(List<String> receiversList,String title,String content,String showType){
-
- return MailUtils.sendMails(receiversList,title, content, showType);
- }
-
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package org.apache.dolphinscheduler.alert.manager;
+//
+//import org.apache.dolphinscheduler.alert.utils.MailUtils;
+//
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * email send manager
+// */
+//public class EmailManager {
+// /**
+// * email send
+// * @param receiversList the receiver list
+// * @param receiversCcList the cc List
+// * @param title the title
+// * @param content the content
+// * @param showType the showType
+// * @return the send result
+// */
+// public Map<String,Object> send(List<String> receiversList,List<String> receiversCcList,String title,String content,String showType){
+//
+// return MailUtils.sendMails(receiversList, receiversCcList, title, content, showType);
+// }
+//
+// /**
+// * msg send
+// * @param receiversList the receiver list
+// * @param title the title
+// * @param content the content
+// * @param showType the showType
+// * @return the send result
+// */
+// public Map<String,Object> send(List<String> receiversList,String title,String content,String showType){
+//
+// return MailUtils.sendMails(receiversList,title, content, showType);
+// }
+//
+//}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java
index 43649d6..0534d80 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.manager;
import org.apache.dolphinscheduler.alert.utils.Constants;
import org.apache.dolphinscheduler.alert.utils.EnterpriseWeChatUtils;
-import org.apache.dolphinscheduler.plugin.model.AlertInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.dolphinscheduler.spi.alert.AlertInfo;
import java.io.IOException;
import java.util.Arrays;
@@ -28,29 +27,34 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Enterprise WeChat Manager
*/
public class EnterpriseWeChatManager {
private static final Logger logger = LoggerFactory.getLogger(EnterpriseWeChatManager.class);
+
/**
* Enterprise We Chat send
+ *
* @param alertInfo the alert info
- * @param token the token
+ * @param token the token
* @return the send result
*/
- public Map<String,Object> send(AlertInfo alertInfo, String token){
- Map<String,Object> retMap = new HashMap<>();
+ public Map<String, Object> send(AlertInfo alertInfo, String token) {
+ Map<String, Object> retMap = new HashMap<>();
retMap.put(Constants.STATUS, false);
String agentId = EnterpriseWeChatUtils.ENTERPRISE_WE_CHAT_AGENT_ID;
String users = EnterpriseWeChatUtils.ENTERPRISE_WE_CHAT_USERS;
List<String> userList = Arrays.asList(users.split(","));
logger.info("send message {}", alertInfo.getAlertData().getTitle());
- String msg = EnterpriseWeChatUtils.makeUserSendMsg(userList, agentId,EnterpriseWeChatUtils.markdownByAlert(alertInfo.getAlertData()));
+ String msg = EnterpriseWeChatUtils.makeUserSendMsg(userList, agentId, EnterpriseWeChatUtils.markdownByAlert(alertInfo));
try {
EnterpriseWeChatUtils.sendEnterpriseWeChat(Constants.UTF_8, msg, token);
} catch (IOException e) {
- logger.error(e.getMessage(),e);
+ logger.error(e.getMessage(), e);
}
retMap.put(Constants.STATUS, true);
return retMap;
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java
index 3594926..e7fb161 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java
@@ -14,23 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.manager;
import org.apache.dolphinscheduler.dao.entity.Alert;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* SMS send manager
*/
-public class MsgManager {
+public class MsgManager {
private static final Logger logger = LoggerFactory.getLogger(MsgManager.class);
+
/**
* SMS send
+ *
* @param alert the alert
*/
- public void send(Alert alert){
- logger.info("send message {}",alert);
+ public void send(Alert alert) {
+ logger.info("send message {}", alert);
}
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AbstractDolphinPluginManager.java
similarity index 65%
copy from dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java
copy to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AbstractDolphinPluginManager.java
index f807884..9fd847d 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AbstractDolphinPluginManager.java
@@ -14,20 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.common.plugin;
-import org.apache.dolphinscheduler.plugin.api.AlertPlugin;
+package org.apache.dolphinscheduler.alert.plugin;
-import java.util.Map;
+import org.apache.dolphinscheduler.dao.DaoFactory;
+import org.apache.dolphinscheduler.dao.PluginDao;
+import org.apache.dolphinscheduler.spi.DolphinSchedulerPlugin;
-/**
- * PluginManager
- */
-public interface PluginManager {
-
- AlertPlugin findOne(String name);
+public abstract class AbstractDolphinPluginManager {
- Map<String, AlertPlugin> findAll();
+ protected PluginDao pluginDao = DaoFactory.getDaoInstance(PluginDao.class);
- void addPlugin(AlertPlugin plugin);
+ public abstract void installPlugin(DolphinSchedulerPlugin dolphinSchedulerPlugin);
}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
new file mode 100644
index 0000000..d9e1906
--- /dev/null
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.alert.plugin;
+
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import org.apache.dolphinscheduler.dao.entity.PluginDefine;
+import org.apache.dolphinscheduler.spi.DolphinSchedulerPlugin;
+import org.apache.dolphinscheduler.spi.alert.AlertChannel;
+import org.apache.dolphinscheduler.spi.alert.AlertChannelFactory;
+import org.apache.dolphinscheduler.spi.classloader.ThreadContextClassLoader;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+import org.apache.dolphinscheduler.spi.params.base.PluginParams;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * load the configured alert plugin and manager them
+ */
+public class AlertPluginManager extends AbstractDolphinPluginManager {
+ private static final Logger logger = LoggerFactory.getLogger(AlertPluginManager.class);
+
+ private final Map<String, AlertChannelFactory> alertChannelFactoryMap = new ConcurrentHashMap<>();
+ private final Map<String, AlertChannel> alertChannelMap = new ConcurrentHashMap<>();
+
+ public void addAlertChannelFactory(AlertChannelFactory alertChannelFactory) {
+ requireNonNull(alertChannelFactory, "alertChannelFactory is null");
+
+ if (alertChannelFactoryMap.putIfAbsent(alertChannelFactory.getName(), alertChannelFactory) != null) {
+ throw new IllegalArgumentException(format("Alert Plugin '{}' is already registered", alertChannelFactory.getName()));
+ }
+
+ try {
+ loadAlertChannel(alertChannelFactory.getName());
+ } catch (Exception e) {
+ throw new IllegalArgumentException(format("Alert Plugin '{}' is can not load .", alertChannelFactory.getName()));
+ }
+ }
+
+ protected void loadAlertChannel(String name) {
+ requireNonNull(name, "name is null");
+
+ AlertChannelFactory alertChannelFactory = alertChannelFactoryMap.get(name);
+ checkState(alertChannelFactory != null, "Alert Plugin {} is not registered", name);
+
+ try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(alertChannelFactory.getClass().getClassLoader())) {
+ AlertChannel alertChannel = alertChannelFactory.create();
+ this.alertChannelMap.put(name, alertChannel);
+ }
+
+ logger.info("-- Loaded Alert Plugin {} --", name);
+ }
+
+ public Map<String, AlertChannelFactory> getAlertChannelFactoryMap() {
+ return alertChannelFactoryMap;
+ }
+
+ public Map<String, AlertChannel> getAlertChannelMap() {
+ return alertChannelMap;
+ }
+
+ @Override
+ public void installPlugin(DolphinSchedulerPlugin dolphinSchedulerPlugin) {
+ for (AlertChannelFactory alertChannelFactory : dolphinSchedulerPlugin.getAlertChannelFactorys()) {
+ logger.info("Registering Alert Plugin '{}'", alertChannelFactory.getName());
+ this.addAlertChannelFactory(alertChannelFactory);
+ List<PluginParams> params = alertChannelFactory.getParams();
+ String nameEn = alertChannelFactory.getName();
+ String paramsJson = PluginParamsTransfer.transferParamsToJson(params);
+
+ PluginDefine pluginDefine = new PluginDefine(nameEn, "alert", paramsJson);
+ pluginDao.addOrUpdatePluginDefine(pluginDefine);
+ }
+ }
+}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginClassLoader.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginClassLoader.java
new file mode 100644
index 0000000..80b8589
--- /dev/null
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginClassLoader.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.alert.plugin;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Enumeration;
+import java.util.List;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+
+class DolphinPluginClassLoader
+ extends URLClassLoader {
+ private static final ClassLoader PLATFORM_CLASS_LOADER = findPlatformClassLoader();
+
+ private final ClassLoader spiClassLoader;
+ private final List<String> spiPackages;
+ private final List<String> spiResources;
+
+ public DolphinPluginClassLoader(
+ List<URL> urls,
+ ClassLoader spiClassLoader,
+ Iterable<String> spiPackages) {
+ this(urls,
+ spiClassLoader,
+ spiPackages,
+ Iterables.transform(spiPackages, DolphinPluginClassLoader::classNameToResource));
+ }
+
+ private DolphinPluginClassLoader(
+ List<URL> urls,
+ ClassLoader spiClassLoader,
+ Iterable<String> spiPackages,
+ Iterable<String> spiResources) {
+ // plugins should not have access to the system (application) class loader
+ super(urls.toArray(new URL[urls.size()]), PLATFORM_CLASS_LOADER);
+ this.spiClassLoader = requireNonNull(spiClassLoader, "spiClassLoader is null");
+ this.spiPackages = ImmutableList.copyOf(spiPackages);
+ this.spiResources = ImmutableList.copyOf(spiResources);
+ }
+
+ @Override
+ protected Class<?> loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+ // grab the magic lock
+ synchronized (getClassLoadingLock(name)) {
+ // Check if class is in the loaded classes cache
+ Class<?> cachedClass = findLoadedClass(name);
+ if (cachedClass != null) {
+ return resolveClass(cachedClass, resolve);
+ }
+
+ // If this is an SPI class, only check SPI class loader
+ if (isSpiClass(name)) {
+ return resolveClass(spiClassLoader.loadClass(name), resolve);
+ }
+
+ // Look for class locally
+ return super.loadClass(name, resolve);
+ }
+ }
+
+ private Class<?> resolveClass(Class<?> clazz, boolean resolve) {
+ if (resolve) {
+ resolveClass(clazz);
+ }
+ return clazz;
+ }
+
+ @Override
+ public URL getResource(String name) {
+ // If this is an SPI resource, only check SPI class loader
+ if (isSpiResource(name)) {
+ return spiClassLoader.getResource(name);
+ }
+
+ // Look for resource locally
+ return super.getResource(name);
+ }
+
+ @Override
+ public Enumeration<URL> getResources(String name)
+ throws IOException {
+ // If this is an SPI resource, use SPI resources
+ if (isSpiClass(name)) {
+ return spiClassLoader.getResources(name);
+ }
+
+ // Use local resources
+ return super.getResources(name);
+ }
+
+ private boolean isSpiClass(String name) {
+ return spiPackages.stream().anyMatch(name::startsWith);
+ }
+
+ private boolean isSpiResource(String name) {
+ return spiResources.stream().anyMatch(name::startsWith);
+ }
+
+ private static String classNameToResource(String className) {
+ return className.replace('.', '/');
+ }
+
+ @SuppressWarnings("JavaReflectionMemberAccess")
+ private static ClassLoader findPlatformClassLoader() {
+ try {
+ // use platform class loader on Java 9
+ Method method = ClassLoader.class.getMethod("getPlatformClassLoader");
+ return (ClassLoader) method.invoke(null);
+ } catch (NoSuchMethodException ignored) {
+ // use null class loader on Java 8
+ return null;
+ } catch (IllegalAccessException | InvocationTargetException e) {
+ throw new AssertionError(e);
+ }
+ }
+}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginDiscovery.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginDiscovery.java
new file mode 100644
index 0000000..24fe279
--- /dev/null
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginDiscovery.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.alert.plugin;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.Files.createDirectories;
+import static java.nio.file.Files.walkFileTree;
+
+import static com.google.common.io.ByteStreams.toByteArray;
+
+import org.apache.dolphinscheduler.spi.DolphinSchedulerPlugin;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.UncheckedIOException;
+import java.io.Writer;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.objectweb.asm.ClassReader;
+import org.sonatype.aether.artifact.Artifact;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * The role of this class is to load the plugin class during development
+ */
+final class DolphinPluginDiscovery {
+ private static final String JAVA_CLASS_FILE_SUFFIX = ".class";
+ private static final String PLUGIN_SERVICES_FILE = "META-INF/services/" + DolphinSchedulerPlugin.class.getName();
+
+ private DolphinPluginDiscovery() {
+ }
+
+ public static Set<String> discoverPluginsFromArtifact(Artifact artifact, ClassLoader classLoader)
+ throws IOException {
+ if (!artifact.getExtension().equals("dolphinscheduler-plugin")) {
+ throw new RuntimeException("Unexpected extension for main artifact: " + artifact);
+ }
+
+ File file = artifact.getFile();
+ if (!file.getPath().endsWith("/target/classes")) {
+ throw new RuntimeException("Unexpected file for main artifact: " + file);
+ }
+ if (!file.isDirectory()) {
+ throw new RuntimeException("Main artifact file is not a directory: " + file);
+ }
+
+ if (new File(file, PLUGIN_SERVICES_FILE).exists()) {
+ return ImmutableSet.of();
+ }
+
+ return listClasses(file.toPath()).stream()
+ .filter(name -> classInterfaces(name, classLoader).contains(DolphinSchedulerPlugin.class.getName()))
+ .collect(Collectors.toSet());
+ }
+
+ public static void writePluginServices(Iterable<String> plugins, File root)
+ throws IOException {
+ Path path = root.toPath().resolve(PLUGIN_SERVICES_FILE);
+ createDirectories(path.getParent());
+ try (Writer out = new OutputStreamWriter(new FileOutputStream(path.toFile()), UTF_8)) {
+ for (String plugin : plugins) {
+ out.write(plugin + "\n");
+ }
+ }
+ }
+
+ private static List<String> listClasses(Path base)
+ throws IOException {
+ ImmutableList.Builder<String> list = ImmutableList.builder();
+ walkFileTree(base, new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attributes) {
+ if (file.getFileName().toString().endsWith(JAVA_CLASS_FILE_SUFFIX)) {
+ String name = file.subpath(base.getNameCount(), file.getNameCount()).toString();
+ list.add(javaName(name.substring(0, name.length() - JAVA_CLASS_FILE_SUFFIX.length())));
+ }
+ return FileVisitResult.CONTINUE;
+ }
+ });
+ return list.build();
+ }
+
+ private static List<String> classInterfaces(String name, ClassLoader classLoader) {
+ ImmutableList.Builder<String> list = ImmutableList.builder();
+ ClassReader reader = readClass(name, classLoader);
+ for (String binaryName : reader.getInterfaces()) {
+ list.add(javaName(binaryName));
+ }
+ if (reader.getSuperName() != null) {
+ list.addAll(classInterfaces(javaName(reader.getSuperName()), classLoader));
+ }
+ return list.build();
+ }
+
+ private static ClassReader readClass(String name, ClassLoader classLoader) {
+ try (InputStream in = classLoader.getResourceAsStream(binaryName(name) + JAVA_CLASS_FILE_SUFFIX)) {
+ if (in == null) {
+ throw new RuntimeException("Failed to read class: " + name);
+ }
+ return new ClassReader(toByteArray(in));
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
+ private static String binaryName(String javaName) {
+ return javaName.replace('.', '/');
+ }
+
+ private static String javaName(String binaryName) {
+ return binaryName.replace('/', '.');
+ }
+}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoader.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoader.java
new file mode 100644
index 0000000..940c30d
--- /dev/null
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoader.java
@@ -0,0 +1,191 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.alert.plugin;
+
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import org.apache.dolphinscheduler.spi.DolphinSchedulerPlugin;
+import org.apache.dolphinscheduler.spi.classloader.ThreadContextClassLoader;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.ServiceLoader;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.sonatype.aether.artifact.Artifact;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Ordering;
+
+import io.airlift.resolver.ArtifactResolver;
+
+/**
+ * Plugin Loader
+ * Load Plugin from pom when development and run server in IDE
+ * Load Plugin from the plugin directory when running on the server
+ */
+public class DolphinPluginLoader {
+ private static final Logger logger = LoggerFactory.getLogger(DolphinPluginLoader.class);
+
+ /**
+ * All third-party jar packages used in the classes which in spi package need to be add
+ */
+ private static final ImmutableList<String> DOLPHIN_SPI_PACKAGES = ImmutableList.<String>builder()
+ .add("org.apache.dolphinscheduler.spi.")
+ .add("com.fasterxml.jackson.")
+ .build();
+
+ private final File installedPluginsDir;
+ private final List<String> configPlugins;
+ private ArtifactResolver resolver = null;
+ private final List<AbstractDolphinPluginManager> dolphinPluginManagerList;
+
+ public DolphinPluginLoader(DolphinPluginManagerConfig config, List<AbstractDolphinPluginManager> dolphinPluginManagerList) {
+ installedPluginsDir = config.getInstalledPluginsDir();
+ if (config.getPlugins() == null) {
+ this.configPlugins = ImmutableList.of();
+ } else {
+ this.configPlugins = ImmutableList.copyOf(config.getPlugins());
+ }
+
+ this.dolphinPluginManagerList = requireNonNull(dolphinPluginManagerList, "dolphinPluginManagerList is null");
+ if (configPlugins != null && configPlugins.size() > 0) {
+ this.resolver = new ArtifactResolver(config.getMavenLocalRepository(), config.getMavenRemoteRepository());
+ }
+ }
+
+ public void loadPlugins()
+ throws Exception {
+ for (File file : listPluginDirs(installedPluginsDir)) {
+ if (file.isDirectory()) {
+ loadPlugin(file.getAbsolutePath());
+ }
+ }
+
+ for (String plugin : configPlugins) {
+ loadPlugin(plugin);
+ }
+ }
+
+ private void loadPlugin(String plugin)
+ throws Exception {
+ logger.info("-- Loading Alert plugin {} --", plugin);
+ URLClassLoader pluginClassLoader = buildPluginClassLoader(plugin);
+ try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(pluginClassLoader)) {
+ loadPlugin(pluginClassLoader);
+ }
+ logger.info("-- Finished loading Alert plugin {} --", plugin);
+ }
+
+ private void loadPlugin(URLClassLoader pluginClassLoader) {
+ ServiceLoader<DolphinSchedulerPlugin> serviceLoader = ServiceLoader.load(DolphinSchedulerPlugin.class, pluginClassLoader);
+ List<DolphinSchedulerPlugin> plugins = ImmutableList.copyOf(serviceLoader);
+ checkState(!plugins.isEmpty(), "No service providers the plugin {}", DolphinSchedulerPlugin.class.getName());
+ for (DolphinSchedulerPlugin plugin : plugins) {
+ logger.info("Installing {}", plugin.getClass().getName());
+ for (AbstractDolphinPluginManager dolphinPluginManager : dolphinPluginManagerList) {
+ dolphinPluginManager.installPlugin(plugin);
+ }
+ }
+ }
+
+ private URLClassLoader buildPluginClassLoader(String plugin)
+ throws Exception {
+ File file = new File(plugin);
+
+ if (!file.isDirectory() && (file.getName().equals("pom.xml") || file.getName().endsWith(".pom"))) {
+ return buildPluginClassLoaderFromPom(file);
+ }
+ if (file.isDirectory()) {
+ return buildPluginClassLoaderFromDirectory(file);
+ } else {
+ throw new IllegalArgumentException(format("plugin must be a pom file or directory {} .", plugin));
+ }
+ }
+
+ private URLClassLoader buildPluginClassLoaderFromPom(File pomFile)
+ throws Exception {
+ List<Artifact> artifacts = resolver.resolvePom(pomFile);
+ URLClassLoader classLoader = createClassLoader(artifacts, pomFile.getPath());
+
+ Artifact artifact = artifacts.get(0);
+ Set<String> plugins = DolphinPluginDiscovery.discoverPluginsFromArtifact(artifact, classLoader);
+ if (!plugins.isEmpty()) {
+ DolphinPluginDiscovery.writePluginServices(plugins, artifact.getFile());
+ }
+
+ return classLoader;
+ }
+
+ private URLClassLoader buildPluginClassLoaderFromDirectory(File dir)
+ throws Exception {
+ logger.info("Classpath for {}:", dir.getName());
+ List<URL> urls = new ArrayList<>();
+ for (File file : listPluginDirs(dir)) {
+ logger.info(" {}", file);
+ urls.add(file.toURI().toURL());
+ }
+ return createClassLoader(urls);
+ }
+
+ private URLClassLoader createClassLoader(List<Artifact> artifacts, String name)
+ throws IOException {
+ logger.info("Classpath for {}:", name);
+ List<URL> urls = new ArrayList<>();
+ for (Artifact artifact : sortArtifacts(artifacts)) {
+ if (artifact.getFile() == null) {
+ throw new RuntimeException("Could not resolve artifact: " + artifact);
+ }
+ File file = artifact.getFile().getCanonicalFile();
+ logger.info(" {}", file);
+ urls.add(file.toURI().toURL());
+ }
+ return createClassLoader(urls);
+ }
+
+ private URLClassLoader createClassLoader(List<URL> urls) {
+ ClassLoader parent = getClass().getClassLoader();
+ return new DolphinPluginClassLoader(urls, parent, DOLPHIN_SPI_PACKAGES);
+ }
+
+ private static List<File> listPluginDirs(File installedPluginsDir) {
+ if (installedPluginsDir != null && installedPluginsDir.isDirectory()) {
+ File[] files = installedPluginsDir.listFiles();
+ if (files != null) {
+ Arrays.sort(files);
+ return ImmutableList.copyOf(files);
+ }
+ }
+ return ImmutableList.of();
+ }
+
+ private static List<Artifact> sortArtifacts(List<Artifact> artifacts) {
+ List<Artifact> list = new ArrayList<>(artifacts);
+ Collections.sort(list, Ordering.natural().nullsLast().onResultOf(Artifact::getFile));
+ return list;
+ }
+
+}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginManagerConfig.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginManagerConfig.java
new file mode 100644
index 0000000..195484d
--- /dev/null
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginManagerConfig.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.alert.plugin;
+
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+import java.io.File;
+import java.util.List;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
+
+/**
+ * Dolphin Scheduler Plugin Manager Config
+ */
+public class DolphinPluginManagerConfig {
+
+ /**
+ * The dir of the Alert Plugin in.
+ * When AlertServer is running on the server, it will load the Alert Plugin from this directory.
+ */
+ private File installedPluginsDir;
+
+ /**
+ * The plugin should be load.
+ * The installedPluginsDir is empty when we development and run server in IDEA. Then we can config which plugin should be load by param name alert.plugin.binding in the alert.properties file
+ */
+ private List<String> plugins;
+
+ /**
+ * Development, When AlertServer is running on IDE, AlertPluginLoad can load Alert Plugin from local Repository.
+ */
+ private String mavenLocalRepository = System.getProperty("user.home") + "/.m2/repository";
+ private List<String> mavenRemoteRepository = ImmutableList.of("http://repo1.maven.org/maven2/");
+
+ public File getInstalledPluginsDir() {
+ return installedPluginsDir;
+ }
+
+ /**
+ * @param pluginDir
+ */
+ public DolphinPluginManagerConfig setInstalledPluginsDir(String pluginDir) {
+ requireNonNull(pluginDir, "pluginDir can not be null");
+ File pluginDirFile = new File(pluginDir);
+ if (!pluginDirFile.exists()) {
+ throw new IllegalArgumentException(format("plugin dir not exists ! {}", pluginDirFile.getPath()));
+ }
+ this.installedPluginsDir = pluginDirFile;
+ return this;
+ }
+
+ public List<String> getPlugins() {
+ return plugins;
+ }
+
+ public DolphinPluginManagerConfig setPlugins(List<String> plugins) {
+ this.plugins = plugins;
+ return this;
+ }
+
+ /**
+ * When development and run server in IDE, this method can set plugins in alert.properties .
+ * Then when you start AlertServer in IDE, the plugin can be load.
+ * eg:
+ * file: alert.properties
+ * alert.plugin=\
+ * ../dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml, \
+ * ../dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml
+ *
+ * @param plugins
+ * @return
+ */
+ public DolphinPluginManagerConfig setPlugins(String plugins) {
+ if (plugins == null) {
+ this.plugins = null;
+ } else {
+ this.plugins = ImmutableList.copyOf(Splitter.on(',').omitEmptyStrings().trimResults().split(plugins));
+ }
+ return this;
+ }
+
+ public String getMavenLocalRepository() {
+ return mavenLocalRepository;
+ }
+
+ public DolphinPluginManagerConfig setMavenLocalRepository(String mavenLocalRepository) {
+ this.mavenLocalRepository = mavenLocalRepository;
+ return this;
+ }
+
+ public List<String> getMavenRemoteRepository() {
+ return mavenRemoteRepository;
+ }
+
+ public DolphinPluginManagerConfig setMavenRemoteRepository(List<String> mavenRemoteRepository) {
+ this.mavenRemoteRepository = mavenRemoteRepository;
+ return this;
+ }
+
+ public DolphinPluginManagerConfig setMavenRemoteRepository(String mavenRemoteRepository) {
+ this.mavenRemoteRepository = ImmutableList.copyOf(Splitter.on(',').omitEmptyStrings().trimResults().split(mavenRemoteRepository));
+ return this;
+ }
+}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java
deleted file mode 100644
index fbc600f..0000000
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.alert.plugin;
-
-import org.apache.dolphinscheduler.alert.manager.DingTalkManager;
-import org.apache.dolphinscheduler.alert.manager.EmailManager;
-import org.apache.dolphinscheduler.alert.manager.EnterpriseWeChatManager;
-import org.apache.dolphinscheduler.alert.utils.Constants;
-import org.apache.dolphinscheduler.alert.utils.DingTalkUtils;
-import org.apache.dolphinscheduler.alert.utils.EnterpriseWeChatUtils;
-import org.apache.dolphinscheduler.common.utils.CollectionUtils;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.apache.dolphinscheduler.plugin.api.AlertPlugin;
-import org.apache.dolphinscheduler.plugin.model.AlertData;
-import org.apache.dolphinscheduler.plugin.model.AlertInfo;
-import org.apache.dolphinscheduler.plugin.model.PluginName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-
-/**
- * EmailAlertPlugin
- *
- * This plugin is a default plugin, and mix up email and enterprise wechat, because adapt with former alert behavior
- */
-public class EmailAlertPlugin implements AlertPlugin {
-
- private static final Logger logger = LoggerFactory.getLogger(EmailAlertPlugin.class);
-
- private PluginName pluginName;
-
- private static final EmailManager emailManager = new EmailManager();
- private static final EnterpriseWeChatManager weChatManager = new EnterpriseWeChatManager();
- private static final DingTalkManager dingTalkManager = new DingTalkManager();
-
- public EmailAlertPlugin() {
- this.pluginName = new PluginName();
- this.pluginName.setEnglish(Constants.PLUGIN_DEFAULT_EMAIL_EN);
- this.pluginName.setChinese(Constants.PLUGIN_DEFAULT_EMAIL_CH);
- }
-
- @Override
- public String getId() {
- return Constants.PLUGIN_DEFAULT_EMAIL_ID;
- }
-
- @Override
- public PluginName getName() {
- return pluginName;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Map<String, Object> process(AlertInfo info) {
- Map<String, Object> retMaps = new HashMap<>();
-
- AlertData alert = info.getAlertData();
-
- List<String> receiversList = (List<String>) info.getProp(Constants.PLUGIN_DEFAULT_EMAIL_RECEIVERS);
-
- // receiving group list
- // custom receiver
- String receivers = alert.getReceivers();
- if (StringUtils.isNotEmpty(receivers)) {
- String[] splits = receivers.split(",");
- receiversList.addAll(Arrays.asList(splits));
- }
-
- List<String> receiversCcList = new ArrayList<>();
- // Custom Copier
- String receiversCc = alert.getReceiversCc();
- if (StringUtils.isNotEmpty(receiversCc)) {
- String[] splits = receiversCc.split(",");
- receiversCcList.addAll(Arrays.asList(splits));
- }
-
- if (CollectionUtils.isEmpty(receiversList) && CollectionUtils.isEmpty(receiversCcList)) {
- logger.warn("alert send error : At least one receiver address required");
- retMaps.put(Constants.STATUS, "false");
- retMaps.put(Constants.MESSAGE, "execution failure,At least one receiver address required.");
- return retMaps;
- }
-
- retMaps = emailManager.send(receiversList, receiversCcList, alert.getTitle(), alert.getContent(),
- alert.getShowType());
-
- //send flag
- boolean flag = false;
-
- if (retMaps == null) {
- retMaps = new HashMap<>();
- retMaps.put(Constants.MESSAGE, "alert send error.");
- retMaps.put(Constants.STATUS, "false");
- logger.info("alert send error : {}", retMaps.get(Constants.MESSAGE));
- return retMaps;
- }
-
- flag = Boolean.parseBoolean(String.valueOf(retMaps.get(Constants.STATUS)));
-
- if (flag) {
- logger.info("alert send success");
- retMaps.put(Constants.MESSAGE, "email send success.");
- if (EnterpriseWeChatUtils.isEnable()) {
- logger.info("Enterprise WeChat is enable!");
- try {
- String token = EnterpriseWeChatUtils.getToken();
- weChatManager.send(info, token);
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- if (DingTalkUtils.isEnableDingTalk) {
- logger.info("Ding Talk is enable.");
- dingTalkManager.send(info);
- }
-
- } else {
- retMaps.put(Constants.MESSAGE, "alert send error.");
- logger.info("alert send error : {}", retMaps.get(Constants.MESSAGE));
- }
-
- return retMaps;
- }
-
-}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index 1bae9c7..4714a76 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -14,23 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.runner;
-import org.apache.dolphinscheduler.alert.utils.Constants;
+import org.apache.dolphinscheduler.alert.plugin.AlertPluginManager;
import org.apache.dolphinscheduler.common.enums.AlertStatus;
-import org.apache.dolphinscheduler.common.plugin.PluginManager;
import org.apache.dolphinscheduler.dao.AlertDao;
+import org.apache.dolphinscheduler.dao.PluginDao;
import org.apache.dolphinscheduler.dao.entity.Alert;
-import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.plugin.api.AlertPlugin;
-import org.apache.dolphinscheduler.plugin.model.AlertData;
-import org.apache.dolphinscheduler.plugin.model.AlertInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
+import org.apache.dolphinscheduler.spi.alert.AlertChannel;
+import org.apache.dolphinscheduler.spi.alert.AlertData;
+import org.apache.dolphinscheduler.spi.alert.AlertInfo;
+import org.apache.dolphinscheduler.spi.alert.AlertResult;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* alert sender
@@ -41,57 +42,59 @@ public class AlertSender {
private List<Alert> alertList;
private AlertDao alertDao;
- private PluginManager pluginManager;
+ private PluginDao pluginDao;
+ private AlertPluginManager alertPluginManager;
- public AlertSender() {
+ public AlertSender(AlertPluginManager alertPluginManager) {
+ this.alertPluginManager = alertPluginManager;
}
- public AlertSender(List<Alert> alertList, AlertDao alertDao, PluginManager pluginManager) {
+ public AlertSender(List<Alert> alertList, AlertDao alertDao, AlertPluginManager alertPluginManager, PluginDao pluginDao) {
super();
this.alertList = alertList;
this.alertDao = alertDao;
- this.pluginManager = pluginManager;
+ this.pluginDao = pluginDao;
+ this.alertPluginManager = alertPluginManager;
}
public void run() {
- List<User> users;
- Map<String, Object> retMaps = null;
for (Alert alert : alertList) {
- users = alertDao.listUserByAlertgroupId(alert.getAlertGroupId());
-
- // receiving group list
- List<String> receiversList = new ArrayList<>();
- for (User user : users) {
- receiversList.add(user.getEmail());
- }
+ //get alert group from alert
+ int alertGroupId = alert.getAlertGroupId();
+ List<AlertPluginInstance> alertInstanceList = alertDao.listInstanceByAlertGroupId(alertGroupId);
AlertData alertData = new AlertData();
alertData.setId(alert.getId())
- .setAlertGroupId(alert.getAlertGroupId())
.setContent(alert.getContent())
.setLog(alert.getLog())
- .setReceivers(alert.getReceivers())
- .setReceiversCc(alert.getReceiversCc())
- .setShowType(alert.getShowType().getDescp())
.setTitle(alert.getTitle());
- AlertInfo alertInfo = new AlertInfo();
- alertInfo.setAlertData(alertData);
-
- alertInfo.addProp("receivers", receiversList);
-
- AlertPlugin emailPlugin = pluginManager.findOne(Constants.PLUGIN_DEFAULT_EMAIL_ID);
- retMaps = emailPlugin.process(alertInfo);
-
- if (retMaps == null) {
- alertDao.updateAlert(AlertStatus.EXECUTION_FAILURE, "alert send error", alert.getId());
- logger.error("alert send error : return value is null");
- } else if (!Boolean.parseBoolean(String.valueOf(retMaps.get(Constants.STATUS)))) {
- alertDao.updateAlert(AlertStatus.EXECUTION_FAILURE, String.valueOf(retMaps.get(Constants.MESSAGE)), alert.getId());
- logger.error("alert send error : {}", retMaps.get(Constants.MESSAGE));
- } else {
- alertDao.updateAlert(AlertStatus.EXECUTION_SUCCESS, (String) retMaps.get(Constants.MESSAGE), alert.getId());
- logger.info("alert send success");
+ for (AlertPluginInstance instance : alertInstanceList) {
+
+ String pluginName = pluginDao.getPluginDefineById(instance.getPluginDefineId()).getPluginName();
+ String pluginInstanceName = instance.getInstanceName();
+ AlertInfo alertInfo = new AlertInfo();
+ alertInfo.setAlertData(alertData);
+ alertInfo.setAlertParams(instance.getPluginInstanceParams());
+ AlertChannel alertChannel = alertPluginManager.getAlertChannelMap().get(pluginName);
+ if (alertChannel == null) {
+ alertDao.updateAlert(AlertStatus.EXECUTION_FAILURE, "Alert send error, not found plugin " + pluginName, alert.getId());
+ logger.error("Alert Plugin {} send error : not found plugin {}", pluginInstanceName, pluginName);
+ continue;
+ }
+
+ AlertResult alertResult = alertChannel.process(alertInfo);
+
+ if (alertResult == null) {
+ alertDao.updateAlert(AlertStatus.EXECUTION_FAILURE, "alert send error", alert.getId());
+ logger.info("Alert Plugin {} send error : return value is null", pluginInstanceName);
+ } else if (!Boolean.parseBoolean(String.valueOf(alertResult.getStatus()))) {
+ alertDao.updateAlert(AlertStatus.EXECUTION_FAILURE, String.valueOf(alertResult.getMessage()), alert.getId());
+ logger.info("Alert Plugin {} send error : {}", pluginInstanceName, alertResult.getMessage());
+ } else {
+ alertDao.updateAlert(AlertStatus.EXECUTION_SUCCESS, alertResult.getMessage(), alert.getId());
+ logger.info("Alert Plugin {} send success", pluginInstanceName);
+ }
}
}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java
index 465d9bf..de48828 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.utils;
/**
@@ -23,11 +24,15 @@ public class Constants {
private Constants() {
throw new IllegalStateException("Constants class");
}
+
/**
* alert properties path
*/
public static final String ALERT_PROPERTIES_PATH = "/alert.properties";
+ /** default alert plugin dir **/
+ public static final String ALERT_PLUGIN_PATH = "./lib/plugin/alert";
+
public static final String DATA_SOURCE_PROPERTIES_PATH = "/dao/data_source.properties";
public static final String SINGLE_SLASH = "/";
@@ -41,41 +46,7 @@ public class Constants {
public static final String MESSAGE = "message";
- public static final String MAIL_PROTOCOL = "mail.protocol";
-
- public static final String MAIL_SERVER_HOST = "mail.server.host";
-
- public static final String MAIL_SERVER_PORT = "mail.server.port";
-
- public static final String MAIL_SENDER = "mail.sender";
-
- public static final String MAIL_USER = "mail.user";
-
- public static final String MAIL_PASSWD = "mail.passwd";
-
- public static final String XLS_FILE_PATH = "xls.file.path";
-
- public static final String MAIL_HOST = "mail.smtp.host";
-
- public static final String MAIL_PORT = "mail.smtp.port";
-
- public static final String MAIL_SMTP_AUTH = "mail.smtp.auth";
-
- public static final String MAIL_TRANSPORT_PROTOCOL = "mail.transport.protocol";
-
- public static final String MAIL_SMTP_STARTTLS_ENABLE = "mail.smtp.starttls.enable";
-
- public static final String MAIL_SMTP_SSL_ENABLE = "mail.smtp.ssl.enable";
-
- public static final String MAIL_SMTP_SSL_TRUST="mail.smtp.ssl.trust";
-
- public static final String TEXT_HTML_CHARSET_UTF_8 = "text/html;charset=utf-8";
-
- public static final String STRING_TRUE = "true";
-
- public static final String EXCEL_SUFFIX_XLS = ".xls";
-
- public static final int NUMBER_1000 = 1000;
+
public static final String SPRING_DATASOURCE_DRIVER_CLASS_NAME = "spring.datasource.driver-class-name";
@@ -174,25 +145,11 @@ public class Constants {
public static final String DINGTALK_ENABLE = "dingtalk.isEnable";
- public static final String HTML_HEADER_PREFIX = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'><html><head><title>dolphinscheduler</title><meta name='Keywords' content=''><meta name='Description' content=''><style type=\"text/css\">table {margin-top:0px;padding-top:0px;border:1px solid;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;}table th {border-width: 1px;padding: 8px;border [...]
- public static final String TABLE_BODY_HTML_TAIL = "</table></body></html>";
/**
* plugin config
*/
- public static final String PLUGIN_DIR = "plugin.dir";
-
- public static final String PLUGIN_DEFAULT_EMAIL_ID = "email";
-
- public static final String PLUGIN_DEFAULT_EMAIL_CH = "邮件";
-
- public static final String PLUGIN_DEFAULT_EMAIL_EN = "email";
-
- public static final String PLUGIN_DEFAULT_EMAIL_RECEIVERS = "receivers";
-
- public static final String PLUGIN_DEFAULT_EMAIL_RECEIVERCCS = "receiverCcs";
-
- public static final String RETMAP_MSG = "msg";
+
}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtils.java
index 455d5de..abac8ae 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtils.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtils.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.utils;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.dolphinscheduler.common.utils.*;
import org.apache.commons.codec.binary.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
@@ -32,13 +33,14 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* DingTalkUtils utils
* support send msg to ding talk by robot message push function.
@@ -59,9 +61,10 @@ public class DingTalkUtils {
/**
* send message interface
* only support text message format now.
- * @param msg message context to send
+ *
+ * @param msg message context to send
* @param charset charset type
- * @return result of sending msg
+ * @return result of sending msg
* @throws IOException the IOException
*/
public static String sendDingTalkMsg(String msg, String charset) throws IOException {
@@ -89,20 +92,19 @@ public class DingTalkUtils {
}
logger.info("Ding Talk send [{}], resp:{%s}", msg, resp);
return resp;
- } finally {
+ } finally {
httpClient.close();
}
}
public static HttpPost constructHttpPost(String msg, String charset) {
- HttpPost post = new HttpPost(dingTaskUrl);
+ HttpPost post = new HttpPost(dingTaskUrl);
StringEntity entity = new StringEntity(msg, charset);
post.setEntity(entity);
post.addHeader("Content-Type", "application/json; charset=utf-8");
return post;
}
-
public static CloseableHttpClient getProxyClient() {
HttpHost httpProxy = new HttpHost(proxy, port);
CredentialsProvider provider = new BasicCredentialsProvider();
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
index ef10227..17a49e3 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
@@ -17,10 +17,12 @@
package org.apache.dolphinscheduler.alert.utils;
-import org.apache.dolphinscheduler.common.enums.ShowType;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.apache.dolphinscheduler.plugin.model.AlertData;
+import org.apache.dolphinscheduler.spi.alert.AlertConstants;
+import org.apache.dolphinscheduler.spi.alert.AlertInfo;
+import org.apache.dolphinscheduler.spi.alert.ShowType;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -119,7 +121,7 @@ public class EnterpriseWeChatUtils {
*
* @param toParty the toParty
* @param agentId the agentId
- * @param msg the msg
+ * @param msg the msg
* @return Enterprise WeChat send message
*/
public static String makeTeamSendMsg(String toParty, String agentId, String msg) {
@@ -133,7 +135,7 @@ public class EnterpriseWeChatUtils {
*
* @param toParty the toParty
* @param agentId the agentId
- * @param msg the msg
+ * @param msg the msg
* @return Enterprise WeChat send message
*/
public static String makeTeamSendMsg(Collection<String> toParty, String agentId, String msg) {
@@ -146,9 +148,9 @@ public class EnterpriseWeChatUtils {
/**
* make team single user message
*
- * @param toUser the toUser
+ * @param toUser the toUser
* @param agentId the agentId
- * @param msg the msg
+ * @param msg the msg
* @return Enterprise WeChat send message
*/
public static String makeUserSendMsg(String toUser, String agentId, String msg) {
@@ -160,9 +162,9 @@ public class EnterpriseWeChatUtils {
/**
* make team multi user message
*
- * @param toUser the toUser
+ * @param toUser the toUser
* @param agentId the agentId
- * @param msg the msg
+ * @param msg the msg
* @return Enterprise WeChat send message
*/
public static String makeUserSendMsg(Collection<String> toUser, String agentId, String msg) {
@@ -176,8 +178,8 @@ public class EnterpriseWeChatUtils {
* send Enterprise WeChat
*
* @param charset the charset
- * @param data the data
- * @param token the token
+ * @param data the data
+ * @param token the token
* @return Enterprise WeChat resp, demo: {"errcode":0,"errmsg":"ok","invaliduser":""}
* @throws IOException the IOException
*/
@@ -208,7 +210,7 @@ public class EnterpriseWeChatUtils {
/**
* convert table to markdown style
*
- * @param title the title
+ * @param title the title
* @param content the content
* @return markdown table content
*/
@@ -238,7 +240,7 @@ public class EnterpriseWeChatUtils {
/**
* convert text to markdown style
*
- * @param title the title
+ * @param title the title
* @param content the content
* @return markdown text
*/
@@ -272,12 +274,14 @@ public class EnterpriseWeChatUtils {
*
* @return the markdown alert table/text
*/
- public static String markdownByAlert(AlertData alert) {
+ public static String markdownByAlert(AlertInfo alertInfo) {
String result = "";
- if (alert.getShowType().equals(ShowType.TABLE.getDescp())) {
- result = markdownTable(alert.getTitle(), alert.getContent());
- } else if (alert.getShowType().equals(ShowType.TEXT.getDescp())) {
- result = markdownText(alert.getTitle(), alert.getContent());
+ Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertInfo.getAlertParams());
+ String showType = paramsMap.get(AlertConstants.SHOW_TYPE);
+ if (showType.equals(ShowType.TABLE.getDescp())) {
+ result = markdownTable(alertInfo.getAlertData().getTitle(), alertInfo.getAlertData().getContent());
+ } else if (showType.equals(ShowType.TEXT.getDescp())) {
+ result = markdownText(alertInfo.getAlertData().getTitle(), alertInfo.getAlertData().getContent());
}
return result;
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java
deleted file mode 100644
index 0825686..0000000
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.alert.utils;
-
-import org.apache.dolphinscheduler.common.utils.CollectionUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.*;
-import org.apache.dolphinscheduler.common.utils.*;
-
-/**
- * excel utils
- */
-public class ExcelUtils {
-
- private static final Logger logger = LoggerFactory.getLogger(ExcelUtils.class);
- /**
- * generate excel file
- * @param content the content
- * @param title the title
- * @param xlsFilePath the xls path
- */
- public static void genExcelFile(String content,String title,String xlsFilePath){
- List<LinkedHashMap> itemsList;
-
- //The JSONUtils.toList has been try catch ex
- itemsList = JSONUtils.toList(content, LinkedHashMap.class);
-
- if (CollectionUtils.isEmpty(itemsList)){
- logger.error("itemsList is null");
- throw new RuntimeException("itemsList is null");
- }
-
- LinkedHashMap<String, Object> headerMap = itemsList.get(0);
-
- List<String> headerList = new ArrayList<>();
-
- Iterator<Map.Entry<String, Object>> iter = headerMap.entrySet().iterator();
- while (iter.hasNext()){
- Map.Entry<String, Object> en = iter.next();
- headerList.add(en.getKey());
- }
-
- HSSFWorkbook wb = null;
- FileOutputStream fos = null;
- try {
- // declare a workbook
- wb = new HSSFWorkbook();
- // generate a table
- HSSFSheet sheet = wb.createSheet();
- HSSFRow row = sheet.createRow(0);
- //set the height of the first line
- row.setHeight((short)500);
-
- //set Horizontal right
- CellStyle cellStyle = wb.createCellStyle();
- cellStyle.setAlignment(HorizontalAlignment.RIGHT);
-
- //setting excel headers
- for (int i = 0; i < headerList.size(); i++) {
- HSSFCell cell = row.createCell(i);
- cell.setCellStyle(cellStyle);
- cell.setCellValue(headerList.get(i));
- }
-
- //setting excel body
- int rowIndex = 1;
- for (LinkedHashMap<String, Object> itemsMap : itemsList){
- Object[] values = itemsMap.values().toArray();
- row = sheet.createRow(rowIndex);
- //setting excel body height
- row.setHeight((short)500);
- rowIndex++;
- for (int j = 0 ; j < values.length ; j++){
- HSSFCell cell1 = row.createCell(j);
- cell1.setCellStyle(cellStyle);
- cell1.setCellValue(String.valueOf(values[j]));
- }
- }
-
- for (int i = 0; i < headerList.size(); i++) {
- sheet.setColumnWidth(i, headerList.get(i).length() * 800);
- }
-
- File file = new File(xlsFilePath);
- if (!file.exists()) {
- file.mkdirs();
- }
-
- //setting file output
- fos = new FileOutputStream(xlsFilePath + Constants.SINGLE_SLASH + title + Constants.EXCEL_SUFFIX_XLS);
-
- wb.write(fos);
-
- }catch (Exception e){
- logger.error("generate excel error",e);
- throw new RuntimeException("generate excel error",e);
- }finally {
- if (wb != null){
- try {
- wb.close();
- } catch (IOException e) {
- logger.error(e.getMessage(),e);
- }
- }
- if (fos != null){
- try {
- fos.close();
- } catch (IOException e) {
- logger.error(e.getMessage(),e);
- }
- }
- }
- }
-
-}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java
index d68532a..5d28742 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.utils;
import org.apache.dolphinscheduler.common.utils.StringUtils;
@@ -22,7 +23,7 @@ public class FuncUtils {
public static String mkString(Iterable<String> list, String split) {
- if (null == list || StringUtils.isEmpty(split)){
+ if (null == list || StringUtils.isEmpty(split)) {
return null;
}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java
index 888c9db..1132b17 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java
@@ -1,352 +1,352 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.alert.utils;
-
-import org.apache.dolphinscheduler.alert.template.AlertTemplate;
-import org.apache.dolphinscheduler.alert.template.AlertTemplateFactory;
-import org.apache.dolphinscheduler.common.enums.ShowType;
-import org.apache.commons.mail.EmailException;
-import org.apache.commons.mail.HtmlEmail;
-import org.apache.dolphinscheduler.common.utils.CollectionUtils;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.mail.*;
-import javax.mail.internet.*;
-import java.io.*;
-import java.util.*;
-
-
-/**
- * mail utils
- */
-public class MailUtils {
-
- public static final Logger logger = LoggerFactory.getLogger(MailUtils.class);
-
- public static final String MAIL_PROTOCOL = PropertyUtils.getString(Constants.MAIL_PROTOCOL);
-
- public static final String MAIL_SERVER_HOST = PropertyUtils.getString(Constants.MAIL_SERVER_HOST);
-
- public static final Integer MAIL_SERVER_PORT = PropertyUtils.getInt(Constants.MAIL_SERVER_PORT);
-
- public static final String MAIL_SENDER = PropertyUtils.getString(Constants.MAIL_SENDER);
-
- public static final String MAIL_USER = PropertyUtils.getString(Constants.MAIL_USER);
-
- public static final String MAIL_PASSWD = PropertyUtils.getString(Constants.MAIL_PASSWD);
-
- public static final Boolean MAIL_USE_START_TLS = PropertyUtils.getBoolean(Constants.MAIL_SMTP_STARTTLS_ENABLE);
-
- public static final Boolean MAIL_USE_SSL = PropertyUtils.getBoolean(Constants.MAIL_SMTP_SSL_ENABLE);
-
- public static final String xlsFilePath = PropertyUtils.getString(Constants.XLS_FILE_PATH,"/tmp/xls");
-
- public static final String STARTTLS_ENABLE = PropertyUtils.getString(Constants.MAIL_SMTP_STARTTLS_ENABLE);
-
- public static final Boolean SSL_ENABLE = PropertyUtils.getBoolean(Constants.MAIL_SMTP_SSL_ENABLE);
-
- public static final String SSL_TRUST = PropertyUtils.getString(Constants.MAIL_SMTP_SSL_TRUST);
-
- public static final AlertTemplate alertTemplate = AlertTemplateFactory.getMessageTemplate();
-
- //Solve the problem of messy Chinese name in excel attachment
- static {
- System.setProperty("mail.mime.splitlongparameters","false");
- }
-
- /**
- * send mail to receivers
- * @param receivers the receiver list
- * @param title the title
- * @param content the content
- * @param showType the show type
- * @return the result map
- */
- public static Map<String,Object> sendMails(Collection<String> receivers, String title, String content,String showType) {
- return sendMails(receivers, null, title, content, showType);
- }
-
- /**
- * send mail
- * @param receivers the receiver list
- * @param receiversCc cc list
- * @param title the title
- * @param content the content
- * @param showType the show type
- * @return the send result
- */
- public static Map<String,Object> sendMails(Collection<String> receivers, Collection<String> receiversCc, String title, String content, String showType) {
- Map<String,Object> retMap = new HashMap<>();
- retMap.put(Constants.STATUS, false);
-
- // if there is no receivers && no receiversCc, no need to process
- if (CollectionUtils.isEmpty(receivers) && CollectionUtils.isEmpty(receiversCc)) {
- return retMap;
- }
-
- receivers.removeIf(StringUtils::isEmpty);
-
- if (showType.equals(ShowType.TABLE.getDescp()) || showType.equals(ShowType.TEXT.getDescp())) {
- // send email
- HtmlEmail email = new HtmlEmail();
-
- try {
- Session session = getSession();
- email.setMailSession(session);
- email.setFrom(MAIL_SENDER);
- email.setCharset(Constants.UTF_8);
- if (CollectionUtils.isNotEmpty(receivers)){
- // receivers mail
- for (String receiver : receivers) {
- email.addTo(receiver);
- }
- }
-
- if (CollectionUtils.isNotEmpty(receiversCc)){
- //cc
- for (String receiverCc : receiversCc) {
- email.addCc(receiverCc);
- }
- }
- // sender mail
- return getStringObjectMap(title, content, showType, retMap, email);
- } catch (Exception e) {
- handleException(receivers, retMap, e);
- }
- }else if (showType.equals(ShowType.ATTACHMENT.getDescp()) || showType.equals(ShowType.TABLEATTACHMENT.getDescp())) {
- try {
-
- String partContent = (showType.equals(ShowType.ATTACHMENT.getDescp()) ? "Please see the attachment " + title + Constants.EXCEL_SUFFIX_XLS : htmlTable(content,false));
-
- attachment(receivers,receiversCc,title,content,partContent);
-
- retMap.put(Constants.STATUS, true);
- return retMap;
- }catch (Exception e){
- handleException(receivers, retMap, e);
- return retMap;
- }
- }
- return retMap;
-
- }
-
- /**
- * html table content
- * @param content the content
- * @param showAll if show the whole content
- * @return the html table form
- */
- private static String htmlTable(String content, boolean showAll){
- return alertTemplate.getMessageFromTemplate(content,ShowType.TABLE,showAll);
- }
-
- /**
- * html table content
- * @param content the content
- * @return the html table form
- */
- private static String htmlTable(String content){
- return htmlTable(content,true);
- }
-
- /**
- * html text content
- * @param content the content
- * @return text in html form
- */
- private static String htmlText(String content){
- return alertTemplate.getMessageFromTemplate(content,ShowType.TEXT);
- }
-
- /**
- * send mail as Excel attachment
- * @param receivers the receiver list
- * @param title the title
- * @throws Exception
- */
- private static void attachment(Collection<String> receivers,Collection<String> receiversCc,String title,String content,String partContent)throws Exception{
- MimeMessage msg = getMimeMessage(receivers);
-
- attachContent(receiversCc, title, content,partContent, msg);
- }
-
- /**
- * get MimeMessage
- * @param receivers receivers
- * @return the MimeMessage
- * @throws MessagingException
- */
- private static MimeMessage getMimeMessage(Collection<String> receivers) throws MessagingException {
-
- // 1. The first step in creating mail: creating session
- Session session = getSession();
- // Setting debug mode, can be turned off
- session.setDebug(false);
-
- // 2. creating mail: Creating a MimeMessage
- MimeMessage msg = new MimeMessage(session);
- // 3. set sender
- msg.setFrom(new InternetAddress(MAIL_SENDER));
- // 4. set receivers
- for (String receiver : receivers) {
- msg.addRecipients(Message.RecipientType.TO, InternetAddress.parse(receiver));
- }
- return msg;
- }
-
- /**
- * get session
- *
- * @return the new Session
- */
- private static Session getSession() {
- Properties props = new Properties();
- props.setProperty(Constants.MAIL_HOST, MAIL_SERVER_HOST);
- props.setProperty(Constants.MAIL_PORT, String.valueOf(MAIL_SERVER_PORT));
- props.setProperty(Constants.MAIL_SMTP_AUTH, Constants.STRING_TRUE);
- props.setProperty(Constants.MAIL_TRANSPORT_PROTOCOL, MAIL_PROTOCOL);
- props.setProperty(Constants.MAIL_SMTP_STARTTLS_ENABLE, STARTTLS_ENABLE);
- if (SSL_ENABLE) {
- props.setProperty(Constants.MAIL_SMTP_SSL_ENABLE, "true");
- props.setProperty(Constants.MAIL_SMTP_SSL_TRUST, SSL_TRUST);
- }
-
- Authenticator auth = new Authenticator() {
- @Override
- protected PasswordAuthentication getPasswordAuthentication() {
- // mail username and password
- return new PasswordAuthentication(MAIL_USER, MAIL_PASSWD);
- }
- };
-
- return Session.getInstance(props, auth);
- }
-
- /**
- * attach content
- * @param receiversCc the cc list
- * @param title the title
- * @param content the content
- * @param partContent the partContent
- * @param msg the message
- * @throws MessagingException
- * @throws IOException
- */
- private static void attachContent(Collection<String> receiversCc, String title, String content, String partContent,MimeMessage msg) throws MessagingException, IOException {
- /**
- * set receiverCc
- */
- if(CollectionUtils.isNotEmpty(receiversCc)){
- for (String receiverCc : receiversCc){
- msg.addRecipients(Message.RecipientType.CC, InternetAddress.parse(receiverCc));
- }
- }
-
- // set subject
- msg.setSubject(title);
- MimeMultipart partList = new MimeMultipart();
- // set signature
- MimeBodyPart part1 = new MimeBodyPart();
- part1.setContent(partContent, Constants.TEXT_HTML_CHARSET_UTF_8);
- // set attach file
- MimeBodyPart part2 = new MimeBodyPart();
- File file = new File(xlsFilePath + Constants.SINGLE_SLASH + title + Constants.EXCEL_SUFFIX_XLS);
- if (!file.getParentFile().exists()) {
- file.getParentFile().mkdirs();
- }
- // make excel file
-
- ExcelUtils.genExcelFile(content,title,xlsFilePath);
-
- part2.attachFile(file);
- part2.setFileName(MimeUtility.encodeText(title + Constants.EXCEL_SUFFIX_XLS,Constants.UTF_8,"B"));
- // add components to collection
- partList.addBodyPart(part1);
- partList.addBodyPart(part2);
- msg.setContent(partList);
- // 5. send Transport
- Transport.send(msg);
- // 6. delete saved file
- deleteFile(file);
- }
-
- /**
- * the string object map
- * @param title the title
- * @param content the content
- * @param showType the showType
- * @param retMap the result map
- * @param email the email
- * @return the result map
- * @throws EmailException
- */
- private static Map<String, Object> getStringObjectMap(String title, String content, String showType, Map<String, Object> retMap, HtmlEmail email) throws EmailException {
-
- /**
- * the subject of the message to be sent
- */
- email.setSubject(title);
- /**
- * to send information, you can use HTML tags in mail content because of the use of HtmlEmail
- */
- if (showType.equals(ShowType.TABLE.getDescp())) {
- email.setMsg(htmlTable(content));
- } else if (showType.equals(ShowType.TEXT.getDescp())) {
- email.setMsg(htmlText(content));
- }
-
- // send
- email.send();
-
- retMap.put(Constants.STATUS, true);
-
- return retMap;
- }
-
- /**
- * file delete
- * @param file the file to delete
- */
- public static void deleteFile(File file){
- if(file.exists()){
- if(file.delete()){
- logger.info("delete success: {}",file.getAbsolutePath() + file.getName());
- }else{
- logger.info("delete fail: {}", file.getAbsolutePath() + file.getName());
- }
- }else{
- logger.info("file not exists: {}", file.getAbsolutePath() + file.getName());
- }
- }
-
-
- /**
- * handle exception
- * @param receivers the receiver list
- * @param retMap the result map
- * @param e the exception
- */
- private static void handleException(Collection<String> receivers, Map<String, Object> retMap, Exception e) {
- logger.error("Send email to {} failed", receivers, e);
- retMap.put(Constants.MESSAGE, "Send email to {" + String.join(",", receivers) + "} failed，" + e.toString());
- }
-
-
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one or more
+// * contributor license agreements. See the NOTICE file distributed with
+// * this work for additional information regarding copyright ownership.
+// * The ASF licenses this file to You under the Apache License, Version 2.0
+// * (the "License"); you may not use this file except in compliance with
+// * the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//package org.apache.dolphinscheduler.alert.utils;
+//
+//import org.apache.dolphinscheduler.alert.template.AlertTemplate;
+//import org.apache.dolphinscheduler.alert.template.AlertTemplateFactory;
+//import org.apache.dolphinscheduler.common.enums.ShowType;
+//import org.apache.commons.mail.EmailException;
+//import org.apache.commons.mail.HtmlEmail;
+//import org.apache.dolphinscheduler.common.utils.CollectionUtils;
+//import org.apache.dolphinscheduler.common.utils.StringUtils;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import javax.mail.*;
+//import javax.mail.internet.*;
+//import java.io.*;
+//import java.util.*;
+//
+//
+///**
+// * mail utils
+// */
+//public class MailUtils {
+//
+// public static final Logger logger = LoggerFactory.getLogger(MailUtils.class);
+//
+// public static final String MAIL_PROTOCOL = PropertyUtils.getString(Constants.MAIL_PROTOCOL);
+//
+// public static final String MAIL_SERVER_HOST = PropertyUtils.getString(Constants.MAIL_SERVER_HOST);
+//
+// public static final Integer MAIL_SERVER_PORT = PropertyUtils.getInt(Constants.MAIL_SERVER_PORT);
+//
+// public static final String MAIL_SENDER = PropertyUtils.getString(Constants.MAIL_SENDER);
+//
+// public static final String MAIL_USER = PropertyUtils.getString(Constants.MAIL_USER);
+//
+// public static final String MAIL_PASSWD = PropertyUtils.getString(Constants.MAIL_PASSWD);
+//
+// public static final Boolean MAIL_USE_START_TLS = PropertyUtils.getBoolean(Constants.MAIL_SMTP_STARTTLS_ENABLE);
+//
+// public static final Boolean MAIL_USE_SSL = PropertyUtils.getBoolean(Constants.MAIL_SMTP_SSL_ENABLE);
+//
+// public static final String xlsFilePath = PropertyUtils.getString(Constants.XLS_FILE_PATH,"/tmp/xls");
+//
+// public static final String STARTTLS_ENABLE = PropertyUtils.getString(Constants.MAIL_SMTP_STARTTLS_ENABLE);
+//
+// public static final Boolean SSL_ENABLE = PropertyUtils.getBoolean(Constants.MAIL_SMTP_SSL_ENABLE);
+//
+// public static final String SSL_TRUST = PropertyUtils.getString(Constants.MAIL_SMTP_SSL_TRUST);
+//
+// public static final AlertTemplate alertTemplate = AlertTemplateFactory.getMessageTemplate();
+//
+// //Solve the problem of messy Chinese name in excel attachment
+// static {
+// System.setProperty("mail.mime.splitlongparameters","false");
+// }
+//
+// /**
+// * send mail to receivers
+// * @param receivers the receiver list
+// * @param title the title
+// * @param content the content
+// * @param showType the show type
+// * @return the result map
+// */
+// public static Map<String,Object> sendMails(Collection<String> receivers, String title, String content,String showType) {
+// return sendMails(receivers, null, title, content, showType);
+// }
+//
+// /**
+// * send mail
+// * @param receivers the receiver list
+// * @param receiversCc cc list
+// * @param title the title
+// * @param content the content
+// * @param showType the show type
+// * @return the send result
+// */
+// public static Map<String,Object> sendMails(Collection<String> receivers, Collection<String> receiversCc, String title, String content, String showType) {
+// Map<String,Object> retMap = new HashMap<>();
+// retMap.put(Constants.STATUS, false);
+//
+// // if there is no receivers && no receiversCc, no need to process
+// if (CollectionUtils.isEmpty(receivers) && CollectionUtils.isEmpty(receiversCc)) {
+// return retMap;
+// }
+//
+// receivers.removeIf(StringUtils::isEmpty);
+//
+// if (showType.equals(ShowType.TABLE.getDescp()) || showType.equals(ShowType.TEXT.getDescp())) {
+// // send email
+// HtmlEmail email = new HtmlEmail();
+//
+// try {
+// Session session = getSession();
+// email.setMailSession(session);
+// email.setFrom(MAIL_SENDER);
+// email.setCharset(Constants.UTF_8);
+// if (CollectionUtils.isNotEmpty(receivers)){
+// // receivers mail
+// for (String receiver : receivers) {
+// email.addTo(receiver);
+// }
+// }
+//
+// if (CollectionUtils.isNotEmpty(receiversCc)){
+// //cc
+// for (String receiverCc : receiversCc) {
+// email.addCc(receiverCc);
+// }
+// }
+// // sender mail
+// return getStringObjectMap(title, content, showType, retMap, email);
+// } catch (Exception e) {
+// handleException(receivers, retMap, e);
+// }
+// }else if (showType.equals(ShowType.ATTACHMENT.getDescp()) || showType.equals(ShowType.TABLEATTACHMENT.getDescp())) {
+// try {
+//
+// String partContent = (showType.equals(ShowType.ATTACHMENT.getDescp()) ? "Please see the attachment " + title + Constants.EXCEL_SUFFIX_XLS : htmlTable(content,false));
+//
+// attachment(receivers,receiversCc,title,content,partContent);
+//
+// retMap.put(Constants.STATUS, true);
+// return retMap;
+// }catch (Exception e){
+// handleException(receivers, retMap, e);
+// return retMap;
+// }
+// }
+// return retMap;
+//
+// }
+//
+// /**
+// * html table content
+// * @param content the content
+// * @param showAll if show the whole content
+// * @return the html table form
+// */
+// private static String htmlTable(String content, boolean showAll){
+// return alertTemplate.getMessageFromTemplate(content,ShowType.TABLE,showAll);
+// }
+//
+// /**
+// * html table content
+// * @param content the content
+// * @return the html table form
+// */
+// private static String htmlTable(String content){
+// return htmlTable(content,true);
+// }
+//
+// /**
+// * html text content
+// * @param content the content
+// * @return text in html form
+// */
+// private static String htmlText(String content){
+// return alertTemplate.getMessageFromTemplate(content,ShowType.TEXT);
+// }
+//
+// /**
+// * send mail as Excel attachment
+// * @param receivers the receiver list
+// * @param title the title
+// * @throws Exception
+// */
+// private static void attachment(Collection<String> receivers,Collection<String> receiversCc,String title,String content,String partContent)throws Exception{
+// MimeMessage msg = getMimeMessage(receivers);
+//
+// attachContent(receiversCc, title, content,partContent, msg);
+// }
+//
+// /**
+// * get MimeMessage
+// * @param receivers receivers
+// * @return the MimeMessage
+// * @throws MessagingException
+// */
+// private static MimeMessage getMimeMessage(Collection<String> receivers) throws MessagingException {
+//
+// // 1. The first step in creating mail: creating session
+// Session session = getSession();
+// // Setting debug mode, can be turned off
+// session.setDebug(false);
+//
+// // 2. creating mail: Creating a MimeMessage
+// MimeMessage msg = new MimeMessage(session);
+// // 3. set sender
+// msg.setFrom(new InternetAddress(MAIL_SENDER));
+// // 4. set receivers
+// for (String receiver : receivers) {
+// msg.addRecipients(Message.RecipientType.TO, InternetAddress.parse(receiver));
+// }
+// return msg;
+// }
+//
+// /**
+// * get session
+// *
+// * @return the new Session
+// */
+// private static Session getSession() {
+// Properties props = new Properties();
+// props.setProperty(Constants.MAIL_HOST, MAIL_SERVER_HOST);
+// props.setProperty(Constants.MAIL_PORT, String.valueOf(MAIL_SERVER_PORT));
+// props.setProperty(Constants.MAIL_SMTP_AUTH, Constants.STRING_TRUE);
+// props.setProperty(Constants.MAIL_TRANSPORT_PROTOCOL, MAIL_PROTOCOL);
+// props.setProperty(Constants.MAIL_SMTP_STARTTLS_ENABLE, STARTTLS_ENABLE);
+// if (SSL_ENABLE) {
+// props.setProperty(Constants.MAIL_SMTP_SSL_ENABLE, "true");
+// props.setProperty(Constants.MAIL_SMTP_SSL_TRUST, SSL_TRUST);
+// }
+//
+// Authenticator auth = new Authenticator() {
+// @Override
+// protected PasswordAuthentication getPasswordAuthentication() {
+// // mail username and password
+// return new PasswordAuthentication(MAIL_USER, MAIL_PASSWD);
+// }
+// };
+//
+// return Session.getInstance(props, auth);
+// }
+//
+// /**
+// * attach content
+// * @param receiversCc the cc list
+// * @param title the title
+// * @param content the content
+// * @param partContent the partContent
+// * @param msg the message
+// * @throws MessagingException
+// * @throws IOException
+// */
+// private static void attachContent(Collection<String> receiversCc, String title, String content, String partContent,MimeMessage msg) throws MessagingException, IOException {
+// /**
+// * set receiverCc
+// */
+// if(CollectionUtils.isNotEmpty(receiversCc)){
+// for (String receiverCc : receiversCc){
+// msg.addRecipients(Message.RecipientType.CC, InternetAddress.parse(receiverCc));
+// }
+// }
+//
+// // set subject
+// msg.setSubject(title);
+// MimeMultipart partList = new MimeMultipart();
+// // set signature
+// MimeBodyPart part1 = new MimeBodyPart();
+// part1.setContent(partContent, Constants.TEXT_HTML_CHARSET_UTF_8);
+// // set attach file
+// MimeBodyPart part2 = new MimeBodyPart();
+// File file = new File(xlsFilePath + Constants.SINGLE_SLASH + title + Constants.EXCEL_SUFFIX_XLS);
+// if (!file.getParentFile().exists()) {
+// file.getParentFile().mkdirs();
+// }
+// // make excel file
+//
+// ExcelUtils.genExcelFile(content,title,xlsFilePath);
+//
+// part2.attachFile(file);
+// part2.setFileName(MimeUtility.encodeText(title + Constants.EXCEL_SUFFIX_XLS,Constants.UTF_8,"B"));
+// // add components to collection
+// partList.addBodyPart(part1);
+// partList.addBodyPart(part2);
+// msg.setContent(partList);
+// // 5. send Transport
+// Transport.send(msg);
+// // 6. delete saved file
+// deleteFile(file);
+// }
+//
+// /**
+// * the string object map
+// * @param title the title
+// * @param content the content
+// * @param showType the showType
+// * @param retMap the result map
+// * @param email the email
+// * @return the result map
+// * @throws EmailException
+// */
+// private static Map<String, Object> getStringObjectMap(String title, String content, String showType, Map<String, Object> retMap, HtmlEmail email) throws EmailException {
+//
+// /**
+// * the subject of the message to be sent
+// */
+// email.setSubject(title);
+// /**
+// * to send information, you can use HTML tags in mail content because of the use of HtmlEmail
+// */
+// if (showType.equals(ShowType.TABLE.getDescp())) {
+// email.setMsg(htmlTable(content));
+// } else if (showType.equals(ShowType.TEXT.getDescp())) {
+// email.setMsg(htmlText(content));
+// }
+//
+// // send
+// email.send();
+//
+// retMap.put(Constants.STATUS, true);
+//
+// return retMap;
+// }
+//
+// /**
+// * file delete
+// * @param file the file to delete
+// */
+// public static void deleteFile(File file){
+// if(file.exists()){
+// if(file.delete()){
+// logger.info("delete success: {}",file.getAbsolutePath() + file.getName());
+// }else{
+// logger.info("delete fail: {}", file.getAbsolutePath() + file.getName());
+// }
+// }else{
+// logger.info("file not exists: {}", file.getAbsolutePath() + file.getName());
+// }
+// }
+//
+//
+// /**
+// * handle exception
+// * @param receivers the receiver list
+// * @param retMap the result map
+// * @param e the exception
+// */
+// private static void handleException(Collection<String> receivers, Map<String, Object> retMap, Exception e) {
+// logger.error("Send email to {} failed", receivers, e);
+// retMap.put(Constants.MESSAGE, "Send email to {" + String.join(",", receivers) + "} failed，" + e.toString());
+// }
+//
+//
+//}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java
index 91f7261..1f78ced 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java
@@ -14,19 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.utils;
+import static org.apache.dolphinscheduler.alert.utils.Constants.ALERT_PROPERTIES_PATH;
+
import org.apache.dolphinscheduler.common.utils.IOUtils;
import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import java.util.regex.PatternSyntaxException;
-import static org.apache.dolphinscheduler.alert.utils.Constants.ALERT_PROPERTIES_PATH;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* property utils
@@ -43,11 +45,11 @@ public class PropertyUtils {
private static final PropertyUtils propertyUtils = new PropertyUtils();
- private PropertyUtils(){
+ private PropertyUtils() {
init();
}
- private void init(){
+ private void init() {
String[] propertyFiles = new String[]{ALERT_PROPERTIES_PATH};
for (String fileName : propertyFiles) {
InputStream fis = null;
@@ -69,6 +71,7 @@ public class PropertyUtils {
/**
* get property value
+ *
* @param key property name
* @return the value
*/
@@ -82,7 +85,7 @@ public class PropertyUtils {
/**
* get property value
*
- * @param key property name
+ * @param key property name
* @param defaultVal default value
* @return property value
*/
@@ -95,7 +98,7 @@ public class PropertyUtils {
* get property value
*
* @param key property name
- * @return get property int value , if key == null, then return -1
+ * @return get property int value , if key == null, then return -1
*/
public static int getInt(String key) {
@@ -104,7 +107,8 @@ public class PropertyUtils {
/**
* get int value
- * @param key the key
+ *
+ * @param key the key
* @param defaultValue the default value
* @return the value related the key or the default value if the key not existed
*/
@@ -117,15 +121,16 @@ public class PropertyUtils {
try {
return Integer.parseInt(value);
} catch (NumberFormatException e) {
- logger.info(e.getMessage(),e);
+ logger.info(e.getMessage(), e);
}
return defaultValue;
}
/**
* get property value
+ *
* @param key property name
- * @return the boolean result value
+ * @return the boolean result value
*/
public static Boolean getBoolean(String key) {
@@ -134,7 +139,7 @@ public class PropertyUtils {
}
String value = properties.getProperty(key.trim());
- if(null != value){
+ if (null != value) {
return Boolean.parseBoolean(value);
}
@@ -143,16 +148,18 @@ public class PropertyUtils {
/**
* get long value
+ *
* @param key the key
* @return if the value not existed, return -1, or will return the related value
*/
public static long getLong(String key) {
- return getLong(key,-1);
+ return getLong(key, -1);
}
/**
* get long value
- * @param key the key
+ *
+ * @param key the key
* @param defaultVal the default value
* @return the value related the key or the default value if the key not existed
*/
@@ -166,7 +173,7 @@ public class PropertyUtils {
try {
return Long.parseLong(val);
} catch (NumberFormatException e) {
- logger.info(e.getMessage(),e);
+ logger.info(e.getMessage(), e);
}
return defaultVal;
@@ -174,17 +181,19 @@ public class PropertyUtils {
/**
* get double value
+ *
* @param key the key
* @return if the value not existed, return -1.0, or will return the related value
*/
public static double getDouble(String key) {
String val = getString(key);
- return getDouble(key,-1.0);
+ return getDouble(key, -1.0);
}
/**
* get double value
- * @param key the key
+ *
+ * @param key the key
* @param defaultVal the default value
* @return the value related the key or the default value if the key not existed
*/
@@ -198,17 +207,17 @@ public class PropertyUtils {
try {
return Double.parseDouble(val);
} catch (NumberFormatException e) {
- logger.info(e.getMessage(),e);
+ logger.info(e.getMessage(), e);
}
return defaultVal;
}
-
/**
- * get array
- * @param key property name
- * @param splitStr separator
+ * get array
+ *
+ * @param key property name
+ * @param splitStr separator
* @return the result array
*/
public static String[] getArray(String key, String splitStr) {
@@ -219,21 +228,22 @@ public class PropertyUtils {
try {
return value.split(splitStr);
} catch (PatternSyntaxException e) {
- logger.info(e.getMessage(),e);
+ logger.info(e.getMessage(), e);
}
return null;
}
/**
* get enum
- * @param key the key
- * @param type the class type
+ *
+ * @param key the key
+ * @param type the class type
* @param defaultValue the default value
- * @param <T> the generic class type
- * @return get enum value
+ * @param <T> the generic class type
+ * @return get enum value
*/
public static <T extends Enum<T>> T getEnum(String key, Class<T> type,
- T defaultValue) {
+ T defaultValue) {
String val = getString(key);
if (val == null) {
return defaultValue;
@@ -242,7 +252,7 @@ public class PropertyUtils {
try {
return Enum.valueOf(type, val);
} catch (IllegalArgumentException e) {
- logger.info(e.getMessage(),e);
+ logger.info(e.getMessage(), e);
}
return defaultValue;
diff --git a/dolphinscheduler-alert/src/main/resources/alert.properties b/dolphinscheduler-alert/src/main/resources/alert.properties
index 6eb7018..46827e4 100644
--- a/dolphinscheduler-alert/src/main/resources/alert.properties
+++ b/dolphinscheduler-alert/src/main/resources/alert.properties
@@ -15,46 +15,19 @@
# limitations under the License.
#
-#alert type is EMAIL/SMS
-alert.type=EMAIL
+#This configuration file configures the configuration parameters related to the AlertServer.
+#These parameters are only related to the AlertServer, and it has nothing to do with the specific Alert Plugin.
+#eg : max retry num.
+#eg : Alert Server Listener port
-# mail server configuration
-mail.protocol=SMTP
-mail.server.host=xxx.xxx.com
-mail.server.port=25
-mail.sender=xxx@xxx.com
-mail.user=xxx@xxx.com
-mail.passwd=111111
-# TLS
-mail.smtp.starttls.enable=true
-# SSL
-mail.smtp.ssl.enable=false
-mail.smtp.ssl.trust=xxx.xxx.com
+#alert.plugin.dir config the Alert Plugin dir . AlertServer while find and load the Alert Plugin Jar from this dir when deploy and start AlertServer on the server .
+#eg :
+#alert.plugin.dir=/root/dolphinscheduler/lib/plugin/alert
-#xls file path,need create if not exist
-#xls.file.path=/tmp/xls
+#maven.local.repository=/Users/gaojun/Documents/jianguoyun/localRepository
-# Enterprise WeChat configuration
-enterprise.wechat.enable=false
+#alert.plugin.binding config the Alert Plugin need be load when development and run in IDE
+#alert.plugin.binding=\
+# ./dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml
-#enterprise.wechat.corp.id=xxxxxxx
-#enterprise.wechat.secret=xxxxxxx
-#enterprise.wechat.agent.id=xxxxxxx
-#enterprise.wechat.users=xxxxxxx
-#enterprise.wechat.token.url=https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={corpId}&corpsecret={secret}
-#enterprise.wechat.push.url=https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={token}
-#enterprise.wechat.team.send.msg={\"toparty\":\"{toParty}\",\"agentid\":\"{agentId}\",\"msgtype\":\"text\",\"text\":{\"content\":\"{msg}\"},\"safe\":\"0\"}
-#enterprise.wechat.user.send.msg={\"touser\":\"{toUser}\",\"agentid\":\"{agentId}\",\"msgtype\":\"markdown\",\"markdown\":{\"content\":\"{msg}\"}}
-
-plugin.dir=/Users/xx/your/path/to/plugin/dir
-
-#ding talk configuration
-dingtalk.isEnable=flase
-dingtalk.webhook=https://oapi.dingtalk.com/robot/send?access_token=xxxxx
-dingtalk.keyword=
-dingtalk.proxy=
-dingtalk.port=80
-dingtalk.user=
-dingtalk.password=
-dingtalk.isEnableProxy=false
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManagerTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManagerTest.java
new file mode 100644
index 0000000..ea78f6b
--- /dev/null
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManagerTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.alert.plugin;
+
+import org.apache.dolphinscheduler.alert.AlertServer;
+import org.apache.dolphinscheduler.alert.utils.Constants;
+import org.apache.dolphinscheduler.alert.utils.PropertyUtils;
+import org.apache.dolphinscheduler.spi.utils.StringUtils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * AlertPluginManager Tester.
+ */
+public class AlertPluginManagerTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(AlertPluginManagerTest.class);
+
+ @Test
+ public void testLoadPlugins() throws Exception {
+ logger.info("begin test AlertPluginManagerTest");
+ AlertPluginManager alertPluginManager = new AlertPluginManager();
+ DolphinPluginManagerConfig alertPluginManagerConfig = new DolphinPluginManagerConfig();
+ String path = DolphinPluginLoader.class.getClassLoader().getResource("").getPath();
+ alertPluginManagerConfig.setPlugins(path + "../../../dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml");
+ if (StringUtils.isNotBlank(PropertyUtils.getString(AlertServer.ALERT_PLUGIN_DIR))) {
+ alertPluginManagerConfig.setInstalledPluginsDir(org.apache.dolphinscheduler.alert.utils.PropertyUtils.getString(AlertServer.ALERT_PLUGIN_DIR, Constants.ALERT_PLUGIN_PATH).trim());
+ }
+
+ if (StringUtils.isNotBlank(PropertyUtils.getString(AlertServer.MAVEN_LOCAL_REPOSITORY))) {
+ alertPluginManagerConfig.setMavenLocalRepository(PropertyUtils.getString(AlertServer.MAVEN_LOCAL_REPOSITORY).trim());
+ }
+
+ DolphinPluginLoader alertPluginLoader = new DolphinPluginLoader(alertPluginManagerConfig, ImmutableList.of(alertPluginManager));
+ try {
+ alertPluginLoader.loadPlugins();
+ } catch (Exception e) {
+ throw new RuntimeException("load Alert Plugin Failed !", e);
+ }
+
+ Assert.assertNotNull(alertPluginManager.getAlertChannelFactoryMap().get("email alert"));
+ }
+}
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoaderTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoaderTest.java
new file mode 100644
index 0000000..b9d3d1a
--- /dev/null
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoaderTest.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.alert.plugin;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * DolphinPluginLoader Tester.
+ */
+public class DolphinPluginLoaderTest {
+
+ @Before
+ public void before() throws Exception {
+ }
+
+ @After
+ public void after() throws Exception {
+ }
+
+ /**
+ * Method: loadPlugins()
+ */
+ @Test
+ public void testLoadPlugins() throws Exception {
+ AlertPluginManager alertPluginManager = new AlertPluginManager();
+ DolphinPluginManagerConfig alertPluginManagerConfig = new DolphinPluginManagerConfig();
+ String path = DolphinPluginLoader.class.getClassLoader().getResource("").getPath();
+ alertPluginManagerConfig.setPlugins(path + "../../../dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml");
+ DolphinPluginLoader alertPluginLoader = new DolphinPluginLoader(alertPluginManagerConfig, ImmutableList.of(alertPluginManager));
+ try {
+ alertPluginLoader.loadPlugins();
+ } catch (Exception e) {
+ throw new RuntimeException("load Alert Plugin Failed !", e);
+ }
+
+ Assert.assertNotNull(alertPluginManager.getAlertChannelFactoryMap().get("email alert"));
+ }
+}
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
index c2f4006..6558419 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
@@ -14,67 +14,228 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.plugin;
+import org.apache.dolphinscheduler.alert.AlertServer;
+import org.apache.dolphinscheduler.alert.runner.AlertSender;
import org.apache.dolphinscheduler.alert.utils.Constants;
-import org.apache.dolphinscheduler.common.enums.ShowType;
-import org.apache.dolphinscheduler.plugin.api.AlertPlugin;
-import org.apache.dolphinscheduler.plugin.model.AlertData;
-import org.apache.dolphinscheduler.plugin.model.AlertInfo;
-import org.apache.dolphinscheduler.plugin.model.PluginName;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.dolphinscheduler.alert.utils.PropertyUtils;
+import org.apache.dolphinscheduler.common.enums.AlertStatus;
+import org.apache.dolphinscheduler.common.enums.AlertType;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
+import org.apache.dolphinscheduler.dao.AlertDao;
+import org.apache.dolphinscheduler.dao.DaoFactory;
+import org.apache.dolphinscheduler.dao.PluginDao;
+import org.apache.dolphinscheduler.dao.entity.Alert;
+import org.apache.dolphinscheduler.dao.entity.AlertGroup;
+import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
+import org.apache.dolphinscheduler.dao.entity.PluginDefine;
+import org.apache.dolphinscheduler.spi.alert.AlertConstants;
+import org.apache.dolphinscheduler.spi.alert.ShowType;
+import org.apache.dolphinscheduler.spi.params.InputParam;
+import org.apache.dolphinscheduler.spi.params.PasswordParam;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+import org.apache.dolphinscheduler.spi.params.RadioParam;
+import org.apache.dolphinscheduler.spi.params.base.DataType;
+import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
+import org.apache.dolphinscheduler.spi.params.base.PluginParams;
+import org.apache.dolphinscheduler.spi.params.base.Validate;
+import org.apache.dolphinscheduler.spi.utils.StringUtils;
import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
-import static org.junit.Assert.*;
+import org.junit.Assert;
+import org.junit.Test;
+import com.google.common.collect.ImmutableList;
+
+/**
+ * test load and use alert plugin
+ */
public class EmailAlertPluginTest {
- private static final Logger logger = LoggerFactory.getLogger(EmailAlertPluginTest.class);
+ AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
+ PluginDao pluginDao = DaoFactory.getDaoInstance(PluginDao.class);
- private AlertPlugin plugin;
+ @Test
+ public void testRunSend() throws Exception {
- @Before
- public void before() {
- plugin = new EmailAlertPlugin();
- }
+ //create alert group
+ AlertGroup alertGroup = new AlertGroup();
+ alertGroup.setDescription("test alert group 1");
+ alertGroup.setGroupName("testalertg1");
+ //TODO AlertType is neet delete from AlertGroup
+ alertGroup.setGroupType(AlertType.EMAIL);
+ alertDao.getAlertGroupMapper().insert(alertGroup);
- @Test
- public void getId() {
- String id = plugin.getId();
- assertEquals(Constants.PLUGIN_DEFAULT_EMAIL_ID, id);
- }
+ //add alert
+ Alert alert1 = new Alert();
+ alert1.setTitle("test alert");
+ LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
+ map1.put("mysql service name", "mysql200");
+ map1.put("mysql address", "192.168.xx.xx");
+ map1.put("port", "3306");
+ map1.put(AlertConstants.SHOW_TYPE, ShowType.TEXT.getDescp());
+ map1.put("no index of number", "80");
+ map1.put("database client connections", "190");
+
+ LinkedHashMap<String, Object> map2 = new LinkedHashMap<>();
+ map2.put("mysql service name", "mysql210");
+ map2.put("mysql address", "192.168.xx.xx");
+ map2.put("port", "3306");
+ map2.put("no index of number", "10");
+ map1.put(AlertConstants.SHOW_TYPE, ShowType.TABLE.getDescp());
+ map2.put("database client connections", "90");
+
+ List<LinkedHashMap<String, Object>> maps = new ArrayList<>();
+ maps.add(0, map1);
+ maps.add(1, map2);
+ String mapjson = JSONUtils.toJsonString(maps);
+ alert1.setContent(mapjson);
+ alert1.setLog("log log");
+ alert1.setAlertGroupId(alertGroup.getId());
+ alertDao.addAlert(alert1);
+
+ List<Alert> alertList = new ArrayList<>();
+ alertList.add(alert1);
+
+ //load email alert plugin
+ AlertPluginManager alertPluginManager = new AlertPluginManager();
+ DolphinPluginManagerConfig alertPluginManagerConfig = new DolphinPluginManagerConfig();
+ String path = DolphinPluginLoader.class.getClassLoader().getResource("").getPath();
+ alertPluginManagerConfig.setPlugins(path + "../../../dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml");
+ if (StringUtils.isNotBlank(PropertyUtils.getString(AlertServer.ALERT_PLUGIN_DIR))) {
+ alertPluginManagerConfig.setInstalledPluginsDir(PropertyUtils.getString(AlertServer.ALERT_PLUGIN_DIR, Constants.ALERT_PLUGIN_PATH).trim());
+ }
+
+ if (StringUtils.isNotBlank(PropertyUtils.getString(AlertServer.MAVEN_LOCAL_REPOSITORY))) {
+ alertPluginManagerConfig.setMavenLocalRepository(PropertyUtils.getString(AlertServer.MAVEN_LOCAL_REPOSITORY).trim());
+ }
+
+ DolphinPluginLoader alertPluginLoader = new DolphinPluginLoader(alertPluginManagerConfig, ImmutableList.of(alertPluginManager));
+ try {
+ alertPluginLoader.loadPlugins();
+ } catch (Exception e) {
+ throw new RuntimeException("load Alert Plugin Failed !", e);
+ }
+
+ //create email alert plugin instance
+ AlertPluginInstance alertPluginInstance = new AlertPluginInstance();
+ alertPluginInstance.setAlertGroupId(alertGroup.getId());
+ alertPluginInstance.setCreateTime(new Date());
+ alertPluginInstance.setInstanceName("test email alert");
+
+ List<PluginDefine> pluginDefineList = pluginDao.getPluginDefineMapper().queryByNameAndType("email alert", "alert");
+ if (pluginDefineList == null || pluginDefineList.size() == 0) {
+ throw new RuntimeException("no alert plugin be load");
+ }
+ PluginDefine pluginDefine = pluginDefineList.get(0);
+ alertPluginInstance.setPluginDefineId(pluginDefine.getId());
+ alertPluginInstance.setPluginInstanceParams(getEmailAlertParams());
+ alertDao.getAlertPluginInstanceMapper().insert(alertPluginInstance);
+
+ AlertSender alertSender = new AlertSender(alertList, alertDao, alertPluginManager, pluginDao);
+ alertSender.run();
+
+ Alert alertResult = alertDao.getAlertMapper().selectById(alert1.getId());
+ Assert.assertNotNull(alertResult);
+ Assert.assertEquals(alertResult.getAlertStatus(), AlertStatus.EXECUTION_FAILURE);
+
+ alertDao.getAlertGroupMapper().deleteById(alertGroup.getId());
+ alertDao.getAlertPluginInstanceMapper().deleteById(alertPluginInstance.getId());
+ alertDao.getAlertMapper().deleteById(alert1.getId());
- @Test
- public void getName() {
- PluginName pluginName = plugin.getName();
- assertEquals(Constants.PLUGIN_DEFAULT_EMAIL_CH, pluginName.getChinese());
- assertEquals(Constants.PLUGIN_DEFAULT_EMAIL_EN, pluginName.getEnglish());
}
- @Test
- public void process() {
- AlertInfo alertInfo = new AlertInfo();
- AlertData alertData = new AlertData();
- alertData.setId(1)
- .setAlertGroupId(1)
- .setContent("[\"alarm time：2018-02-05\", \"service name：MYSQL_ALTER\", \"alarm name：MYSQL_ALTER_DUMP\", " +
- "\"get the alarm exception.！，interface error，exception information：timed out\", \"request address：http://blog.csdn.net/dreamInTheWorld/article/details/78539286\"]")
- .setLog("test log")
- .setReceivers("xx@xx.com")
- .setReceiversCc("xx@xx.com")
- .setShowType(ShowType.TEXT.getDescp())
- .setTitle("test title");
-
- alertInfo.setAlertData(alertData);
- List<String> list = new ArrayList<String>(){{ add("xx@xx.com"); }};
- alertInfo.addProp("receivers", list);
- Map<String, Object> ret = plugin.process(alertInfo);
- assertFalse(Boolean.parseBoolean(String.valueOf(ret.get(Constants.STATUS))));
+ public String getEmailAlertParams() {
+
+ List<PluginParams> paramsList = new ArrayList<>();
+ InputParam receivesParam = InputParam.newBuilder("receivers", "receivers")
+ .setValue("540957506@qq.com")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ InputParam mailSmtpHost = InputParam.newBuilder("mailServerHost", "mail.smtp.host")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue("smtp.exmail.qq.com")
+ .build();
+
+ InputParam mailSmtpPort = InputParam.newBuilder("mailServerPort", "mail.smtp.port")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .setType(DataType.NUMBER.getDataType())
+ .build())
+ .setValue(25)
+ .build();
+
+ InputParam mailSender = InputParam.newBuilder("mailSender", "mail.sender")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue("easyscheduler@analysys.com.cn")
+ .build();
+
+ RadioParam enableSmtpAuth = RadioParam.newBuilder("enableSmtpAuth", "mail.smtp.auth")
+ .addParamsOptions(new ParamsOptions("YES", true, false))
+ .addParamsOptions(new ParamsOptions("NO", false, false))
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue(true)
+ .build();
+
+ InputParam mailUser = InputParam.newBuilder("mailUser", "mail.user")
+ .setPlaceholder("if enable use authentication, you need input user")
+ .setValue("easyscheduler@analysys.com.cn")
+ .build();
+
+ PasswordParam mailPassword = PasswordParam.newBuilder("mailPasswd", "mail.passwd")
+ .setPlaceholder("if enable use authentication, you need input password")
+ .setValue("xxxxxxx")
+ .build();
+
+ RadioParam enableTls = RadioParam.newBuilder("starttlsEnable", "mail.smtp.starttls.enable")
+ .addParamsOptions(new ParamsOptions("YES", true, false))
+ .addParamsOptions(new ParamsOptions("NO", false, false))
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue(true)
+ .build();
+
+ RadioParam enableSsl = RadioParam.newBuilder("sslEnable", "mail.smtp.ssl.enable")
+ .addParamsOptions(new ParamsOptions("YES", true, false))
+ .addParamsOptions(new ParamsOptions("NO", false, false))
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue(false)
+ .build();
+
+ InputParam sslTrust = InputParam.newBuilder("mailSmtpSslTrust", "mail.smtp.ssl.trust")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .setValue("smtp.exmail.qq.com")
+ .build();
+
+ List<ParamsOptions> emailShowTypeList = new ArrayList<>();
+ emailShowTypeList.add(new ParamsOptions(ShowType.TABLE.getDescp(), ShowType.TABLE.getDescp(), false));
+ emailShowTypeList.add(new ParamsOptions(ShowType.TEXT.getDescp(), ShowType.TEXT.getDescp(), false));
+ emailShowTypeList.add(new ParamsOptions(ShowType.ATTACHMENT.getDescp(), ShowType.ATTACHMENT.getDescp(), false));
+ emailShowTypeList.add(new ParamsOptions(ShowType.TABLEATTACHMENT.getDescp(), ShowType.TABLEATTACHMENT.getDescp(), false));
+ RadioParam showType = RadioParam.newBuilder(AlertConstants.SHOW_TYPE, "showType")
+ .setParamsOptionsList(emailShowTypeList)
+ .setValue(ShowType.TABLE.getDescp())
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ paramsList.add(receivesParam);
+ paramsList.add(mailSmtpHost);
+ paramsList.add(mailSmtpPort);
+ paramsList.add(mailSender);
+ paramsList.add(enableSmtpAuth);
+ paramsList.add(mailUser);
+ paramsList.add(mailPassword);
+ paramsList.add(enableTls);
+ paramsList.add(enableSsl);
+ paramsList.add(sslTrust);
+ paramsList.add(showType);
+
+ return PluginParamsTransfer.transferParamsToJson(paramsList);
}
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactoryTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactoryTest.java
deleted file mode 100644
index 32201e6..0000000
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactoryTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.alert.template;
-
-import org.apache.dolphinscheduler.alert.template.impl.DefaultHTMLTemplate;
-import org.apache.dolphinscheduler.alert.utils.Constants;
-import org.apache.dolphinscheduler.alert.utils.PropertyUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.mockito.Mockito.*;
-import static org.junit.Assert.*;
-
-/**
- * test class for AlertTemplateFactory
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(PropertyUtils.class)
-public class AlertTemplateFactoryTest {
-
- private static final Logger logger = LoggerFactory.getLogger(AlertTemplateFactoryTest.class);
-
- /**
- * GetMessageTemplate method test
- */
- @Test
- public void testGetMessageTemplate(){
-
- PowerMockito.mockStatic(PropertyUtils.class);
-
- AlertTemplate defaultTemplate = AlertTemplateFactory.getMessageTemplate();
-
- assertTrue(defaultTemplate instanceof DefaultHTMLTemplate);
- }
-
- /**
- * GetMessageTemplate method throw Exception test
- */
- @Test
- public void testGetMessageTemplateException(){
-
- AlertTemplate defaultTemplate = AlertTemplateFactory.getMessageTemplate();
- assertTrue(defaultTemplate instanceof DefaultHTMLTemplate);
- }
-}
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplateTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplateTest.java
deleted file mode 100644
index c88f692..0000000
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplateTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.alert.template.impl;
-
-import org.apache.dolphinscheduler.common.utils.*;
-import org.apache.dolphinscheduler.alert.utils.Constants;
-import org.apache.dolphinscheduler.common.enums.ShowType;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
-/**
- * test class for DefaultHTMLTemplate
- */
-public class DefaultHTMLTemplateTest{
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultHTMLTemplateTest.class);
-
- /**
- * only need test method GetMessageFromTemplate
- */
- @Test
- public void testGetMessageFromTemplate(){
-
- DefaultHTMLTemplate template = new DefaultHTMLTemplate();
-
- String tableTypeMessage = template.getMessageFromTemplate(list2String(), ShowType.TABLE,true);
-
- assertEquals(tableTypeMessage,generateMockTableTypeResultByHand());
-
- String textTypeMessage = template.getMessageFromTemplate(list2String(), ShowType.TEXT,true);
-
- assertEquals(textTypeMessage,generateMockTextTypeResultByHand());
- }
-
- /**
- * generate some simulation data
- */
- private String list2String(){
-
- LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
- map1.put("mysql service name","mysql200");
- map1.put("mysql address","192.168.xx.xx");
- map1.put("database client connections","190");
- map1.put("port","3306");
- map1.put("no index of number","80");
-
- LinkedHashMap<String, Object> map2 = new LinkedHashMap<>();
- map2.put("mysql service name","mysql210");
- map2.put("mysql address","192.168.xx.xx");
- map2.put("database client connections","90");
- map2.put("port","3306");
- map2.put("no index of number","10");
-
- List<LinkedHashMap<String, Object>> maps = new ArrayList<>();
- maps.add(0,map1);
- maps.add(1,map2);
- String mapjson = JSONUtils.toJsonString(maps);
- logger.info(mapjson);
-
- return mapjson;
- }
-
- private String generateMockTableTypeResultByHand(){
-
- return Constants.HTML_HEADER_PREFIX +
- "<thead><tr><th>mysql service name</th><th>mysql address</th><th>database client connections</th><th>port</th><th>no index of number</th></tr></thead>\n" +
- "<tr><td>mysql200</td><td>192.168.xx.xx</td><td>190</td><td>3306</td><td>80</td></tr><tr><td>mysql210</td><td>192.168.xx.xx</td><td>90</td><td>3306</td><td>10</td></tr>" + Constants.TABLE_BODY_HTML_TAIL;
-
- }
-
- private String generateMockTextTypeResultByHand(){
-
- return Constants.HTML_HEADER_PREFIX + "<tr><td>{\"mysql service name\":\"mysql200\",\"mysql address\":\"192.168.xx.xx\",\"database client connections\":\"190\",\"port\":\"3306\",\"no index of number\":\"80\"}</td></tr><tr><td>{\"mysql service name\":\"mysql210\",\"mysql address\":\"192.168.xx.xx\",\"database client connections\":\"90\",\"port\":\"3306\",\"no index of number\":\"10\"}</td></tr>" + Constants.TABLE_BODY_HTML_TAIL;
- }
-}
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtilsTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtilsTest.java
index 049881c..27c481e 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtilsTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtilsTest.java
@@ -14,10 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.alert.utils;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.CloseableHttpClient;
+
+import java.io.IOException;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -30,10 +34,6 @@ import org.powermock.modules.junit4.PowerMockRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-
-import static org.junit.Assert.*;
-
@PrepareForTest(PropertyUtils.class)
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("javax.net.ssl.*")
@@ -45,7 +45,7 @@ public class DingTalkUtilsTest {
private static final String msg = "ding talk test";
@Before
- public void init(){
+ public void init() {
PowerMockito.mockStatic(PropertyUtils.class);
Mockito.when(PropertyUtils.getString(Constants.DINGTALK_WEBHOOK)).thenReturn(mockUrl);
Mockito.when(PropertyUtils.getString(Constants.DINGTALK_KEYWORD)).thenReturn(mockKeyWords);
@@ -56,32 +56,18 @@ public class DingTalkUtilsTest {
Mockito.when(PropertyUtils.getInt(Constants.DINGTALK_PORT)).thenReturn(80);
}
-// @Test
-// @Ignore
-// public void testSendMsg() {
-// try {
-// String msgTosend = "msg to send";
-// logger.info(PropertyUtils.getString(Constants.DINGTALK_WEBHOOK));
-// String rsp = DingTalkUtils.sendDingTalkMsg(msgTosend, Constants.UTF_8);
-// logger.info("send msg result:{}",rsp);
-// String errmsg = JSONUtils.parseObject(rsp).getString("errmsg");
-// Assert.assertEquals("ok", errmsg);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-
@Test
public void testCreateDefaultClient() {
- CloseableHttpClient client = DingTalkUtils.getDefaultClient();;
+ CloseableHttpClient client = DingTalkUtils.getDefaultClient();
try {
Assert.assertNotNull(client);
client.close();
} catch (IOException ex) {
- logger.info("close exception",ex.getMessage());
+ logger.info("close exception", ex.getMessage());
new Throwable();
}
}
+
@Test
public void testCreateProxyClient() {
CloseableHttpClient client = DingTalkUtils.getProxyClient();
@@ -89,11 +75,12 @@ public class DingTalkUtilsTest {
Assert.assertNotNull(client);
client.close();
} catch (IOException ex) {
- logger.info("close exception",ex.getMessage());
+ logger.info("close exception", ex.getMessage());
new Throwable();
}
}
+
@Test
public void testProxyConfig() {
RequestConfig rc = DingTalkUtils.getProxyConfig();
@@ -109,6 +96,7 @@ public class DingTalkUtilsTest {
String expect = "{\"text\":{\"content\":\"this is test\"},\"msgtype\":\"text\"}";
Assert.assertEquals(expect, jsonString);
}
+
@Test
public void testDingTalkMsgUtf8() {
String msg = DingTalkUtils.textToJsonString("this is test:中文");
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java
index 1a70c5b..d528d2c 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java
@@ -18,10 +18,15 @@
package org.apache.dolphinscheduler.alert.utils;
import org.apache.dolphinscheduler.common.enums.AlertType;
-import org.apache.dolphinscheduler.common.enums.ShowType;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.Alert;
-import org.apache.dolphinscheduler.plugin.model.AlertData;
+import org.apache.dolphinscheduler.spi.alert.AlertConstants;
+import org.apache.dolphinscheduler.spi.alert.AlertData;
+import org.apache.dolphinscheduler.spi.alert.AlertInfo;
+import org.apache.dolphinscheduler.spi.alert.ShowType;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+import org.apache.dolphinscheduler.spi.params.RadioParam;
+import org.apache.dolphinscheduler.spi.params.base.PluginParams;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -47,6 +52,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
* enterprise.wechat.agent.id
* enterprise.wechat.users
*/
+
@PrepareForTest(PropertyUtils.class)
@RunWith(PowerMockRunner.class)
public class EnterpriseWeChatUtilsTest {
@@ -125,10 +131,19 @@ public class EnterpriseWeChatUtilsTest {
public void testMarkdownByAlertForText() {
Alert alertForText = createAlertForText();
AlertData alertData = new AlertData();
+ AlertInfo alertInfo = new AlertInfo();
+ //TODO:
+ List<PluginParams> paramsList = new ArrayList<>();
+ RadioParam showType = new RadioParam.Builder(AlertConstants.SHOW_TYPE, AlertConstants.SHOW_TYPE)
+ .setValue(ShowType.TEXT)
+ .build();
+ paramsList.add(showType);
+ alertInfo.setAlertParams(PluginParamsTransfer.transferParamsToJson(paramsList));
+ alertInfo.setAlertData(alertData);
alertData.setTitle(alertForText.getTitle())
- .setShowType(alertForText.getShowType().getDescp())
+ //.setShowType(alertForText.getShowType().getDescp())
.setContent(alertForText.getContent());
- String result = EnterpriseWeChatUtils.markdownByAlert(alertData);
+ String result = EnterpriseWeChatUtils.markdownByAlert(alertInfo);
Assert.assertNotNull(result);
}
@@ -136,10 +151,19 @@ public class EnterpriseWeChatUtilsTest {
public void testMarkdownByAlertForTable() {
Alert alertForText = createAlertForTable();
AlertData alertData = new AlertData();
+ AlertInfo alertInfo = new AlertInfo();
+ //TODO:
+ List<PluginParams> paramsList = new ArrayList<>();
+ RadioParam showType = new RadioParam.Builder(AlertConstants.SHOW_TYPE, AlertConstants.SHOW_TYPE)
+ .setValue(ShowType.TABLE)
+ .build();
+ paramsList.add(showType);
+ alertInfo.setAlertParams(PluginParamsTransfer.transferParamsToJson(paramsList));
+ alertInfo.setAlertData(alertData);
alertData.setTitle(alertForText.getTitle())
- .setShowType(alertForText.getShowType().getDescp())
+ //.setShowType(alertForText.getShowType().getDescp())
.setContent(alertForText.getContent());
- String result = EnterpriseWeChatUtils.markdownByAlert(alertData);
+ String result = EnterpriseWeChatUtils.markdownByAlert(alertInfo);
Assert.assertNotNull(result);
}
@@ -166,7 +190,7 @@ public class EnterpriseWeChatUtilsTest {
Alert alert = new Alert();
alert.setTitle("Mysql Exception");
- alert.setShowType(ShowType.TEXT);
+ //alert.setShowType(ShowType.TEXT);
alert.setContent(content);
alert.setAlertType(AlertType.EMAIL);
alert.setAlertGroupId(4);
@@ -200,7 +224,7 @@ public class EnterpriseWeChatUtilsTest {
private Alert createAlertForTable() {
Alert alert = new Alert();
alert.setTitle("Mysql Exception");
- alert.setShowType(ShowType.TABLE);
+ //alert.setShowType(ShowType.TABLE.getDescp());
String content = list2String();
alert.setContent(content);
alert.setAlertType(AlertType.EMAIL);
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/FuncUtilsTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/FuncUtilsTest.java
index a4aeea9..818fac9 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/FuncUtilsTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/FuncUtilsTest.java
@@ -17,14 +17,14 @@
package org.apache.dolphinscheduler.alert.utils;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import java.util.Arrays;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FuncUtilsTest {
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/MailUtilsTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/MailUtilsTest.java
deleted file mode 100644
index 26a69c4..0000000
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/MailUtilsTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.alert.utils;
-
-
-import org.apache.dolphinscheduler.common.enums.AlertType;
-import org.apache.dolphinscheduler.common.enums.ShowType;
-import org.apache.dolphinscheduler.dao.AlertDao;
-import org.apache.dolphinscheduler.dao.DaoFactory;
-import org.apache.dolphinscheduler.dao.entity.Alert;
-import org.apache.dolphinscheduler.dao.entity.User;
-import org.junit.Assert;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-import org.apache.dolphinscheduler.common.utils.*;
-
-
-/**
- */
-public class MailUtilsTest {
- private static final Logger logger = LoggerFactory.getLogger(MailUtilsTest.class);
- @Test
- public void testSendMails() {
- String[] receivers = new String[]{"347801120@qq.com"};
- String[] receiversCc = new String[]{"347801120@qq.com"};
-
- String content ="[\"id:69\"," +
- "\"name:UserBehavior-0--1193959466\"," +
- "\"Job name: Start workflow\"," +
- "\"State: SUCCESS\"," +
- "\"Recovery:NO\"," +
- "\"Run time: 1\"," +
- "\"Start time: 2018-08-06 10:31:34.0\"," +
- "\"End time: 2018-08-06 10:31:49.0\"," +
- "\"Host: 192.168.xx.xx\"," +
- "\"Notify group :4\"]";
-
- Alert alert = new Alert();
- alert.setTitle("Mysql Exception");
- alert.setShowType(ShowType.TEXT);
- alert.setContent(content);
- alert.setAlertType(AlertType.EMAIL);
- alert.setAlertGroupId(4);
-
- MailUtils.sendMails(Arrays.asList(receivers),Arrays.asList(receiversCc),alert.getTitle(),alert.getContent(), ShowType.TEXT.getDescp());
- }
-
-
- @Test
- public void testQuery(){
- AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
- List<Alert> alerts = alertDao.listWaitExecutionAlert();
-
- String[] mails = new String[]{"xx@xx.com"};
-
- for(Alert alert : alerts){
- MailUtils.sendMails(Arrays.asList(mails),"gaojing", alert.getContent(), ShowType.TABLE.getDescp());
- }
-
- }
-
- public String list2String(){
-
- LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
- map1.put("mysql service name","mysql200");
- map1.put("mysql address","192.168.xx.xx");
- map1.put("port","3306");
- map1.put("no index of number","80");
- map1.put("database client connections","190");
-
- LinkedHashMap<String, Object> map2 = new LinkedHashMap<>();
- map2.put("mysql service name","mysql210");
- map2.put("mysql address","192.168.xx.xx");
- map2.put("port","3306");
- map2.put("no index of number","10");
- map2.put("database client connections","90");
-
- List<LinkedHashMap<String, Object>> maps = new ArrayList<>();
- maps.add(0,map1);
- maps.add(1,map2);
- String mapjson = JSONUtils.toJsonString(maps);
- logger.info(mapjson);
-
- return mapjson;
-
- }
-
- @Test
- public void testSendTableMail(){
- String[] mails = new String[]{"347801120@qq.com"};
- Alert alert = new Alert();
- alert.setTitle("Mysql Exception");
- alert.setShowType(ShowType.TABLE);
- String content= list2String();
- alert.setContent(content);
- alert.setAlertType(AlertType.EMAIL);
- alert.setAlertGroupId(1);
- MailUtils.sendMails(Arrays.asList(mails),"gaojing", alert.getContent(), ShowType.TABLE.getDescp());
- }
-
- /**
- * Used to test add alarm information, mail sent
- * Text
- */
- @Test
- public void addAlertText(){
- AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
- Alert alert = new Alert();
- alert.setTitle("Mysql Exception");
- alert.setShowType(ShowType.TEXT);
- alert.setContent("[\"alarm time：2018-02-05\", \"service name：MYSQL_ALTER\", \"alarm name：MYSQL_ALTER_DUMP\", " +
- "\"get the alarm exception.！，interface error，exception information：timed out\", \"request address：http://blog.csdn.net/dreamInTheWorld/article/details/78539286\"]");
- alert.setAlertType(AlertType.EMAIL);
- alert.setAlertGroupId(1);
- alertDao.addAlert(alert);
- }
-
-
- /**
- * Used to test add alarm information, mail sent
- * Table
- */
- @Test
- public void testAddAlertTable(){
- logger.info("testAddAlertTable");
- AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
- Assert.assertNotNull(alertDao);
- Alert alert = new Alert();
- alert.setTitle("Mysql Exception");
- alert.setShowType(ShowType.TABLE);
-
- String content = list2String();
- alert.setContent(content);
- alert.setAlertType(AlertType.EMAIL);
- alert.setAlertGroupId(1);
- alertDao.addAlert(alert);
- logger.info("" +alert);
- }
-
- @Test
- public void testAlertDao(){
- AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
- List<User> users = alertDao.listUserByAlertgroupId(3);
- logger.info(users.toString());
- }
-
- @Test
- public void testAttachmentFile()throws Exception{
- String[] mails = new String[]{"xx@xx.com"};
- Alert alert = new Alert();
- alert.setTitle("Mysql Exception");
- alert.setShowType(ShowType.ATTACHMENT);
- String content = list2String();
- alert.setContent(content);
- alert.setAlertType(AlertType.EMAIL);
- alert.setAlertGroupId(1);
- MailUtils.sendMails(Arrays.asList(mails),"gaojing",alert.getContent(),ShowType.ATTACHMENT.getDescp());
- }
-
- @Test
- public void testTableAttachmentFile()throws Exception{
- String[] mails = new String[]{"xx@xx.com"};
- Alert alert = new Alert();
- alert.setTitle("Mysql Exception");
- alert.setShowType(ShowType.TABLEATTACHMENT);
- String content = list2String();
- alert.setContent(content);
- alert.setAlertType(AlertType.EMAIL);
- alert.setAlertGroupId(1);
- MailUtils.sendMails(Arrays.asList(mails),"gaojing",alert.getContent(),ShowType.TABLEATTACHMENT.getDescp());
- }
-
-}
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/PropertyUtilsTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/PropertyUtilsTest.java
index 2a300c9..94859d0 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/PropertyUtilsTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/PropertyUtilsTest.java
@@ -17,13 +17,18 @@
package org.apache.dolphinscheduler.alert.utils;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
import org.apache.dolphinscheduler.common.enums.ZKNodeType;
+
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.*;
-
/**
* Test PropertyUtils
* and the resource path is src/test/resources/alert.properties.
@@ -196,19 +201,19 @@ public class PropertyUtilsTest {
public void testGetEnum() {
//Expected MASTER
- ZKNodeType zkNodeType = PropertyUtils.getEnum("test.server.enum1", ZKNodeType.class,ZKNodeType.WORKER);
+ ZKNodeType zkNodeType = PropertyUtils.getEnum("test.server.enum1", ZKNodeType.class, ZKNodeType.WORKER);
assertEquals(zkNodeType, ZKNodeType.MASTER);
//Expected DEAD_SERVER
- zkNodeType = PropertyUtils.getEnum("test.server.enum2", ZKNodeType.class,ZKNodeType.WORKER);
+ zkNodeType = PropertyUtils.getEnum("test.server.enum2", ZKNodeType.class, ZKNodeType.WORKER);
assertEquals(zkNodeType, ZKNodeType.DEAD_SERVER);
//If key is null, then return defaultval
- zkNodeType = PropertyUtils.getEnum(null, ZKNodeType.class,ZKNodeType.WORKER);
+ zkNodeType = PropertyUtils.getEnum(null, ZKNodeType.class, ZKNodeType.WORKER);
assertEquals(zkNodeType, ZKNodeType.WORKER);
//If the value doesn't define in enum ,it will log the error and return -1
- zkNodeType = PropertyUtils.getEnum("test.server.enum3", ZKNodeType.class,ZKNodeType.WORKER);
+ zkNodeType = PropertyUtils.getEnum("test.server.enum3", ZKNodeType.class, ZKNodeType.WORKER);
assertEquals(zkNodeType, ZKNodeType.WORKER);
}
diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml
index 2ade595..504dddc 100644
--- a/dolphinscheduler-common/pom.xml
+++ b/dolphinscheduler-common/pom.xml
@@ -33,11 +33,6 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.dolphinscheduler</groupId>
- <artifactId>dolphinscheduler-plugin-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index 85066cc..a8d04ce 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -844,10 +844,7 @@ public final class Constants {
ExecutionStatus.WAITTING_DEPEND.ordinal()
};
- /**
- * status
- */
- public static final String STATUS = "status";
+
/**
* message
@@ -982,6 +979,10 @@ public final class Constants {
*/
public static final String PLUGIN_JAR_SUFFIX = ".jar";
+ /**
+ * status
+ */
+ public static final String STATUS = "status";
public static final int NORAML_NODE_STATUS = 0;
public static final int ABNORMAL_NODE_STATUS = 1;
@@ -998,6 +999,8 @@ public final class Constants {
public static final String DOLPHIN_SCHEDULER_PREFERRED_NETWORK_INTERFACE = "dolphin.scheduler.network.interface.preferred";
+ public static final String EXCEL_SUFFIX_XLS = ".xls";
+
/**
* datasource encryption salt
*/
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java
deleted file mode 100644
index cde299f..0000000
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.common.plugin;
-
-import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.api.AlertPlugin;
-import org.apache.dolphinscheduler.plugin.spi.AlertPluginProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * FilePluginManager
- */
-public class FilePluginManager implements PluginManager {
-
- private static final Logger logger = LoggerFactory.getLogger(FilePluginManager.class);
-
- private Map<String, AlertPlugin> pluginMap = new ConcurrentHashMap<>();
-
- private Map<String, ServiceLoader<AlertPluginProvider>> pluginLoaderMap = new ConcurrentHashMap<>();
-
- private Map<String, PluginClassLoader> classLoaderMap = new ConcurrentHashMap<>();
-
- private String[] whitePrefixes;
-
- private String[] excludePrefixes;
-
- public FilePluginManager(String dirPath, String[] whitePrefixes, String[] excludePrefixes) {
- this.whitePrefixes = whitePrefixes;
- this.excludePrefixes = excludePrefixes;
- try {
- load(dirPath);
- } catch (MalformedURLException e) {
- logger.error("load plugins failed.", e);
- }
- }
-
- private void load(String dirPath) throws MalformedURLException {
- logger.info("start to load jar files in {}", dirPath);
- if (dirPath == null) {
- logger.error("not a valid path - {}", dirPath);
- return;
- }
- File[] files = new File(dirPath).listFiles();
- if (files == null) {
- logger.error("not a valid path - {}", dirPath);
- return;
- }
- for (File file : files) {
- if (file.isDirectory() && !file.getPath().endsWith(Constants.PLUGIN_JAR_SUFFIX)) {
- continue;
- }
- String pluginName = file.getName()
- .substring(0, file.getName().length() - Constants.PLUGIN_JAR_SUFFIX.length());
- URL[] urls = new URL[]{ file.toURI().toURL() };
- PluginClassLoader classLoader =
- new PluginClassLoader(urls, Thread.currentThread().getContextClassLoader(), whitePrefixes, excludePrefixes);
- classLoaderMap.put(pluginName, classLoader);
-
- ServiceLoader<AlertPluginProvider> loader = ServiceLoader.load(AlertPluginProvider.class, classLoader);
- pluginLoaderMap.put(pluginName, loader);
-
- loader.forEach(provider -> {
- AlertPlugin plugin = provider.createPlugin();
- pluginMap.put(plugin.getId(), plugin);
- logger.info("loaded plugin - {}", plugin.getId());
- });
- }
- }
-
- @Override
- public AlertPlugin findOne(String pluginId) {
- return pluginMap.get(pluginId);
- }
-
- @Override
- public Map<String, AlertPlugin> findAll() {
- return pluginMap;
- }
-
- @Override
- public void addPlugin(AlertPlugin plugin) {
- pluginMap.put(plugin.getId(), plugin);
- }
-
-}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoader.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoader.java
deleted file mode 100644
index 528e83a..0000000
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoader.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.common.plugin;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Plugin Class Loader
- */
-public class PluginClassLoader extends URLClassLoader {
-
- private static final Logger logger = LoggerFactory.getLogger(PluginClassLoader.class);
-
- private static final String JAVA_PACKAGE_PREFIX = "java.";
- private static final String JAVAX_PACKAGE_PREFIX = "javax.";
-
- private final String[] whitePrefixes;
-
- private final String[] excludePrefixes;
-
- public PluginClassLoader(URL[] urls, ClassLoader parent, String[] whitePrefix, String[] excludePreifx) {
- super(urls, parent);
- this.whitePrefixes = whitePrefix;
- this.excludePrefixes = excludePreifx;
- }
-
- @Override
- public Class<?> loadClass(String name) throws ClassNotFoundException {
- logger.trace("Received request to load class '{}'", name);
- synchronized (getClassLoadingLock(name)) {
- if (name.startsWith(JAVA_PACKAGE_PREFIX) || name.startsWith(JAVAX_PACKAGE_PREFIX)) {
- return findSystemClass(name);
- }
-
- boolean isWhitePrefixes = fromWhitePrefix(name);
- boolean isExcludePrefixed = fromExcludePrefix(name);
-
- // if the class is part of the plugin engine use parent class loader
- if (!isWhitePrefixes && isExcludePrefixed) {
- return getParent().loadClass(name);
- }
-
- // check whether it's already been loaded
- Class<?> loadedClass = findLoadedClass(name);
- if (loadedClass != null) {
- logger.debug("Found loaded class '{}'", name);
- return loadedClass;
- }
-
- // nope, try to load locally
- try {
- loadedClass = findClass(name);
- logger.debug("Found class '{}' in plugin classpath", name);
- return loadedClass;
- } catch (ClassNotFoundException e) {
- // try next step
- }
-
- // use the standard ClassLoader (which follows normal parent delegation)
- return super.loadClass(name);
- }
- }
-
- private boolean fromWhitePrefix(String name) {
- if (this.whitePrefixes == null) {
- return false;
- }
- for (String whitePrefix : this.whitePrefixes) {
- if (name.startsWith(whitePrefix)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean fromExcludePrefix(String name) {
- if (this.excludePrefixes == null) {
- return false;
- }
- for (String excludePrefix : this.excludePrefixes) {
- if (name.startsWith(excludePrefix)) {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public Enumeration<URL> getResources(String name) throws IOException {
- List<URL> allRes = new LinkedList<>();
-
- Enumeration<URL> thisRes = findResources(name);
- if (thisRes != null) {
- while (thisRes.hasMoreElements()) {
- allRes.add(thisRes.nextElement());
- }
- }
-
- Enumeration<URL> parentRes = super.findResources(name);
- if (parentRes != null) {
- while (parentRes.hasMoreElements()) {
- allRes.add(parentRes.nextElement());
- }
- }
-
- return new Enumeration<URL>() {
- Iterator<URL> it = allRes.iterator();
-
- @Override
- public boolean hasMoreElements() {
- return it.hasNext();
- }
-
- @Override
- public URL nextElement() {
- return it.next();
- }
- };
- }
-
- @Override
- public URL getResource(String name) {
- URL res = null;
-
- res = findResource(name);
- if (res == null) {
- res = super.getResource(name);
- }
- return res;
- }
-}
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/FilePluginManagerTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/FilePluginManagerTest.java
deleted file mode 100644
index 1a57cb1..0000000
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/FilePluginManagerTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.common.plugin;
-
-import org.apache.dolphinscheduler.plugin.api.AlertPlugin;
-import org.apache.dolphinscheduler.plugin.model.AlertInfo;
-import org.apache.dolphinscheduler.plugin.model.PluginName;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-public class FilePluginManagerTest {
-
- private FilePluginManager filePluginManager;
- private AlertPlugin alertPlugin;
-
- @Before
- public void before() {
- filePluginManager = new FilePluginManager(null, null, null);
- alertPlugin = new AlertPlugin() {
- @Override
- public String getId() {
- return "test";
- }
-
- @Override
- public PluginName getName() {
- return new PluginName().setChinese("ch").setEnglish("en");
- }
-
- @Override
- public Map<String, Object> process(AlertInfo info) {
- return new HashMap<>();
- }
- };
- }
-
- @Test
- public void findOne() {
- filePluginManager.addPlugin(alertPlugin);
- assertEquals(alertPlugin, filePluginManager.findOne(alertPlugin.getId()));
- }
-
- @Test
- public void findAll() {
- assertNotNull(filePluginManager.findAll());
- }
-
- @Test
- public void addPlugin() {
- filePluginManager.addPlugin(alertPlugin);
- assertNotNull(filePluginManager.findAll());
- }
-}
\ No newline at end of file
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoaderTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoaderTest.java
deleted file mode 100644
index 8a6bfae..0000000
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoaderTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.common.plugin;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.net.URL;
-
-import static org.junit.Assert.*;
-
-public class PluginClassLoaderTest {
-
- private PluginClassLoader pluginClassLoader;
- private ClassLoader parent;
-
- @Before
- public void setUp() {
- parent = Thread.currentThread().getContextClassLoader();
- pluginClassLoader = new PluginClassLoader(
- new URL[]{}, parent,
- null, null);
- }
-
- @Test
- public void loadClassNull() {
- Class clazz = null;
- try {
- clazz = pluginClassLoader.loadClass("java.lang.Object");
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- }
- assertEquals(null, clazz.getClassLoader());
- }
-
- @Test
- public void loadClassApp() {
- Class clazz = null;
- try {
- clazz = pluginClassLoader.loadClass("org.apache.dolphinscheduler.common.Constants");
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- }
- assertEquals(parent, clazz.getClassLoader());
- }
-
-}
\ No newline at end of file
diff --git a/dolphinscheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml
index c474f6d..2ebe234 100644
--- a/dolphinscheduler-dao/pom.xml
+++ b/dolphinscheduler-dao/pom.xml
@@ -17,138 +17,138 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.dolphinscheduler</groupId>
- <artifactId>dolphinscheduler</artifactId>
- <version>1.3.2-SNAPSHOT</version>
- </parent>
- <artifactId>dolphinscheduler-dao</artifactId>
- <name>${project.artifactId}</name>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler</artifactId>
+ <version>1.3.2-SNAPSHOT</version>
+ </parent>
+ <artifactId>dolphinscheduler-dao</artifactId>
+ <name>${project.artifactId}</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus</artifactId>
- <version>${mybatis-plus.version}</version>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>${mybatis-plus.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-api</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-api</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid</artifactId>
+ </dependency>
- <dependency>
- <groupId>com.cronutils</groupId>
- <artifactId>cron-utils</artifactId>
- </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.cronutils</groupId>
+ <artifactId>cron-utils</artifactId>
+ </dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.dolphinscheduler</groupId>
- <artifactId>dolphinscheduler-common</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>protobuf-java</artifactId>
- <groupId>com.google.protobuf</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>protobuf-java</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
- </dependencies>
-</project>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
index cd101f0..4a5c7be 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
@@ -21,17 +21,19 @@ import org.apache.dolphinscheduler.common.enums.AlertEvent;
import org.apache.dolphinscheduler.common.enums.AlertStatus;
import org.apache.dolphinscheduler.common.enums.AlertType;
import org.apache.dolphinscheduler.common.enums.AlertWarnLevel;
-import org.apache.dolphinscheduler.common.enums.ShowType;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.apache.dolphinscheduler.dao.datasource.ConnectionFactory;
import org.apache.dolphinscheduler.dao.entity.Alert;
+import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
import org.apache.dolphinscheduler.dao.entity.ProcessAlertContent;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.ServerAlertContent;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
import org.apache.dolphinscheduler.dao.mapper.AlertMapper;
+import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.UserAlertGroupMapper;
import java.util.ArrayList;
@@ -54,10 +56,18 @@ public class AlertDao extends AbstractBaseDao {
@Autowired
private UserAlertGroupMapper userAlertGroupMapper;
+ @Autowired
+ private AlertPluginInstanceMapper alertPluginInstanceMapper;
+
+ @Autowired
+ private AlertGroupMapper alertGroupMapper;
+
@Override
protected void init() {
alertMapper = ConnectionFactory.getInstance().getMapper(AlertMapper.class);
userAlertGroupMapper = ConnectionFactory.getInstance().getMapper(UserAlertGroupMapper.class);
+ alertPluginInstanceMapper = ConnectionFactory.getInstance().getMapper(AlertPluginInstanceMapper.class);
+ alertGroupMapper = ConnectionFactory.getInstance().getMapper(AlertGroupMapper.class);
}
/**
@@ -74,8 +84,8 @@ public class AlertDao extends AbstractBaseDao {
* update alert
*
* @param alertStatus alertStatus
- * @param log log
- * @param id id
+ * @param log log
+ * @param id id
* @return update alert result
*/
public int updateAlert(AlertStatus alertStatus, String log, int id) {
@@ -101,8 +111,8 @@ public class AlertDao extends AbstractBaseDao {
* MasterServer or WorkerServer stoped
*
* @param alertgroupId alertgroupId
- * @param host host
- * @param serverType serverType
+ * @param host host
+ * @param serverType serverType
*/
public void sendServerStopedAlert(int alertgroupId, String host, String serverType) {
Alert alert = new Alert();
@@ -119,7 +129,7 @@ public class AlertDao extends AbstractBaseDao {
/**
* process time out alert
*
- * @param processInstance processInstance
+ * @param processInstance processInstance
* @param processDefinition processDefinition
*/
public void sendProcessTimeoutAlert(ProcessInstance processInstance, ProcessDefinition processDefinition) {
@@ -140,9 +150,8 @@ public class AlertDao extends AbstractBaseDao {
saveTaskTimeoutAlert(alert, content, alertgroupId, receivers, receiversCc);
}
- private void saveTaskTimeoutAlert(Alert alert, String content, int alertgroupId,
- String receivers, String receiversCc) {
- alert.setShowType(ShowType.TABLE);
+ private void saveTaskTimeoutAlert(Alert alert, String content, int alertgroupId, String receivers, String receiversCc) {
+ //alert.setShowType(ShowType.TABLE);
alert.setContent(content);
alert.setAlertType(AlertType.EMAIL);
alert.setAlertGroupId(alertgroupId);
@@ -160,13 +169,13 @@ public class AlertDao extends AbstractBaseDao {
/**
* task timeout warn
*
- * @param alertgroupId alertgroupId
- * @param receivers receivers
- * @param receiversCc receiversCc
- * @param processInstanceId processInstanceId
+ * @param alertgroupId alertgroupId
+ * @param receivers receivers
+ * @param receiversCc receiversCc
+ * @param processInstanceId processInstanceId
* @param processInstanceName processInstanceName
- * @param taskId taskId
- * @param taskName taskName
+ * @param taskId taskId
+ * @param taskName taskName
*/
public void sendTaskTimeoutAlert(int alertgroupId, String receivers, String receiversCc, int processInstanceId,
String processInstanceName, int taskId, String taskName) {
@@ -214,4 +223,29 @@ public class AlertDao extends AbstractBaseDao {
return alertMapper;
}
+ /**
+ * list all alert plugin instance by alert group id
+ *
+ * @param alertGroupId alert group id
+ * @return AlertPluginInstance list
+ */
+ public List<AlertPluginInstance> listInstanceByAlertGroupId(int alertGroupId) {
+ return alertPluginInstanceMapper.queryByAlertGroupId(alertGroupId);
+ }
+
+ public AlertPluginInstanceMapper getAlertPluginInstanceMapper() {
+ return alertPluginInstanceMapper;
+ }
+
+ public void setAlertPluginInstanceMapper(AlertPluginInstanceMapper alertPluginInstanceMapper) {
+ this.alertPluginInstanceMapper = alertPluginInstanceMapper;
+ }
+
+ public AlertGroupMapper getAlertGroupMapper() {
+ return alertGroupMapper;
+ }
+
+ public void setAlertGroupMapper(AlertGroupMapper alertGroupMapper) {
+ this.alertGroupMapper = alertGroupMapper;
+ }
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
new file mode 100644
index 0000000..ab82997
--- /dev/null
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.dao;
+
+import static java.util.Objects.requireNonNull;
+
+import org.apache.dolphinscheduler.dao.datasource.ConnectionFactory;
+import org.apache.dolphinscheduler.dao.entity.PluginDefine;
+import org.apache.dolphinscheduler.dao.mapper.PluginDefineMapper;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PluginDao extends AbstractBaseDao {
+
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Autowired
+ private PluginDefineMapper pluginDefineMapper;
+
+ @Override
+ protected void init() {
+ pluginDefineMapper = ConnectionFactory.getInstance().getMapper(PluginDefineMapper.class);
+ }
+
+ /**
+ * add pluginDefine
+ *
+ * @param pluginDefine plugin define entiy
+ * @return plugin define id
+ */
+ public int addPluginDefine(PluginDefine pluginDefine) {
+ return pluginDefineMapper.insert(pluginDefine);
+ }
+
+ /**
+ * add or update plugin define
+ *
+ * @param pluginDefine new pluginDefine
+ */
+ public void addOrUpdatePluginDefine(PluginDefine pluginDefine) {
+ requireNonNull(pluginDefine, "pluginDefine is null");
+ requireNonNull(pluginDefine.getPluginName(), "pluginName is null");
+ requireNonNull(pluginDefine.getPluginType(), "pluginType is null");
+
+ List<PluginDefine> pluginDefineList = pluginDefineMapper.queryByNameAndType(pluginDefine.getPluginName(), pluginDefine.getPluginType());
+ if (pluginDefineList == null || pluginDefineList.size() == 0) {
+ pluginDefineMapper.insert(pluginDefine);
+ } else {
+ PluginDefine currPluginDefine = pluginDefineList.get(0);
+ if (!currPluginDefine.getPluginParams().equals(pluginDefine.getPluginParams())) {
+ currPluginDefine.setUpdateTime(pluginDefine.getUpdateTime());
+ currPluginDefine.setPluginParams(pluginDefine.getPluginParams());
+ pluginDefineMapper.updateById(currPluginDefine);
+ }
+ }
+ }
+
+ /**
+ * query plugin define by id
+ *
+ * @param pluginDefineId plugin define id
+ * @return PluginDefine
+ */
+ public PluginDefine getPluginDefineById(int pluginDefineId) {
+ return pluginDefineMapper.selectById(pluginDefineId);
+ }
+
+ public PluginDefineMapper getPluginDefineMapper() {
+ return pluginDefineMapper;
+ }
+
+ public void setPluginDefineMapper(PluginDefineMapper pluginDefineMapper) {
+ this.pluginDefineMapper = pluginDefineMapper;
+ }
+}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
index cfd4995..5f0796c 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
@@ -14,20 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.dao.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import org.apache.dolphinscheduler.common.enums.AlertStatus;
import org.apache.dolphinscheduler.common.enums.AlertType;
-import org.apache.dolphinscheduler.common.enums.ShowType;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
@TableName("t_ds_alert")
public class Alert {
/**
@@ -43,8 +44,9 @@ public class Alert {
/**
* show_type
*/
+ //TODO ShowType should be delete from Alert, Because showType is move to the plugin params
@TableField(value = "show_type")
- private ShowType showType;
+ private String showType;
/**
* content
*/
@@ -53,6 +55,7 @@ public class Alert {
/**
* alert_type
*/
+ //TODO alertType should be delete from Alert, because alert type is decide by the AlertPlugin instance
@TableField(value = "alert_type")
private AlertType alertType;
/**
@@ -73,11 +76,13 @@ public class Alert {
/**
* receivers
*/
+ //TODO receivers should be delete from Alert, because only email alert need receivers . And receivers is move to Email Alert Plugin params.
@TableField("receivers")
private String receivers;
/**
* receivers_cc
*/
+ //TODO receivers_cc should be delete from Alert, because only email alert need receivers_cc . And receivers_cc is move to Email Alert Plugin params.
@TableField("receivers_cc")
private String receiversCc;
/**
@@ -112,13 +117,13 @@ public class Alert {
this.title = title;
}
- public ShowType getShowType() {
- return showType;
- }
-
- public void setShowType(ShowType showType) {
- this.showType = showType;
- }
+ // public String getShowType() {
+ // return showType;
+ // }
+ //
+ // public void setShowType(String showType) {
+ // this.showType = showType;
+ // }
public String getContent() {
return content;
@@ -268,20 +273,37 @@ public class Alert {
@Override
public String toString() {
- return "Alert{" +
- "id=" + id +
- ", title='" + title + '\'' +
- ", showType=" + showType +
- ", content='" + content + '\'' +
- ", alertType=" + alertType +
- ", alertStatus=" + alertStatus +
- ", log='" + log + '\'' +
- ", alertGroupId=" + alertGroupId +
- ", receivers='" + receivers + '\'' +
- ", receiversCc='" + receiversCc + '\'' +
- ", createTime=" + createTime +
- ", updateTime=" + updateTime +
- ", info=" + info +
- '}';
+ return "Alert{"
+ + "id="
+ + id
+ + ", title='"
+ + title + '\''
+ + ", showType="
+ + showType
+ + ", content='"
+ + content
+ + '\''
+ + ", alertType="
+ + alertType
+ + ", alertStatus="
+ + alertStatus
+ + ", log='"
+ + log
+ + '\''
+ + ", alertGroupId="
+ + alertGroupId
+ + ", receivers='"
+ + receivers
+ + '\''
+ + ", receiversCc='"
+ + receiversCc
+ + '\''
+ + ", createTime="
+ + createTime
+ + ", updateTime="
+ + updateTime
+ + ", info="
+ + info
+ + '}';
}
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java
new file mode 100644
index 0000000..c5918ce
--- /dev/null
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.dao.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * t_ds_alert_plugin_instance
+ */
+@TableName("t_ds_alert_plugin_instance")
+public class AlertPluginInstance {
+
+ /**
+ * id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private int id;
+
+ /**
+ * alert group id
+ */
+ @TableField("alert_group_id")
+ private int alertGroupId;
+
+ /**
+ * plugin_define_id
+ */
+ @TableField("plugin_define_id")
+ private int pluginDefineId;
+
+ /**
+ * alert plugin instance name
+ */
+ @TableField("instance_name")
+ private String instanceName;
+
+ /**
+ * plugin_instance_params
+ */
+ @TableField("plugin_instance_params")
+ private String pluginInstanceParams;
+
+ /**
+ * create_time
+ */
+ @TableField("create_time")
+ private Date createTime;
+
+ /**
+ * update_time
+ */
+ @TableField("update_time")
+ private Date updateTime;
+
+ public AlertPluginInstance() {
+ this.createTime = new Date();
+ this.updateTime = new Date();
+ }
+
+ public AlertPluginInstance(int pluginDefineId, String pluginInstanceParams, int alertGroupId, String instanceName) {
+ this.pluginDefineId = pluginDefineId;
+ this.pluginInstanceParams = pluginInstanceParams;
+ this.alertGroupId = alertGroupId;
+ this.createTime = new Date();
+ this.updateTime = new Date();
+ this.instanceName = instanceName;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public int getPluginDefineId() {
+ return pluginDefineId;
+ }
+
+ public void setPluginDefineId(int pluginDefineId) {
+ this.pluginDefineId = pluginDefineId;
+ }
+
+ public String getPluginInstanceParams() {
+ return pluginInstanceParams;
+ }
+
+ public void setPluginInstanceParams(String pluginInstanceParams) {
+ this.pluginInstanceParams = pluginInstanceParams;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public int getAlertGroupId() {
+ return alertGroupId;
+ }
+
+ public void setAlertGroupId(int alertGroupId) {
+ this.alertGroupId = alertGroupId;
+ }
+
+ public String getInstanceName() {
+ return instanceName;
+ }
+
+ public void setInstanceName(String instanceName) {
+ this.instanceName = instanceName;
+ }
+}
+
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/PluginDefine.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/PluginDefine.java
new file mode 100644
index 0000000..2be8988
--- /dev/null
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/PluginDefine.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.dao.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * t_ds_plugin_define
+ */
+@TableName("t_ds_plugin_define")
+public class PluginDefine {
+
+ /**
+ * id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private int id;
+
+ /**
+ * plugin name
+ */
+ @TableField("plugin_name")
+ private String pluginName;
+
+ /**
+ * plugin_type
+ */
+ @TableField("plugin_type")
+ private String pluginType;
+
+ /**
+ * plugin_params
+ */
+ @TableField("plugin_params")
+ private String pluginParams;
+
+ /**
+ * create_time
+ */
+ @TableField("create_time")
+ private Date createTime;
+
+ /**
+ * update_time
+ */
+ @TableField("update_time")
+ private Date updateTime;
+
+ public PluginDefine(String pluginName, String pluginType, String pluginParams) {
+ this.pluginName = pluginName;
+ this.pluginType = pluginType;
+ this.pluginParams = pluginParams;
+ this.createTime = new Date();
+ this.updateTime = new Date();
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getPluginName() {
+ return pluginName;
+ }
+
+ public void setPluginName(String pluginName) {
+ this.pluginName = pluginName;
+ }
+
+ public String getPluginType() {
+ return pluginType;
+ }
+
+ public void setPluginType(String pluginType) {
+ this.pluginType = pluginType;
+ }
+
+ public String getPluginParams() {
+ return pluginParams;
+ }
+
+ public void setPluginParams(String pluginParams) {
+ this.pluginParams = pluginParams;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+}
+
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.java
similarity index 54%
rename from dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java
rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.java
index 965677e..8c7a4d0 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.java
@@ -14,26 +14,31 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.alert.template;
-import org.apache.dolphinscheduler.alert.template.impl.DefaultHTMLTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package org.apache.dolphinscheduler.dao.mapper;
-/**
- * the alert template factory
- */
-public class AlertTemplateFactory {
+import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
- private static final Logger logger = LoggerFactory.getLogger(AlertTemplateFactory.class);
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
- private AlertTemplateFactory(){}
+public interface AlertPluginInstanceMapper extends BaseMapper<AlertPluginInstance> {
+
+ /**
+ * query all alert plugin instance
+ *
+ * @return AlertPluginInstance list
+ */
+ List<AlertPluginInstance> queryAllAlertPluginInstanceList();
/**
- * get a template from alert.properties conf file
- * @return a template, default is DefaultHTMLTemplate
+ * query by alert group id
+ *
+ * @param alertGroupId
+ * @return AlertPluginInstance list
*/
- public static AlertTemplate getMessageTemplate() {
- return new DefaultHTMLTemplate();
- }
+ List<AlertPluginInstance> queryByAlertGroupId(@Param("alertGroupId") int alertGroupId);
}
diff --git a/dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.java
similarity index 50%
copy from dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java
copy to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.java
index deb7ff6..14e4681 100644
--- a/dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.java
@@ -14,32 +14,40 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.plugin.api;
-import org.apache.dolphinscheduler.plugin.model.AlertInfo;
-import org.apache.dolphinscheduler.plugin.model.PluginName;
+package org.apache.dolphinscheduler.dao.mapper;
-import java.util.Map;
+import org.apache.dolphinscheduler.dao.entity.PluginDefine;
-/**
- * Plugin
- */
-public interface AlertPlugin {
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface PluginDefineMapper extends BaseMapper<PluginDefine> {
/**
- * Get alert plugin id
+ * query all plugin define
*
- * @return alert plugin id, which should be unique
+ * @return PluginDefine list
*/
- String getId();
+ List<PluginDefine> queryAllPluginDefineList();
/**
- * Get alert plugin name, which will show in front end portal
+ * query by plugin type
*
- * @return plugin name
+ * @param pluginType pluginType
+ * @return PluginDefine list
*/
- PluginName getName();
-
- Map<String, Object> process(AlertInfo info);
+ List<PluginDefine> queryByPluginType(@Param("pluginType") String pluginType);
+ /**
+ * query by name and type
+ *
+ * @param pluginName
+ * @param pluginType
+ * @return
+ */
+ List<PluginDefine> queryByNameAndType(@Param("pluginName") String pluginName, @Param("pluginType") String pluginType);
}
diff --git a/dolphinscheduler-dao/src/main/resources/datasource.properties b/dolphinscheduler-dao/src/main/resources/datasource.properties
index 25ac220..d55e36a 100644
--- a/dolphinscheduler-dao/src/main/resources/datasource.properties
+++ b/dolphinscheduler-dao/src/main/resources/datasource.properties
@@ -15,9 +15,15 @@
# limitations under the License.
#
+# mysql
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://localhost:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
+#spring.datasource.username=root
+#spring.datasource.password=123456
+
# postgresql
spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler
+spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
spring.datasource.username=test
spring.datasource.password=test
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.xml
new file mode 100644
index 0000000..1fc0f6b
--- /dev/null
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper">
+ <select id="queryAllAlertPluginInstanceList" resultType="org.apache.dolphinscheduler.dao.entity.AlertPluginInstance">
+ select *
+ from t_ds_alert_plugin_instance
+ where 1=1
+ </select>
+
+ <select id="queryByAlertGroupId" resultType="org.apache.dolphinscheduler.dao.entity.AlertPluginInstance">
+ select *
+ from t_ds_alert_plugin_instance
+ where alert_group_id = #{alertGroupId}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.xml
new file mode 100644
index 0000000..f4a6f13
--- /dev/null
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="org.apache.dolphinscheduler.dao.mapper.PluginDefineMapper">
+ <select id="queryAllPluginDefineList" resultType="org.apache.dolphinscheduler.dao.entity.PluginDefine">
+ select *
+ from t_ds_plugin_define
+ where 1=1
+ </select>
+
+ <select id="queryByPluginType" resultType="org.apache.dolphinscheduler.dao.entity.PluginDefine">
+ select *
+ from t_ds_plugin_define
+ where plugin_type = #{pluginType}
+ </select>
+
+ <select id="queryByNameAndType" resultType="org.apache.dolphinscheduler.dao.entity.PluginDefine">
+ select *
+ from t_ds_plugin_define
+ where plugin_name = #{pluginName} and plugin_type = #{pluginType}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/AlertDaoTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/AlertDaoTest.java
index ef3f0ff..0b5c516 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/AlertDaoTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/AlertDaoTest.java
@@ -14,27 +14,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.dao;
import org.apache.dolphinscheduler.common.enums.AlertStatus;
import org.apache.dolphinscheduler.common.enums.AlertType;
-import org.apache.dolphinscheduler.common.enums.ShowType;
import org.apache.dolphinscheduler.dao.entity.Alert;
-import org.junit.Assert;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.util.Arrays;
import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
+
public class AlertDaoTest {
+
@Test
- public void testAlertDao(){
+ public void testAlertDao() {
AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
Alert alert = new Alert();
alert.setTitle("Mysql Exception");
- alert.setShowType(ShowType.TEXT);
+ //alert.setShowType(ShowType.TEXT);
alert.setContent("[\"alarm time：2018-02-05\", \"service name：MYSQL_ALTER\", \"alarm name：MYSQL_ALTER_DUMP\", " +
"\"get the alarm exception.！，interface error，exception information：timed out\", \"request address：http://blog.csdn.net/dreamInTheWorld/article/details/78539286\"]");
alert.setAlertType(AlertType.EMAIL);
@@ -42,7 +41,6 @@ public class AlertDaoTest {
alert.setAlertStatus(AlertStatus.WAIT_EXECUTION);
alertDao.addAlert(alert);
-
List<Alert> alerts = alertDao.listWaitExecutionAlert();
Assert.assertNotNull(alerts);
Assert.assertNotEquals(0, alerts.size());
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java
index 064305d..24b9719 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java
@@ -14,14 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.dolphinscheduler.dao.mapper;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
import org.apache.dolphinscheduler.common.enums.AlertStatus;
import org.apache.dolphinscheduler.common.enums.AlertType;
-import org.apache.dolphinscheduler.common.enums.ShowType;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.dao.entity.Alert;
-import org.junit.Assert;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,13 +39,8 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
/**
- * alert mapper test
+ * alert mapper test
*/
@RunWith(SpringRunner.class)
@SpringBootTest
@@ -49,21 +53,22 @@ public class AlertMapperTest {
/**
* test insert
+ *
* @return
*/
@Test
- public void testInsert(){
+ public void testInsert() {
Alert expectedAlert = createAlert();
assertThat(expectedAlert.getId(), greaterThan(0));
}
-
/**
* test select by id
+ *
* @return
*/
@Test
- public void testSelectById(){
+ public void testSelectById() {
Alert expectedAlert = createAlert();
Alert actualAlert = alertMapper.selectById(expectedAlert.getId());
assertEquals(expectedAlert, actualAlert);
@@ -73,7 +78,7 @@ public class AlertMapperTest {
* test update
*/
@Test
- public void testUpdate(){
+ public void testUpdate() {
Alert expectedAlert = createAlert();
@@ -92,7 +97,7 @@ public class AlertMapperTest {
* test delete
*/
@Test
- public void testDelete(){
+ public void testDelete() {
Alert expectedAlert = createAlert();
alertMapper.deleteById(expectedAlert.getId());
@@ -102,7 +107,6 @@ public class AlertMapperTest {
assertNull(actualAlert);
}
-
/**
* test list alert by status
*/
@@ -111,54 +115,54 @@ public class AlertMapperTest {
Integer count = 10;
AlertStatus waitExecution = AlertStatus.WAIT_EXECUTION;
- Map<Integer,Alert> expectedAlertMap = createAlertMap(count, waitExecution);
+ Map<Integer, Alert> expectedAlertMap = createAlertMap(count, waitExecution);
List<Alert> actualAlerts = alertMapper.listAlertByStatus(waitExecution);
- for (Alert actualAlert : actualAlerts){
+ for (Alert actualAlert : actualAlerts) {
Alert expectedAlert = expectedAlertMap.get(actualAlert.getId());
- if (expectedAlert != null){
- assertEquals(expectedAlert,actualAlert);
+ if (expectedAlert != null) {
+ assertEquals(expectedAlert, actualAlert);
}
}
}
/**
- * create alert map
- * @param count alert count
+ * create alert map
+ *
+ * @param count alert count
* @param alertStatus alert status
* @return alert map
*/
- private Map<Integer,Alert> createAlertMap(Integer count,AlertStatus alertStatus){
- Map<Integer,Alert> alertMap = new HashMap<>();
+ private Map<Integer, Alert> createAlertMap(Integer count, AlertStatus alertStatus) {
+ Map<Integer, Alert> alertMap = new HashMap<>();
- for (int i = 0 ; i < count ;i++){
+ for (int i = 0; i < count; i++) {
Alert alert = createAlert(alertStatus);
- alertMap.put(alert.getId(),alert);
+ alertMap.put(alert.getId(), alert);
}
-
return alertMap;
-
}
-
/**
* create alert
+ *
* @return alert
* @throws Exception
*/
- private Alert createAlert(){
+ private Alert createAlert() {
return createAlert(AlertStatus.WAIT_EXECUTION);
}
/**
* create alert
+ *
* @param alertStatus alert status
* @return alert
*/
- private Alert createAlert(AlertStatus alertStatus){
+ private Alert createAlert(AlertStatus alertStatus) {
Alert alert = new Alert();
- alert.setShowType(ShowType.TABLE);
+ //alert.setShowType(ShowType.TABLE);
alert.setTitle("test alert");
alert.setContent("[{'type':'WORKER','host':'192.168.xx.xx','event':'server down','warning level':'serious'}]");
alert.setAlertType(AlertType.EMAIL);
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapperTest.java
new file mode 100644
index 0000000..3fa5fcc
--- /dev/null
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapperTest.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.dao.mapper;
+
+import org.apache.dolphinscheduler.common.enums.AlertType;
+import org.apache.dolphinscheduler.common.utils.DateUtils;
+import org.apache.dolphinscheduler.dao.entity.AlertGroup;
+import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
+import org.apache.dolphinscheduler.dao.entity.PluginDefine;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * AlertPluginInstanceMapper mapper test
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Transactional
+@Rollback(true)
+public class AlertPluginInstanceMapperTest {
+
+ @Autowired
+ AlertPluginInstanceMapper alertPluginInstanceMapper;
+
+ @Autowired
+ PluginDefineMapper pluginDefineMapper;
+
+ @Autowired
+ AlertGroupMapper alertGroupMapper;
+
+ @Test
+ public void testQueryAllAlertPluginInstanceList() {
+ AlertPluginInstance alertPluginInstance = createAlertPluginInstance();
+ List<AlertPluginInstance> alertPluginInstanceList = alertPluginInstanceMapper.queryAllAlertPluginInstanceList();
+ Assert.assertTrue(alertPluginInstanceList.size() > 0);
+ }
+
+ @Test
+ public void testQueryByAlertGroupId() {
+ createAlertPluginInstance();
+ List<AlertGroup> testAlertGroupList = alertGroupMapper.queryByGroupName("test_group_01");
+ Assert.assertNotNull(testAlertGroupList);
+ Assert.assertTrue(testAlertGroupList.size() > 0);
+ AlertGroup alertGroup = testAlertGroupList.get(0);
+ List<AlertPluginInstance> alertPluginInstances = alertPluginInstanceMapper.queryByAlertGroupId(alertGroup.getId());
+ Assert.assertNotNull(alertPluginInstances);
+ Assert.assertTrue(alertPluginInstances.size() > 0);
+ Assert.assertEquals("test_instance", alertPluginInstances.get(0).getInstanceName());
+ }
+
+ /**
+ * insert
+ *
+ * @return AlertPluginInstance
+ */
+ private AlertPluginInstance createAlertPluginInstance() {
+
+ PluginDefine pluginDefine = createPluginDefine();
+ AlertGroup alertGroup = createAlertGroup("test_group_01");
+ AlertPluginInstance alertPluginInstance = new AlertPluginInstance(pluginDefine.getId(), "", alertGroup.getId(), "test_instance");
+ alertPluginInstanceMapper.insert(alertPluginInstance);
+ return alertPluginInstance;
+ }
+
+ /**
+ * insert
+ *
+ * @return PluginDefine
+ */
+ private PluginDefine createPluginDefine() {
+ PluginDefine pluginDefine = new PluginDefine("test plugin", "alert", "");
+ pluginDefineMapper.insert(pluginDefine);
+ return pluginDefine;
+ }
+
+ /**
+ * insert
+ *
+ * @return AlertGroup
+ */
+ private AlertGroup createAlertGroup(String groupName) {
+ AlertGroup alertGroup = new AlertGroup();
+ alertGroup.setGroupName(groupName);
+ alertGroup.setDescription("alert group 1");
+ alertGroup.setGroupType(AlertType.EMAIL);
+
+ alertGroup.setCreateTime(DateUtils.getCurrentDate());
+ alertGroup.setUpdateTime(DateUtils.getCurrentDate());
+
+ alertGroupMapper.insert(alertGroup);
+
+ return alertGroup;
+ }
+}
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/PluginDefineTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/PluginDefineTest.java
new file mode 100644
index 0000000..d8636a6
--- /dev/null
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/PluginDefineTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.dao.mapper;
+
+import org.apache.dolphinscheduler.dao.entity.PluginDefine;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Transactional
+@Rollback(true)
+
+public class PluginDefineTest {
+
+ @Autowired
+ PluginDefineMapper pluginDefineMapper;
+
+ @Test
+ public void testQueryAllPluginDefineList() {
+ createPluginDefine();
+ List<PluginDefine> pluginDefines = pluginDefineMapper.queryAllPluginDefineList();
+ Assert.assertTrue(pluginDefines.size() > 0);
+ }
+
+ @Test
+ public void testQeryByPluginType() {
+ PluginDefine pluginDefine = createPluginDefine();
+ List<PluginDefine> pluginDefines = pluginDefineMapper.queryByPluginType(pluginDefine.getPluginType());
+ Assert.assertTrue(pluginDefines.size() > 0);
+ Assert.assertEquals(pluginDefines.get(0).getPluginType(), pluginDefine.getPluginType());
+ }
+
+ @Test
+ public void testQueryByNameAndType() {
+ PluginDefine pluginDefine = createPluginDefine();
+ List<PluginDefine> pluginDefines = pluginDefineMapper.queryByNameAndType(pluginDefine.getPluginName(), pluginDefine.getPluginType());
+ Assert.assertTrue(pluginDefines.size() > 0);
+ Assert.assertEquals(pluginDefines.get(0).getPluginType(), pluginDefine.getPluginType());
+ Assert.assertEquals(pluginDefines.get(0).getPluginName(), pluginDefine.getPluginName());
+ }
+
+ /**
+ * insert
+ *
+ * @return PluginDefine
+ */
+ private PluginDefine createPluginDefine() {
+ PluginDefine pluginDefine = new PluginDefine("test plugin", "alert", "");
+ pluginDefineMapper.insert(pluginDefine);
+ return pluginDefine;
+ }
+}
diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE
index 9a0fdae..6fa1ea9 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -1,4 +1,4 @@
- Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -237,7 +237,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
commons-configuration 1.10: https://mvnrepository.com/artifact/commons-configuration/commons-configuration/1.10, Apache 2.0
commons-daemon 1.0.13 https://mvnrepository.com/artifact/commons-daemon/commons-daemon/1.0.13, Apache 2.0
commons-dbcp 1.4: https://github.com/apache/commons-dbcp, Apache 2.0
- commons-email 1.5: https://github.com/apache/commons-email, Apache 2.0
commons-httpclient 3.0.1: https://mvnrepository.com/artifact/commons-httpclient/commons-httpclient/3.0.1, Apache 2.0
commons-io 2.4: https://github.com/apache/commons-io, Apache 2.0
commons-lang 2.6: https://github.com/apache/commons-lang, Apache 2.0
@@ -254,8 +253,9 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
datanucleus-rdbms 4.1.7: https://mvnrepository.com/artifact/org.datanucleus/datanucleus-rdbms/4.1.7, Apache 2.0
derby 10.14.2.0: https://github.com/apache/derby, Apache 2.0
druid 1.1.14: https://mvnrepository.com/artifact/com.alibaba/druid/1.1.14, Apache 2.0
+ error_prone_annotations 2.1.3 https://mvnrepository.com/artifact/com.google.errorprone/error_prone_annotations/2.1.3, Apache 2.0
gson 2.8.5: https://github.com/google/gson, Apache 2.0
- guava 20.0: https://mvnrepository.com/artifact/com.google.guava/guava/20.0, Apache 2.0
+ guava 24.1-jre: https://mvnrepository.com/artifact/com.google.guava/guava/24.1-jre, Apache 2.0
guice 3.0: https://mvnrepository.com/artifact/com.google.inject/guice/3.0, Apache 2.0
guice-servlet 3.0: https://mvnrepository.com/artifact/com.google.inject.extensions/guice-servlet/3.0, Apache 2.0
hadoop-annotations 2.7.3:https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-annotations/2.7.3, Apache 2.0
@@ -323,6 +323,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
jsqlparser 2.1: https://github.com/JSQLParser/JSqlParser, Apache 2.0 or LGPL 2.1
jsp-api-2.1 6.1.14: https://mvnrepository.com/artifact/org.mortbay.jetty/jsp-api-2.1/6.1.14, Apache 2.0
jsr305 3.0.0: https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305, Apache 2.0
+ j2objc-annotations 1.1 https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/1.1, Apache 2.0
libfb303 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libfb303/0.9.3, Apache 2.0
libthrift 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libthrift/0.9.3, Apache 2.0
log4j-api 2.11.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/2.11.2, Apache 2.0
@@ -414,10 +415,8 @@ CDDL licenses
The following components are provided under the CDDL License. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
- activation 1.1: https://mvnrepository.com/artifact/javax.activation/activation/1.1 CDDL 1.0
javax.activation-api 1.2.0: https://mvnrepository.com/artifact/javax.activation/javax.activation-api/1.2.0, CDDL and LGPL 2.0
javax.annotation-api 1.3.2: https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api/1.3.2, CDDL + GPLv2
- javax.mail 1.6.2: https://mvnrepository.com/artifact/com.sun.mail/javax.mail/1.6.2, CDDL/GPLv2
javax.servlet-api 3.1.0: https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api/3.1.0, CDDL + GPLv2
jaxb-api 2.3.1: https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api/2.3.1, CDDL 1.1
jaxb-impl 2.2.3-1: https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl/2.2.3-1, CDDL and GPL 1.1
@@ -456,6 +455,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
jul-to-slf4j 1.7.25: https://mvnrepository.com/artifact/org.slf4j/jul-to-slf4j/1.7.25, MIT
mssql-jdbc 6.1.0.jre8: https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc/6.1.0.jre8, MIT
slf4j-api 1.7.5: https://mvnrepository.com/artifact/org.slf4j/slf4j-api/1.7.5, MIT
+ animal-sniffer-annotations 1.14 https://mvnrepository.com/artifact/org.codehaus.mojo/animal-sniffer-annotations/1.14, MIT
+ checker-compat-qual 2.0.0 https://mvnrepository.com/artifact/org.checkerframework/checker-compat-qual/2.0.0, MIT + GPLv2
========================================================================
MPL 1.1 licenses
@@ -515,4 +516,4 @@ Apache 2.0 licenses
========================================
BSD licenses
========================================
- d3 3.5.17: https://github.com/d3/d3 BSD-3-Clause
+ d3 3.5.17: https://github.com/d3/d3 BSD-3-Clause
\ No newline at end of file
diff --git a/dolphinscheduler-dist/release-docs/NOTICE b/dolphinscheduler-dist/release-docs/NOTICE
index 901659e..61076b9 100644
--- a/dolphinscheduler-dist/release-docs/NOTICE
+++ b/dolphinscheduler-dist/release-docs/NOTICE
@@ -1917,26 +1917,3 @@ ANT NOTICE
Please read the different LICENSE files present in the root directory of
this distribution.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-aether-api.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-aether-api.txt
new file mode 100644
index 0000000..3fa0083
--- /dev/null
+++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-aether-api.txt
@@ -0,0 +1,86 @@
+Eclipse Public License - v 1.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contributio [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Ag [...]
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF [...]
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-animal-sniffer-annotations.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-animal-sniffer-annotations.txt
new file mode 100644
index 0000000..2062eb8
--- /dev/null
+++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-animal-sniffer-annotations.txt
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2009 codehaus.org.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-checker-compat-qual.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-checker-compat-qual.txt
new file mode 100644
index 0000000..7b59b5c
--- /dev/null
+++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-checker-compat-qual.txt
@@ -0,0 +1,22 @@
+Checker Framework qualifiers
+Copyright 2004-present by the Checker Framework developers
+
+MIT License:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/LICENSE b/dolphinscheduler-dist/release-docs/licenses/LICENSE-j2objc-annotations.txt
similarity index 91%
copy from LICENSE
copy to dolphinscheduler-dist/release-docs/licenses/LICENSE-j2objc-annotations.txt
index 9a0c6aa..989e2c5 100644
--- a/LICENSE
+++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-j2objc-annotations.txt
@@ -1,4 +1,4 @@
- Apache License
+Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -198,21 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
-=======================================================================
-Apache DolphinScheduler (incubating) Subcomponents:
-
-The Apache DolphinScheduler (incubating) project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
-========================================================================
-Apache 2.0 licenses
-========================================================================
-
-The following components are provided under the Apache License. See project link for details.
-The text of each license is the standard Apache 2.0 license.
- ScriptRunner from https://github.com/mybatis/mybatis-3 Apache 2.0
- mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
- PropertyPlaceholderHelper from https://github.com/spring-projects/spring-framework Apache 2.0
+ limitations under the License.
\ No newline at end of file
diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt
deleted file mode 100644
index 5ad62c4..0000000
--- a/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt
+++ /dev/null
@@ -1,759 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
-
-1. Definitions.
-
- 1.1. "Contributor" means each individual or entity that creates or
- contributes to the creation of Modifications.
-
- 1.2. "Contributor Version" means the combination of the Original
- Software, prior Modifications used by a Contributor (if any), and
- the Modifications made by that particular Contributor.
-
- 1.3. "Covered Software" means (a) the Original Software, or (b)
- Modifications, or (c) the combination of files containing Original
- Software with files containing Modifications, in each case including
- portions thereof.
-
- 1.4. "Executable" means the Covered Software in any form other than
- Source Code.
-
- 1.5. "Initial Developer" means the individual or entity that first
- makes Original Software available under this License.
-
- 1.6. "Larger Work" means a work which combines Covered Software or
- portions thereof with code not governed by the terms of this License.
-
- 1.7. "License" means this document.
-
- 1.8. "Licensable" means having the right to grant, to the maximum
- extent possible, whether at the time of the initial grant or
- subsequently acquired, any and all of the rights conveyed herein.
-
- 1.9. "Modifications" means the Source Code and Executable form of
- any of the following:
-
- A. Any file that results from an addition to, deletion from or
- modification of the contents of a file containing Original Software
- or previous Modifications;
-
- B. Any new file that contains any part of the Original Software or
- previous Modification; or
-
- C. Any new file that is contributed or otherwise made available
- under the terms of this License.
-
- 1.10. "Original Software" means the Source Code and Executable form
- of computer software code that is originally released under this
- License.
-
- 1.11. "Patent Claims" means any patent claim(s), now owned or
- hereafter acquired, including without limitation, method, process,
- and apparatus claims, in any patent Licensable by grantor.
-
- 1.12. "Source Code" means (a) the common form of computer software
- code in which modifications are made and (b) associated
- documentation included in or with such code.
-
- 1.13. "You" (or "Your") means an individual or a legal entity
- exercising rights under, and complying with all of the terms of,
- this License. For legal entities, "You" includes any entity which
- controls, is controlled by, or is under common control with You. For
- purposes of this definition, "control" means (a) the power, direct
- or indirect, to cause the direction or management of such entity,
- whether by contract or otherwise, or (b) ownership of more than
- fifty percent (50%) of the outstanding shares or beneficial
- ownership of such entity.
-
-2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject
- to third party intellectual property claims, the Initial Developer
- hereby grants You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or
- trademark) Licensable by Initial Developer, to use, reproduce,
- modify, display, perform, sublicense and distribute the Original
- Software (or portions thereof), with or without Modifications,
- and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of
- Original Software, to make, have made, use, practice, sell, and
- offer for sale, and/or otherwise dispose of the Original Software
- (or portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on
- the date Initial Developer first distributes or otherwise makes the
- Original Software available to a third party under the terms of this
- License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is
- granted: (1) for code that You delete from the Original Software, or
- (2) for infringements caused by: (i) the modification of the
- Original Software, or (ii) the combination of the Original Software
- with other software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject
- to third party intellectual property claims, each Contributor hereby
- grants You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or
- trademark) Licensable by Contributor to use, reproduce, modify,
- display, perform, sublicense and distribute the Modifications
- created by such Contributor (or portions thereof), either on an
- unmodified basis, with other Modifications, as Covered Software
- and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling
- of Modifications made by that Contributor either alone and/or in
- combination with its Contributor Version (or portions of such
- combination), to make, use, sell, offer for sale, have made, and/or
- otherwise dispose of: (1) Modifications made by that Contributor (or
- portions thereof); and (2) the combination of Modifications made by
- that Contributor with its Contributor Version (or portions of such
- combination).
-
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
- on the date Contributor first distributes or otherwise makes the
- Modifications available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is
- granted: (1) for any code that Contributor has deleted from the
- Contributor Version; (2) for infringements caused by: (i) third
- party modifications of Contributor Version, or (ii) the combination
- of Modifications made by that Contributor with other software
- (except as part of the Contributor Version) or other devices; or (3)
- under Patent Claims infringed by Covered Software in the absence of
- Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
-
- Any Covered Software that You distribute or otherwise make available
- in Executable form must also be made available in Source Code form
- and that Source Code form must be distributed only under the terms
- of this License. You must include a copy of this License with every
- copy of the Source Code form of the Covered Software You distribute
- or otherwise make available. You must inform recipients of any such
- Covered Software in Executable form as to how they can obtain such
- Covered Software in Source Code form in a reasonable manner on or
- through a medium customarily used for software exchange.
-
- 3.2. Modifications.
-
- The Modifications that You create or to which You contribute are
- governed by the terms of this License. You represent that You
- believe Your Modifications are Your original creation(s) and/or You
- have sufficient rights to grant the rights conveyed by this License.
-
- 3.3. Required Notices.
-
- You must include a notice in each of Your Modifications that
- identifies You as the Contributor of the Modification. You may not
- remove or alter any copyright, patent or trademark notices contained
- within the Covered Software, or any notices of licensing or any
- descriptive text giving attribution to any Contributor or the
- Initial Developer.
-
- 3.4. Application of Additional Terms.
-
- You may not offer or impose any terms on any Covered Software in
- Source Code form that alters or restricts the applicable version of
- this License or the recipients' rights hereunder. You may choose to
- offer, and to charge a fee for, warranty, support, indemnity or
- liability obligations to one or more recipients of Covered Software.
- However, you may do so only on Your own behalf, and not on behalf of
- the Initial Developer or any Contributor. You must make it
- absolutely clear that any such warranty, support, indemnity or
- liability obligation is offered by You alone, and You hereby agree
- to indemnify the Initial Developer and every Contributor for any
- liability incurred by the Initial Developer or such Contributor as a
- result of warranty, support, indemnity or liability terms You offer.
-
- 3.5. Distribution of Executable Versions.
-
- You may distribute the Executable form of the Covered Software under
- the terms of this License or under the terms of a license of Your
- choice, which may contain terms different from this License,
- provided that You are in compliance with the terms of this License
- and that the license for the Executable form does not attempt to
- limit or alter the recipient's rights in the Source Code form from
- the rights set forth in this License. If You distribute the Covered
- Software in Executable form under a different license, You must make
- it absolutely clear that any terms which differ from this License
- are offered by You alone, not by the Initial Developer or
- Contributor. You hereby agree to indemnify the Initial Developer and
- every Contributor for any liability incurred by the Initial
- Developer or such Contributor as a result of any such terms You offer.
-
- 3.6. Larger Works.
-
- You may create a Larger Work by combining Covered Software with
- other code not governed by the terms of this License and distribute
- the Larger Work as a single product. In such a case, You must make
- sure the requirements of this License are fulfilled for the Covered
- Software.
-
-4. Versions of the License.
-
- 4.1. New Versions.
-
- Oracle is the initial license steward and may publish revised and/or
- new versions of this License from time to time. Each version will be
- given a distinguishing version number. Except as provided in Section
- 4.3, no one other than the license steward has the right to modify
- this License.
-
- 4.2. Effect of New Versions.
-
- You may always continue to use, distribute or otherwise make the
- Covered Software available under the terms of the version of the
- License under which You originally received the Covered Software. If
- the Initial Developer includes a notice in the Original Software
- prohibiting it from being distributed or otherwise made available
- under any subsequent version of the License, You must distribute and
- make the Covered Software available under the terms of the version
- of the License under which You originally received the Covered
- Software. Otherwise, You may also choose to use, distribute or
- otherwise make the Covered Software available under the terms of any
- subsequent version of the License published by the license steward.
-
- 4.3. Modified Versions.
-
- When You are an Initial Developer and You want to create a new
- license for Your Original Software, You may create and use a
- modified version of this License if You: (a) rename the license and
- remove any references to the name of the license steward (except to
- note that the license differs from this License); and (b) otherwise
- make it clear that the license contains terms which differ from this
- License.
-
-5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
- INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE
- IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
- NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
- THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
- DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
- OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING,
- REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
- ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS
- AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to
- cure such breach within 30 days of becoming aware of the breach.
- Provisions which, by their nature, must remain in effect beyond the
- termination of this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding
- declaratory judgment actions) against Initial Developer or a
- Contributor (the Initial Developer or Contributor against whom You
- assert such claim is referred to as "Participant") alleging that the
- Participant Software (meaning the Contributor Version where the
- Participant is a Contributor or the Original Software where the
- Participant is the Initial Developer) directly or indirectly
- infringes any patent, then any and all rights granted directly or
- indirectly to You by such Participant, the Initial Developer (if the
- Initial Developer is not the Participant) and all Contributors under
- Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
- from Participant terminate prospectively and automatically at the
- expiration of such 60 day notice period, unless if within such 60
- day period You withdraw Your claim with respect to the Participant
- Software against such Participant either unilaterally or pursuant to
- a written agreement with Participant.
-
- 6.3. If You assert a patent infringement claim against Participant
- alleging that the Participant Software directly or indirectly
- infringes any patent where such claim is resolved (such as by
- license or settlement) prior to the initiation of patent
- infringement litigation, then the reasonable value of the licenses
- granted by such Participant under Sections 2.1 or 2.2 shall be taken
- into account in determining the amount or value of any payment or
- license.
-
- 6.4. In the event of termination under Sections 6.1 or 6.2 above,
- all end user licenses that have been validly granted by You or any
- distributor hereunder prior to termination (excluding licenses
- granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
- INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
- COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE
- TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
- LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
- FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
- LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
- POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT
- APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH
- PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
- LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
- LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
- AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a "commercial item," as that term is defined
- in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
- software" (as that term is defined at 48 C.F.R. �
- 252.227-7014(a)(1)) and "commercial computer software documentation"
- as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent
- with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
- (June 1995), all U.S. Government End Users acquire Covered Software
- with only those rights set forth herein. This U.S. Government Rights
- clause is in lieu of, and supersedes, any other FAR, DFAR, or other
- clause or provision that addresses Government rights in computer
- software under this License.
-
-9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the extent
- necessary to make it enforceable. This License shall be governed by
- the law of the jurisdiction specified in a notice contained within
- the Original Software (except to the extent applicable law, if any,
- provides otherwise), excluding such jurisdiction's conflict-of-law
- provisions. Any litigation relating to this License shall be subject
- to the jurisdiction of the courts located in the jurisdiction and
- venue specified in a notice contained within the Original Software,
- with the losing party responsible for costs, including, without
- limitation, court costs and reasonable attorneys' fees and expenses.
- The application of the United Nations Convention on Contracts for
- the International Sale of Goods is expressly excluded. Any law or
- regulation which provides that the language of a contract shall be
- construed against the drafter shall not apply to this License. You
- agree that You alone are responsible for compliance with the United
- States export administration regulations (and the export control
- laws and regulation of any other countries) when You use, distribute
- or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
- responsible for claims and damages arising, directly or indirectly,
- out of its utilization of rights under this License and You agree to
- work with Initial Developer and Contributors to distribute such
- responsibility on an equitable basis. Nothing herein is intended or
- shall be deemed to constitute any admission of liability.
-
-------------------------------------------------------------------------
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws of the
-State of California (excluding conflict-of-law provisions). Any
-litigation relating to this License shall be subject to the jurisdiction
-of the Federal Courts of the Northern District of California and the
-state courts of the State of California, with venue lying in Santa Clara
-County, California.
-
-
-
- The GNU General Public License (GPL) Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor
-Boston, MA 02110-1335
-USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to
-share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public
-License applies to most of the Free Software Foundation's software and
-to any other program whose authors commit to using it. (Some other Free
-Software Foundation software is covered by the GNU Library General
-Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.
-Our General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this
-service if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone
-to deny you these rights or to ask you to surrender the rights. These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis
-or for a fee, you must give the recipients all the rights that you have.
-You must make sure that they, too, receive or can get the source code.
-And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.
-We wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary. To prevent this, we have made it clear that any patent must
-be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a
-notice placed by the copyright holder saying it may be distributed under
-the terms of this General Public License. The "Program", below, refers
-to any such program or work, and a "work based on the Program" means
-either the Program or any derivative work under copyright law: that is
-to say, a work containing the Program or a portion of it, either
-verbatim or with modifications and/or translated into another language.
-(Hereinafter, translation is included without limitation in the term
-"modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of running
-the Program is not restricted, and the output from the Program is
-covered only if its contents constitute a work based on the Program
-(independent of having been made by running the Program). Whether that
-is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously
-and appropriately publish on each copy an appropriate copyright notice
-and disclaimer of warranty; keep intact all the notices that refer to
-this License and to the absence of any warranty; and give any other
-recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of
-it, thus forming a work based on the Program, and copy and distribute
-such modifications or work under the terms of Section 1 above, provided
-that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any part
- thereof, to be licensed as a whole at no charge to all third parties
- under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a notice
- that there is no warranty (or else, saying that you provide a
- warranty) and that users may redistribute the program under these
- conditions, and telling the user how to view a copy of this License.
- (Exception: if the Program itself is interactive but does not
- normally print such an announcement, your work based on the Program
- is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program, and
-can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based on
-the Program, the distribution of the whole must be on the terms of this
-License, whose permissions for other licensees extend to the entire
-whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the
-scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections 1
- and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your cost
- of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer to
- distribute corresponding source code. (This alternative is allowed
- only for noncommercial distribution and only if you received the
- program in object code or executable form with such an offer, in
- accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source code
-means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to control
-compilation and installation of the executable. However, as a special
-exception, the source code distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies the
-executable.
-
-If distribution of executable or object code is made by offering access
-to copy from a designated place, then offering equivalent access to copy
-the source code from the same place counts as distribution of the source
-code, even though third parties are not compelled to copy the source
-along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt otherwise
-to copy, modify, sublicense or distribute the Program is void, and will
-automatically terminate your rights under this License. However, parties
-who have received copies, or rights, from you under this License will
-not have their licenses terminated so long as such parties remain in
-full compliance.
-
-5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and all
-its terms and conditions for copying, distributing or modifying the
-Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further restrictions
-on the recipients' exercise of the rights granted herein. You are not
-responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot distribute
-so as to satisfy simultaneously your obligations under this License and
-any other pertinent obligations, then as a consequence you may not
-distribute the Program at all. For example, if a patent license would
-not permit royalty-free redistribution of the Program by all those who
-receive copies directly or indirectly through you, then the only way you
-could satisfy both it and this License would be to refrain entirely from
-distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is implemented
-by public license practices. Many people have made generous
-contributions to the wide range of software distributed through that
-system in reliance on consistent application of that system; it is up to
-the author/donor to decide if he or she is willing to distribute
-software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be
-a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License may
-add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among countries
-not thus excluded. In such case, this License incorporates the
-limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new
-versions of the General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Program does not specify a version
-number of this License, you may choose any version ever published by the
-Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the
-author to ask for permission. For software which is copyrighted by the
-Free Software Foundation, write to the Free Software Foundation; we
-sometimes make exceptions for this. Our decision will be guided by the
-two goals of preserving the free status of all derivatives of our free
-software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
-YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
-OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- One line to give the program's name and a brief idea of what it does.
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
- `show w'. This is free software, and you are welcome to redistribute
- it under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License. Of course, the commands
-you use may be called something other than `show w' and `show c'; they
-could even be mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- program `Gnomovision' (which makes passes at compilers) written by
- James Hacker.
-
- signature of Ty Coon, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications
-with the library. If this is what you want to do, use the GNU Library
-General Public License instead of this License.
-
-#
-
-Certain source files distributed by Oracle America, Inc. and/or its
-affiliates are subject to the following clarification and special
-exception to the GPLv2, based on the GNU Project exception for its
-Classpath libraries, known as the GNU Classpath Exception, but only
-where Oracle has expressly included in the particular source file's
-header the words "Oracle designates this particular file as subject to
-the "Classpath" exception as provided by Oracle in the LICENSE file
-that accompanied this code."
-
-You should also note that Oracle includes multiple, independent
-programs in this software package. Some of those programs are provided
-under licenses deemed incompatible with the GPLv2 by the Free Software
-Foundation and others. For example, the package includes programs
-licensed under the Apache License, Version 2.0. Such programs are
-licensed to you under their original licenses.
-
-Oracle facilitates your further distribution of this package by adding
-the Classpath Exception to the necessary parts of its GPLv2 code, which
-permits you to use that code in combination with other independent
-modules not licensed under the GPLv2. However, note that this would
-not permit you to commingle code under an incompatible license with
-Oracle's GPLv2 licensed code by, for example, cutting and pasting such
-code into a file also containing Oracle's GPLv2 licensed code and then
-distributing the result. Additionally, if you were to remove the
-Classpath Exception from any of the files to which it applies and
-distribute the result, you would likely be required to license some or
-all of the other code in that distribution under the GPLv2 as well, and
-since the GPLv2 is incompatible with the license terms of some items
-included in the distribution by Oracle, removing the Classpath
-Exception could therefore effectively compromise your ability to
-further distribute the package.
-
-Proceed with caution and we recommend that you obtain the advice of a
-lawyer skilled in open source matters before removing the Classpath
-Exception or making modifications to this package which may
-subsequently be redistributed and/or involve the use of third party
-software.
-
-CLASSPATH EXCEPTION
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License version 2 cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from or
-based on this library. If you modify this library, you may extend this
-exception to your version of the library, but you are not obligated to
-do so. If you do not wish to do so, delete this exception statement
-from your version.
diff --git a/LICENSE b/dolphinscheduler-dist/release-docs/licenses/LICENSE-resolver.txt
similarity index 92%
copy from LICENSE
copy to dolphinscheduler-dist/release-docs/licenses/LICENSE-resolver.txt
index 9a0c6aa..d645695 100644
--- a/LICENSE
+++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-resolver.txt
@@ -1,3 +1,4 @@
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -199,20 +200,3 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-=======================================================================
-Apache DolphinScheduler (incubating) Subcomponents:
-
-The Apache DolphinScheduler (incubating) project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
-========================================================================
-Apache 2.0 licenses
-========================================================================
-
-The following components are provided under the Apache License. See project link for details.
-The text of each license is the standard Apache 2.0 license.
- ScriptRunner from https://github.com/mybatis/mybatis-3 Apache 2.0
- mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
- PropertyPlaceholderHelper from https://github.com/spring-projects/spring-framework Apache 2.0
diff --git a/dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtils.java b/dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtils.java
deleted file mode 100644
index a244dd4..0000000
--- a/dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtils.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.plugin.utils;
-
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-/**
- * property utils
- * single instance
- */
-public class PropertyUtils {
-
- private static final Logger logger = LoggerFactory.getLogger(PropertyUtils.class);
-
- private static final Properties properties = new Properties();
-
- private PropertyUtils() {
- throw new IllegalStateException("PropertyUtils class");
- }
-
- static {
- String propertyFiles = "/plugin.properties";
- InputStream fis = null;
- try {
- fis = PropertyUtils.class.getResourceAsStream(propertyFiles);
- properties.load(fis);
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- if (fis != null) {
- IOUtils.closeQuietly(fis);
- }
- } finally {
- IOUtils.closeQuietly(fis);
- }
- }
-
- /**
- * get property value
- *
- * @param key property name
- * @param defaultVal default value
- * @return property value
- */
- public static String getString(String key, String defaultVal) {
- String val = properties.getProperty(key.trim());
- return val == null ? defaultVal : val;
- }
-
- /**
- * get property value
- *
- * @param key property name
- * @return property value
- */
- public static String getString(String key) {
- if (key == null) {
- return null;
- }
- return properties.getProperty(key.trim());
- }
-
- /**
- * get property value
- *
- * @param key property name
- * @return get property int value , if key == null, then return -1
- */
- public static int getInt(String key) {
- return getInt(key, -1);
- }
-
- /**
- * get int
- *
- * @param key key
- * @param defaultValue default value
- * @return property value
- */
- public static int getInt(String key, int defaultValue) {
- String value = properties.getProperty(key.trim());
- if (value == null) {
- return defaultValue;
- }
- try {
- return Integer.parseInt(value);
- } catch (NumberFormatException e) {
- logger.info(e.getMessage(), e);
- }
- return defaultValue;
- }
-
- /**
- * get property value
- *
- * @param key property name
- * @return property value
- */
- public static boolean getBoolean(String key) {
- String value = properties.getProperty(key.trim());
- if (value == null) {
- return false;
- }
-
- return Boolean.parseBoolean(value);
- }
-
- /**
- * get property value
- *
- * @param key property name
- * @param defaultValue default value
- * @return property value
- */
- public static Boolean getBoolean(String key, boolean defaultValue) {
- String value = properties.getProperty(key.trim());
- if (value == null) {
- return defaultValue;
- }
-
- return Boolean.parseBoolean(value);
- }
-
- /**
- * get property long value
- *
- * @param key key
- * @param defaultVal default value
- * @return property value
- */
- public static long getLong(String key, long defaultVal) {
- String val = getString(key);
- return val == null ? defaultVal : Long.parseLong(val);
- }
-
- /**
- * get long
- *
- * @param key key
- * @return property value
- */
- public static long getLong(String key) {
- return getLong(key, -1);
- }
-
- /**
- * get double
- *
- * @param key key
- * @param defaultVal default value
- * @return property value
- */
- public static double getDouble(String key, double defaultVal) {
- String val = properties.getProperty(key.trim());
- return val == null ? defaultVal : Double.parseDouble(val);
- }
-
- /**
- * @param key key
- * @param type type
- * @param defaultValue default value
- * @param <T> T
- * @return get enum value
- */
- public <T extends Enum<T>> T getEnum(String key, Class<T> type,
- T defaultValue) {
- String val = properties.getProperty(key.trim());
- return val == null ? defaultValue : Enum.valueOf(type, val);
- }
-
-}
diff --git a/dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertDataTest.java b/dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertDataTest.java
deleted file mode 100644
index c19b5bc..0000000
--- a/dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertDataTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.plugin.model;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class AlertDataTest {
-
- private AlertData alertData;
-
- @Before
- public void before() {
- alertData = new AlertData();
- alertData.setId(1)
- .setContent("content")
- .setShowType("email")
- .setTitle("title")
- .setReceivers("receivers")
- .setReceiversCc("cc")
- .setLog("log")
- .setAlertGroupId(1);
- }
-
- @Test
- public void getId() {
- assertEquals(1, alertData.getId());
- }
-
- @Test
- public void getTitle() {
- assertEquals("title", alertData.getTitle());
- }
-
- @Test
- public void getContent() {
- assertEquals("content", alertData.getContent());
- }
-
- @Test
- public void getLog() {
- assertEquals("log", alertData.getLog());
- }
-
- @Test
- public void getAlertGroupId() {
- assertEquals(1, alertData.getAlertGroupId());
- }
-
- @Test
- public void getReceivers() {
- assertEquals("receivers", alertData.getReceivers());
- }
-
- @Test
- public void getReceiversCc() {
- assertEquals("cc", alertData.getReceiversCc());
- }
-
- @Test
- public void getShowType() {
- assertEquals("email", alertData.getShowType());
- }
-}
\ No newline at end of file
diff --git a/dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertInfoTest.java b/dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertInfoTest.java
deleted file mode 100644
index 13eb595..0000000
--- a/dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertInfoTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.plugin.model;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-public class AlertInfoTest {
-
- private AlertInfo alertInfo;
-
- @Before
- public void before() {
- alertInfo = new AlertInfo();
- }
-
- @Test
- public void getAlertProps() {
- Map<String, Object> map = new HashMap<>();
- alertInfo.setAlertProps(map);
- assertNotNull(alertInfo.getAlertProps());
- }
-
- @Test
- public void getProp() {
- alertInfo.addProp("k", "v");
- assertEquals("v", alertInfo.getProp("k"));
- }
-
- @Test
- public void getAlertData() {
- alertInfo.setAlertData(new AlertData());
- assertNotNull(alertInfo.getAlertData());
- }
-}
\ No newline at end of file
diff --git a/dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtilsTest.java b/dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtilsTest.java
deleted file mode 100644
index 614a7c0..0000000
--- a/dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtilsTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.plugin.utils;
-
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.Assert.*;
-
-public class PropertyUtilsTest {
-
- private static final Logger logger = LoggerFactory.getLogger(PropertyUtilsTest.class);
-
- /**
- * Test getString
- */
- @Test
- public void testGetString() {
-
- String result = PropertyUtils.getString("test.string");
- logger.info(result);
- assertEquals("teststring", result);
-
- //If key is null, then return null
- result = PropertyUtils.getString(null);
- assertNull(result);
- }
-
-
- /**
- * Test getBoolean
- */
- @Test
- public void testGetBoolean() {
-
- //Expected true
- Boolean result = PropertyUtils.getBoolean("test.true");
- assertTrue(result);
-
- //Expected false
- result = PropertyUtils.getBoolean("test.false");
- assertFalse(result);
- }
-
- /**
- * Test getLong
- */
- @Test
- public void testGetLong() {
... 3823 lines suppressed ...
[incubator-dolphinscheduler] 03/07: Modify node version
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 50bfb30994e6472949b3081a798a9e4b0eb59297
Author: break60 <79...@qq.com>
AuthorDate: Mon Sep 7 15:32:20 2020 +0800
Modify node version
---
dolphinscheduler-ui/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 13644ba..2aaf946 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -29,7 +29,7 @@
<name>${project.artifactId}</name>
<properties>
- <node.version>v12.12.0</node.version>
+ <node.version>v10.16.0</node.version>
<npm.version>6.11.3</npm.version>
<sonar.sources>src</sonar.sources>
</properties>
[incubator-dolphinscheduler] 02/07: Add form-create plug-in and
alarm group management add sample demo
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 2e117bb8265ac0778a022a40f5c8adbefb0b77aa
Author: break60 <79...@qq.com>
AuthorDate: Mon Sep 7 15:06:08 2020 +0800
Add form-create plug-in and alarm group management add sample demo
---
dolphinscheduler-dist/release-docs/LICENSE | 1 +
.../ui-licenses/LICENSE-@form-create-element-ui | 21 +++++++++
dolphinscheduler-ui/package.json | 5 ++-
dolphinscheduler-ui/src/js/conf/home/index.js | 4 ++
.../security/pages/warningGroups/_source/list.vue | 51 +++++++++++++++++++++-
dolphinscheduler-ui/src/js/conf/login/index.js | 4 ++
6 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE
index 95cd700..9a0fdae 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -484,6 +484,7 @@ The text of each license is also included at licenses/ui-licenses/LICENSE-[proje
========================================
MIT licenses
========================================
+ @form-create/element-ui 1.0.18: https://github.com/xaboy/form-create MIT
ans-UI 1.1.7: https://github.com/analysys/ans-ui MIT
axios 0.16.2: https://github.com/axios/axios MIT
bootstrap 3.3.7: https://github.com/twbs/bootstrap MIT
diff --git a/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui b/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui
new file mode 100644
index 0000000..5609421
--- /dev/null
+++ b/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 xaboy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json
index af6f2cd..af0ac54 100644
--- a/dolphinscheduler-ui/package.json
+++ b/dolphinscheduler-ui/package.json
@@ -12,6 +12,7 @@
"build:release": "npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/dolphinscheduler/ui webpack --config ./build/webpack.config.release.js"
},
"dependencies": {
+ "@form-create/element-ui": "^1.0.18",
"@riophae/vue-treeselect": "^0.4.0",
"ans-ui": "1.1.9",
"axios": "^0.16.2",
@@ -22,8 +23,8 @@
"d3": "^3.5.17",
"dagre": "^0.8.5",
"dayjs": "^1.7.8",
- "element-ui": "2.13.2",
"echarts": "4.1.0",
+ "element-ui": "2.13.2",
"html2canvas": "^0.5.0-beta4",
"jquery": "3.3.1",
"jquery-ui": "^1.12.1",
@@ -32,7 +33,7 @@
"lodash": "^4.17.11",
"normalize.css": "^8.0.1",
"vue": "^2.5.17",
- "vue-router": "2.7.0",
+ "vue-router": "^2.7.0",
"vuex": "^3.0.0",
"vuex-router-sync": "^5.0.0"
},
diff --git a/dolphinscheduler-ui/src/js/conf/home/index.js b/dolphinscheduler-ui/src/js/conf/home/index.js
index bfa786c..d62ac47 100644
--- a/dolphinscheduler-ui/src/js/conf/home/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/index.js
@@ -38,6 +38,8 @@ import 'bootstrap/dist/css/bootstrap.min.css'
import 'bootstrap/dist/js/bootstrap.min.js'
import 'canvg/dist/browser/canvg.min.js'
+import formCreate, {maker} from '@form-create/element-ui'
+
// Component internationalization
const useOpt = i18n.globalScope.LOCALE === 'en_US' ? { locale: en_US } : {}
@@ -46,6 +48,8 @@ Vue.use(ElementUI)
// Vue.use(ans)
Vue.use(ans, useOpt)
+Vue.use(formCreate)
+
sync(store, router)
Vue.config.devtools = true
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
index 528693a..71e6aa5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
@@ -16,6 +16,9 @@
*/
<template>
<div class="list-model">
+ <div>
+ <form-create v-model="fApi" :rule="rule" :option="option"></form-create>
+ </div>
<div class="table-box">
<table>
<tr>
@@ -97,7 +100,53 @@
name: 'user-list',
data () {
return {
- list: []
+ list: [],
+ fApi: {},
+ rule: [
+ {
+ type: "input", // 生成组件的名称(就是表单的名称：如input，radio，checkbox，select，slider等)
+ field: "userName", // 表单组件的字段名称(就是表单的name属性，注：该必须唯一),自定义组件可以不配置
+ className: "user-name-dom", // 设置组件的class属性
+ title: "用户名称：", // 组件的名称, 选填
+ value: "", // 表单组件的字段值(就是表单的value值),自定义组件可以不用设置
+ props: {
+ placeholder: "请输入用户名称！",
+ disabled: false,
+ readonly: false,
+ clearable: true // 是否显示清空按钮
+ },
+ validate: [
+ {
+ trigger: "blur",
+ required: true,
+ message: "用户名称不能为空！"
+ }
+ ],
+ col: {
+ md: { span: 12 }
+ }
+ }
+ ],
+ option: {
+ // 显示重置表单按扭
+ resetBtn: true,
+
+ // 表单提交按扭事件
+ onSubmit: formData => {
+ alert(JSON.stringify(formData));
+
+ console.log("获取表单中的数据：", formData);
+
+ //按钮进入提交状态
+ // this.fApi.btn.loading();
+
+ //重置按钮禁用
+ // this.fApi.resetBtn.disabled();
+
+ //按钮进入可点击状态
+ // this.fApi.btn.finish();
+ }
+ }
}
},
props: {
diff --git a/dolphinscheduler-ui/src/js/conf/login/index.js b/dolphinscheduler-ui/src/js/conf/login/index.js
index 55ca0d4..7e94ddf 100644
--- a/dolphinscheduler-ui/src/js/conf/login/index.js
+++ b/dolphinscheduler-ui/src/js/conf/login/index.js
@@ -29,10 +29,14 @@ import ans from 'ans-ui/lib/ans-ui.min'
import 'sass/conf/login/index.scss'
import 'bootstrap/dist/js/bootstrap.min.js'
+import formCreate, {maker} from '@form-create/element-ui'
+
Vue.use(ElementUI)
Vue.use(ans)
+Vue.use(formCreate)
+
Vue.config.devtools = true
Vue.config.productionTip = true
Vue.config.silent = true
[incubator-dolphinscheduler] 06/07: [feature][ui]Alert plugin
design (#3734)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 3d5c34a6aba73c50e91fddccb758a22d3f940713
Author: break60 <79...@qq.com>
AuthorDate: Tue Sep 22 17:43:55 2020 +0800
[feature][ui]Alert plugin design (#3734)
* [feature-3665][ui]Add element-ui (#3666)
* [feature-3665][ui]Add element-ui
* add license
* Add form-create plug-in and alarm group management add sample demo
* Modify node version
* fix
* fix
* [Feature-3682][ui]Add form-create plug-in and alarm group management add sample demo (#3683)
* Add form-create plug-in and alarm group management add sample demo
* Modify node version
* fix
* fix
* [feature][ui] Add alarm instance page
* [feature-3665][ui]Add element-ui (#3666)
* [feature-3665][ui]Add element-ui
* add license
* Add form-create plug-in and alarm group management add sample demo
* Modify node version
* fix
* fix
---
.../alarmPluginExample/_source/createWarning.vue | 145 +++++++++++++
.../pages/alarmPluginExample/_source/list.vue | 224 +++++++++++++++++++++
.../security/pages/alarmPluginExample/index.vue | 161 +++++++++++++++
.../src/js/conf/home/router/index.js | 8 +
.../components/secondaryMenu/_source/menu.js | 9 +
.../src/js/module/i18n/locale/en_US.js | 2 +
.../src/js/module/i18n/locale/zh_CN.js | 2 +
dolphinscheduler-ui/src/sass/common/_table.scss | 3 +
8 files changed, 554 insertions(+)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/createWarning.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/createWarning.vue
new file mode 100644
index 0000000..28d53c5
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/createWarning.vue
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+<template>
+ <m-popup
+ ref="popup"
+ :ok-text="item ? $t('Edit') : $t('Submit')"
+ :nameText="item ? $t('Edit alarm group') : $t('Create alarm group')"
+ @ok="_ok">
+ <template slot="content">
+ <div class="create-warning-model">
+ <m-list-box-f>
+ <template slot="name"><strong>*</strong>{{$t('Group Name')}}</template>
+ <template slot="content">
+ <x-input
+ type="input"
+ v-model="groupName"
+ maxlength="60"
+ :placeholder="$t('Please enter group name')">
+ </x-input>
+ </template>
+ </m-list-box-f>
+ <m-list-box-f>
+ <template slot="name"><strong>*</strong>{{$t('Group Type')}}</template>
+ <template slot="content">
+ <x-select v-model="groupType">
+ <x-option
+ v-for="city in options"
+ :key="city.id"
+ :value="city.id"
+ :label="city.code">
+ </x-option>
+ </x-select>
+ </template>
+ </m-list-box-f>
+ <m-list-box-f>
+ <template slot="name">{{$t('Remarks')}}</template>
+ <template slot="content">
+ <x-input
+ type="textarea"
+ v-model="description"
+ :placeholder="$t('Please enter description')">
+ </x-input>
+ </template>
+ </m-list-box-f>
+ </div>
+ </template>
+ </m-popup>
+</template>
+<script>
+ import i18n from '@/module/i18n'
+ import store from '@/conf/home/store'
+ import mPopup from '@/module/components/popup/popup'
+ import mListBoxF from '@/module/components/listBoxF/listBoxF'
+
+ export default {
+ name: 'create-warning',
+ data () {
+ return {
+ store,
+ groupName: '',
+ groupType: 'EMAIL',
+ description: '',
+ options: [{ code: `${i18n.$t('Email')}`, id: 'EMAIL' }, { code: `${i18n.$t('SMS')}`, id: 'SMS' }]
+ }
+ },
+ props: {
+ item: Object
+ },
+ methods: {
+ _ok () {
+ if (this._verification()) {
+ // The name is not verified
+ if (this.item && this.item.groupName === this.groupName) {
+ this._submit()
+ return
+ }
+
+ // Verify username
+ this.store.dispatch(`security/verifyName`, {
+ type: 'alertgroup',
+ groupName: this.groupName
+ }).then(res => {
+ this._submit()
+ }).catch(e => {
+ this.$message.error(e.msg || '')
+ })
+ }
+ },
+ _verification () {
+ // group name
+ if (!this.groupName.replace(/\s*/g,"")) {
+ this.$message.warning(`${i18n.$t('Please enter group name')}`)
+ return false
+ }
+ return true
+ },
+ _submit () {
+ let param = {
+ groupName: this.groupName,
+ groupType: this.groupType,
+ description: this.description
+ }
+ if (this.item) {
+ param.id = this.item.id
+ }
+ this.$refs['popup'].spinnerLoading = true
+ this.store.dispatch(`security/${this.item ? 'updateAlertgrou' : 'createAlertgrou'}`, param).then(res => {
+ this.$emit('onUpdate')
+ this.$message.success(res.msg)
+ setTimeout(() => {
+ this.$refs['popup'].spinnerLoading = false
+ }, 800)
+ }).catch(e => {
+ this.$message.error(e.msg || '')
+ this.$refs['popup'].spinnerLoading = false
+ })
+ }
+ },
+ watch: {},
+ created () {
+ if (this.item) {
+ this.groupName = this.item.groupName
+ this.groupType = this.item.groupType
+ this.description = this.item.description
+ }
+ },
+ mounted () {
+ },
+ components: { mPopup, mListBoxF }
+ }
+</script>
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/list.vue
new file mode 100644
index 0000000..965f941
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/list.vue
@@ -0,0 +1,224 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+<template>
+ <div class="list-model">
+ <!-- <div class="table-box">
+ <table>
+ <tr>
+ <th>
+ <span>{{$t('#')}}</span>
+ </th>
+ <th>
+ <span>{{$t('Instance type')}}</span>
+ </th>
+ <th>
+ <span>{{$t('name')}}</span>
+ </th>
+ <th>
+ <span>{{$t('Create Time')}}</span>
+ </th>
+ <th>
+ <span>{{$t('Update Time')}}</span>
+ </th>
+ <th width="120">
+ <span>{{$t('Operation')}}</span>
+ </th>
+ </tr>
+ <tr v-for="(item, $index) in list" :key="$index">
+ <td>
+ <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
+ </td>
+ <td>
+ <span>
+ {{item.groupName}}
+ </span>
+ </td>
+ <td><span>{{item.groupType === 'EMAIL' ? `${$t('Email')}` : `${$t('SMS')}`}}</span></td>
+ <td>
+ <span v-if="item.createTime">{{item.createTime | formatDate}}</span>
+ <span v-else>-</span>
+ </td>
+ <td>
+ <span v-if="item.updateTime">{{item.updateTime | formatDate}}</span>
+ <span v-else>-</span>
+ </td>
+ <td>
+ <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-user-empty" :title="$t('Managing Users')" @click="_mangeUser(item)">
+ </x-button>
+ <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-edit" :title="$t('Edit')" @click="_edit(item)">
+ </x-button>
+ <x-poptip
+ :ref="'poptip-delete-' + $index"
+ placement="bottom-end"
+ width="90">
+ <p>{{$t('Delete?')}}</p>
+ <div style="text-align: right; margin: 0;padding-top: 4px;">
+ <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
+ <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
+ </div>
+ <template slot="reference">
+ <x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-trash" :title="$t('delete')" :disabled="item.id==1?true: false"></x-button>
+ </template>
+ </x-poptip>
+ </td>
+ </tr>
+ </table>
+ </div> -->
+ <div class="table-box">
+ <el-table :data="list" size="mini" style="width: 100%">
+ <el-table-column prop="groupName" :label="$t('Instance type')" width="180"></el-table-column>
+ <el-table-column prop="Remarks" :label="$t('name')" width="180"></el-table-column>
+ <el-table-column :label="$t('Create Time')">
+ <template slot-scope="scope">
+ <span>{{scope.row.createTime | formatDate}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column :label="$t('Update Time')">
+ <template slot-scope="scope">
+ <span>{{scope.row.updateTime | formatDate}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column :label="$t('Operation')" width="100">
+ <template slot-scope="scope">
+ <el-tooltip :content="$t('Edit')" placement="top">
+ <el-button type="primary" size="mini" icon="el-icon-edit" circle></el-button>
+ </el-tooltip>
+ <el-tooltip :content="$t('delete')" placement="top">
+ <el-button type="danger" size="mini" icon="el-icon-delete" circle></el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+</template>
+<script>
+ import _ from 'lodash'
+ import i18n from '@/module/i18n'
+ import { mapActions } from 'vuex'
+ import mTransfer from '@/module/components/transfer/transfer'
+
+ export default {
+ name: 'user-list',
+ data () {
+ return {
+ list: []
+ }
+ },
+ props: {
+ alertgroupList: Array,
+ pageNo: Number,
+ pageSize: Number
+ },
+ methods: {
+ ...mapActions('security', ['deleteAlertgrou', 'getAuthList', 'grantAuthorization']),
+ _closeDelete (i) {
+ this.$refs[`poptip-delete-${i}`][0].doClose()
+ },
+ _delete (item, i) {
+ this.deleteAlertgrou({
+ id: item.id
+ }).then(res => {
+ this.$refs[`poptip-delete-${i}`][0].doClose()
+ this.$emit('on-update')
+ this.$message.success(res.msg)
+ }).catch(e => {
+ this.$refs[`poptip-delete-${i}`][0].doClose()
+ this.$message.error(e.msg || '')
+ })
+ },
+ _edit (item) {
+ this.$emit('on-edit', item)
+ },
+ _mangeUser (item, i) {
+ this.getAuthList({
+ id: item.id,
+ type: 'user',
+ category: 'users'
+ }).then(data => {
+ let sourceListPrs = _.map(data[0], v => {
+ return {
+ id: v.id,
+ name: v.userName
+ }
+ })
+ let targetListPrs = _.map(data[1], v => {
+ return {
+ id: v.id,
+ name: v.userName
+ }
+ })
+ let self = this
+ let modal = this.$modal.dialog({
+ closable: false,
+ showMask: true,
+ escClose: true,
+ className: 'v-modal-custom',
+ transitionName: 'opacityp',
+ render (h) {
+ return h(mTransfer, {
+ on: {
+ onUpdate (userIds) {
+ self._grantAuthorization('alert-group/grant-user', {
+ userIds: userIds,
+ alertgroupId: item.id
+ })
+ modal.remove()
+ },
+ close () {
+ modal.remove()
+ }
+ },
+ props: {
+ sourceListPrs: sourceListPrs,
+ targetListPrs: targetListPrs,
+ type: {
+ name: `${i18n.$t('Managing Users')}`
+ }
+ }
+ })
+ }
+ })
+ })
+ },
+ _grantAuthorization (api, param) {
+ this.grantAuthorization({
+ api: api,
+ param: param
+ }).then(res => {
+ this.$message.success(res.msg)
+ }).catch(e => {
+ this.$message.error(e.msg || '')
+ })
+ }
+ },
+ watch: {
+ alertgroupList (a) {
+ this.list = []
+ setTimeout(() => {
+ this.list = a
+ })
+ }
+ },
+ created () {
+ this.list = this.alertgroupList
+ },
+ mounted () {
+ },
+ components: { }
+ }
+</script>
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/index.vue
new file mode 100644
index 0000000..50a1473
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/index.vue
@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+<template>
+ <m-list-construction :title="$t('Alarm plugin example')">
+ <template slot="conditions">
+ <m-conditions @on-conditions="_onConditions">
+ <!-- <template slot="button-group" v-if="isADMIN">
+ <x-button type="ghost" size="small" @click="_create('')">{{$t('Create alarm group')}}</x-button>
+ </template> -->
+ </m-conditions>
+ </template>
+ <template slot="content">
+ <template v-if="alertgroupList.length || total>0">
+ <m-list @on-edit="_onEdit"
+ @on-update="_onUpdate"
+ :alertgroup-list="alertgroupList"
+ :page-no="searchParams.pageNo"
+ :page-size="searchParams.pageSize">
+
+ </m-list>
+ <div class="page-box">
+ <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
+ </div>
+ </template>
+ <template v-if="!alertgroupList.length && total<=0">
+ <m-no-data></m-no-data>
+ </template>
+ <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
+ </template>
+ </m-list-construction>
+</template>
+<script>
+ import _ from 'lodash'
+ import { mapActions } from 'vuex'
+ import mList from './_source/list'
+ import store from '@/conf/home/store'
+ import mSpin from '@/module/components/spin/spin'
+ import mCreateWarning from './_source/createWarning'
+ import mNoData from '@/module/components/noData/noData'
+ import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
+ import mConditions from '@/module/components/conditions/conditions'
+ import mListConstruction from '@/module/components/listConstruction/listConstruction'
+
+ export default {
+ name: 'warning-groups-index',
+ data () {
+ return {
+ total: null,
+ isLoading: false,
+ alertgroupList: [],
+ searchParams: {
+ pageSize: 10,
+ pageNo: 1,
+ searchVal: ''
+ },
+ isLeft: true,
+ isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
+ }
+ },
+ mixins: [listUrlParamHandle],
+ props: {},
+ methods: {
+ ...mapActions('security', ['getAlertgroupP']),
+ /**
+ * Inquire
+ */
+ _onConditions (o) {
+ this.searchParams = _.assign(this.searchParams, o)
+ this.searchParams.pageNo = 1
+ },
+ _page (val) {
+ this.searchParams.pageNo = val
+ },
+ _pageSize (val) {
+ this.searchParams.pageSize = val
+ },
+ _onUpdate () {
+ this._debounceGET()
+ },
+ _onEdit (item) {
+ this._create(item)
+ },
+ _create (item) {
+ let self = this
+ let modal = this.$modal.dialog({
+ closable: false,
+ showMask: true,
+ escClose: true,
+ className: 'v-modal-custom',
+ transitionName: 'opacityp',
+ render (h) {
+ return h(mCreateWarning, {
+ on: {
+ onUpdate () {
+ self._debounceGET('false')
+ modal.remove()
+ },
+ close () {
+ modal.remove()
+ }
+ },
+ props: {
+ item: item
+ }
+ })
+ }
+ })
+ },
+ _getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
+ this.isLoading = !flag
+ this.getAlertgroupP(this.searchParams).then(res => {
+ if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+ this.searchParams.pageNo = this.searchParams.pageNo -1
+ } else {
+ this.alertgroupList = []
+ this.alertgroupList = res.totalList
+ this.total = res.total
+ this.isLoading = false
+ }
+ }).catch(e => {
+ this.isLoading = false
+ })
+ }
+ },
+ watch: {
+ // router
+ '$route' (a) {
+ // url no params get instance list
+ this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
+ }
+ },
+ created () {
+ },
+ mounted () {
+ this.$modal.destroy()
+ },
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
+ components: { mList, mListConstruction, mConditions, mSpin, mNoData }
+ }
+</script>
diff --git a/dolphinscheduler-ui/src/js/conf/home/router/index.js b/dolphinscheduler-ui/src/js/conf/home/router/index.js
index b65586c..5f6f20b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/router/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/router/index.js
@@ -397,6 +397,14 @@ const router = new Router({
meta: {
title: `${i18n.$t('Token manage')}`
}
+ },
+ {
+ path: '/security/Alarm-plugin-example',
+ name: 'Alarm-plugin-example',
+ component: resolve => require(['../pages/security/pages/alarmPluginExample/index'], resolve),
+ meta: {
+ title: `${i18n.$t('Alarm plugin example')}`
+ }
}
]
},
diff --git a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
index 56834a2..34d3ce3 100644
--- a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
+++ b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
@@ -135,6 +135,15 @@ const menu = {
icon: 'ans-icon-document',
children: [],
disabled: true
+ },
+ {
+ name: `${i18n.$t('Alarm plugin example')}`,
+ id: 2,
+ path: 'Alarm-plugin-example',
+ isOpen: true,
+ icon: 'ans-icon-document',
+ children: [],
+ disabled: true
}
],
resource: [
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 07dfb7c..5912146 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -474,6 +474,7 @@ export default {
'Create worker group': 'Create worker group',
'Edit worker group': 'Edit worker group',
'Token manage': 'Token manage',
+ 'Alarm plugin example': 'Alarm plugin example',
'Create token': 'Create token',
'Edit token': 'Edit token',
'Please enter the IP address separated by commas': 'Please enter the IP address separated by commas',
@@ -639,6 +640,7 @@ export default {
'Current connection settings': 'Current connection settings',
'Please save the DAG before formatting': 'Please save the DAG before formatting',
'Batch copy': 'Batch copy',
+ 'Instance type': 'Instance type',
'Related items': 'Related items',
'Project name is required': 'Project name is required',
'Batch move': 'Batch move',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index e3f2562..39a782b 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -469,6 +469,7 @@ export default {
'Create worker group': '创建Worker分组',
'Edit worker group': '编辑Worker分组',
'Token manage': '令牌管理',
+ 'Alarm plugin example': '告警插件实例',
'Create token': '创建令牌',
'Edit token': '编辑令牌',
'Please enter the IP address separated by commas': '请输入IP地址多个用英文逗号隔开',
@@ -639,6 +640,7 @@ export default {
'Current connection settings': '当前连线设置',
'Please save the DAG before formatting': '格式化前请先保存DAG',
'Batch copy': '批量复制',
+ 'Instance type': '实例类型',
'Related items': '关联项目',
'Project name is required': '项目名称必填',
'Batch move': '批量移动',
diff --git a/dolphinscheduler-ui/src/sass/common/_table.scss b/dolphinscheduler-ui/src/sass/common/_table.scss
index 688f8e3..d643053 100644
--- a/dolphinscheduler-ui/src/sass/common/_table.scss
+++ b/dolphinscheduler-ui/src/sass/common/_table.scss
@@ -171,3 +171,6 @@
}
}
}
+.el-table--enable-row-hover .el-table__body tr:hover>td {
+ background-color: #ddecff;
+}
[incubator-dolphinscheduler] 01/07: [feature-3665][ui]Add
element-ui (#3666)
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch alert_plugin_design
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit a9e37927eb2d326cb7e938f5fe0fb6fc610bb6ad
Author: break60 <79...@qq.com>
AuthorDate: Fri Sep 4 14:06:04 2020 +0800
[feature-3665][ui]Add element-ui (#3666)
* [feature-3665][ui]Add element-ui
* add license
---
dolphinscheduler-dist/release-docs/LICENSE | 1 +
.../licenses/ui-licenses/LICENSE-element-ui | 21 +++++++++++++++++++++
dolphinscheduler-ui/build/config.js | 2 +-
dolphinscheduler-ui/package.json | 1 +
dolphinscheduler-ui/src/js/conf/home/index.js | 4 ++++
dolphinscheduler-ui/src/js/conf/login/index.js | 4 ++++
6 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE
index 707ea5c..95cd700 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -491,6 +491,7 @@ MIT licenses
clipboard 2.0.1: https://github.com/zenorocha/clipboard.js MIT
codemirror 5.43.0: https://github.com/codemirror/CodeMirror MIT
dayjs 1.7.8: https://github.com/iamkun/dayjs MIT
+ element-ui 2.13.2: https://github.com/ElemeFE/element MIT
html2canvas 0.5.0-beta4: https://github.com/niklasvh/html2canvas MIT
jquery 3.3.1: https://github.com/jquery/jquery MIT
jquery-ui 1.12.1: https://github.com/jquery/jquery-ui MIT
diff --git a/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-element-ui b/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-element-ui
new file mode 100644
index 0000000..d4462f3
--- /dev/null
+++ b/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-element-ui
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016-present ElemeFE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/dolphinscheduler-ui/build/config.js b/dolphinscheduler-ui/build/config.js
index 2800115..11bbec5 100644
--- a/dolphinscheduler-ui/build/config.js
+++ b/dolphinscheduler-ui/build/config.js
@@ -207,7 +207,7 @@ const baseConfig = {
'jquery':'jquery/dist/jquery.min.js',
'jquery-ui': 'jquery-ui'
},
- extensions: ['.js', 'json', '.vue', '.scss']
+ extensions: ['*', '.js', 'json', '.vue', '.scss']
},
plugins: [
new VueLoaderPlugin(),
diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json
index 9624fa6..af6f2cd 100644
--- a/dolphinscheduler-ui/package.json
+++ b/dolphinscheduler-ui/package.json
@@ -22,6 +22,7 @@
"d3": "^3.5.17",
"dagre": "^0.8.5",
"dayjs": "^1.7.8",
+ "element-ui": "2.13.2",
"echarts": "4.1.0",
"html2canvas": "^0.5.0-beta4",
"jquery": "3.3.1",
diff --git a/dolphinscheduler-ui/src/js/conf/home/index.js b/dolphinscheduler-ui/src/js/conf/home/index.js
index efec218..bfa786c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/index.js
@@ -18,6 +18,8 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
import App from './App'
import router from './router'
import store from './store'
@@ -39,6 +41,8 @@ import 'canvg/dist/browser/canvg.min.js'
// Component internationalization
const useOpt = i18n.globalScope.LOCALE === 'en_US' ? { locale: en_US } : {}
+Vue.use(ElementUI)
+
// Vue.use(ans)
Vue.use(ans, useOpt)
diff --git a/dolphinscheduler-ui/src/js/conf/login/index.js b/dolphinscheduler-ui/src/js/conf/login/index.js
index d9b9353..55ca0d4 100644
--- a/dolphinscheduler-ui/src/js/conf/login/index.js
+++ b/dolphinscheduler-ui/src/js/conf/login/index.js
@@ -19,6 +19,8 @@
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
// import $ from 'jquery'
import Vue from 'vue'
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
import App from './App'
import i18n from '@/module/i18n'
import 'ans-ui/lib/ans-ui.min.css'
@@ -27,6 +29,8 @@ import ans from 'ans-ui/lib/ans-ui.min'
import 'sass/conf/login/index.scss'
import 'bootstrap/dist/js/bootstrap.min.js'
+Vue.use(ElementUI)
+
Vue.use(ans)
Vue.config.devtools = true