Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merge] merge from 1.3.4 #4371

Merged
merged 1,447 commits into from
Jan 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1447 commits
Select commit Hold shift + click to select a range
b6186bf
fix
break60 Aug 11, 2020
f5acc15
Merge branch '1.3.2-release' of https://github.com/apache/incubator-d…
break60 Aug 11, 2020
e2553e3
Merge pull request #3464 from break60/1.3.2-release
xingchun-chen Aug 11, 2020
8f3c74f
Merge branch '1.3.2-release' of https://github.com/apache/incubator-d…
break60 Aug 11, 2020
e44aa13
[fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
break60 Aug 12, 2020
a48618d
Merge pull request #3472 from break60/1.3.2-release
xingchun-chen Aug 12, 2020
12aca8f
[optimization][ui]Prevent the shell script input box from being empty
break60 Aug 12, 2020
a409306
[Fix-3462][api]If login user is admin,need list all udfs (#3465)
lgcareer Aug 12, 2020
6f0b3c4
Merge branch '1.3.2-release' of https://github.com/apache/incubator-d…
break60 Aug 13, 2020
a678c82
Merge pull request #3474 from break60/1.3.2-release
xingchun-chen Aug 13, 2020
c832248
[Fix-3463][api]Fixed that run the sql task will be failure after rena…
lgcareer Aug 13, 2020
a78f5c0
[fixBug-3058][ui]Fix connection abnormalities in historical workflow …
break60 Aug 13, 2020
0b2da77
Merge pull request #3484 from break60/1.3.2-release
xingchun-chen Aug 13, 2020
7a866ff
[Feture-3327][ui]Add the function of re-uploading files in the udf su…
break60 Aug 13, 2020
927985c
Merge pull request #3485 from break60/1.3.2-release
xingchun-chen Aug 13, 2020
5756d6b
fix bug: Fix master task dependency check bug (#3473)
lenboo Aug 13, 2020
6d33aa7
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 14, 2020
8a6732a
[maven-release-plugin] prepare release 1.3.2
qiaozhanwei Aug 14, 2020
c6f0c89
[maven-release-plugin] prepare for next development iteration
qiaozhanwei Aug 14, 2020
e367f90
fix ci_e2e fail (#3497)
lgcareer Aug 14, 2020
5f5c084
[Fix-3469][api]Should filter the resource by the different program ty…
lgcareer Aug 14, 2020
a7ac1bb
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 14, 2020
b4b8c80
test release 1.3.2 version rollback
Aug 14, 2020
3191bfd
test release 1.3.2 version rollback
Aug 14, 2020
45424ec
test release 1.3.2 version rollback (#3499)
qiaozhanwei Aug 14, 2020
88b3ef5
[maven-release-plugin] prepare release 1.3.2
qiaozhanwei Aug 14, 2020
b5f0f23
[maven-release-plugin] prepare for next development iteration
qiaozhanwei Aug 14, 2020
52aaf0e
[Fix-3469][ui]The value of maintenance resources and the filtering of…
break60 Aug 14, 2020
2c460c6
fix
break60 Aug 14, 2020
545beae
Revert "fix ci_e2e fail (#3497)"
lgcareer Aug 14, 2020
abd20af
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 14, 2020
c0bed39
Merge pull request #3500 from break60/1.3.2-release
xingchun-chen Aug 14, 2020
a01a981
Merge pull request #3502 from apache/revert-3497-1.3.2-release-docker…
xingchun-chen Aug 14, 2020
177b7b9
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 14, 2020
e26b654
test
Aug 14, 2020
ed6f579
test release 1.3.2 version rollback
Aug 14, 2020
660eb5a
test release 1.3.2 version rollback (#3503)
qiaozhanwei Aug 14, 2020
afd227a
[maven-release-plugin] prepare release 1.3.2
qiaozhanwei Aug 14, 2020
f50353f
[maven-release-plugin] prepare for next development iteration
qiaozhanwei Aug 14, 2020
d86cc4b
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 14, 2020
4ba6b35
test release 1.3.2 version rollback (#3504)
qiaozhanwei Aug 14, 2020
f19b125
[maven-release-plugin] prepare release 1.3.2
qiaozhanwei Aug 14, 2020
f3f8957
[maven-release-plugin] prepare for next development iteration
qiaozhanwei Aug 14, 2020
5fdc43c
fix ds muti-level directory in zk, which lead to fail to assign work
XiaotaoYi Aug 14, 2020
553af77
add login user check some actions in api
Aug 15, 2020
0a0515e
Merge remote-tracking branch 'upstream/1.3.2-release' into 132-checka…
Aug 15, 2020
96a869d
Merge pull request #3506 from XiaotaoYi/1.3.2-release
xingchun-chen Aug 15, 2020
eefb0bf
[Hotfix][ci] Fix e2e ci docker image build error
yangyichao-mango Aug 15, 2020
1141ab6
Merge pull request #3513 from yangyichao-mango/hotfix-docker-1.3.2
xingchun-chen Aug 17, 2020
944758b
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 17, 2020
2ed5f06
modify tag 1.3.0 to HEAD
Aug 17, 2020
11d3c07
modify tag 1.3.0 to HEAD (#3525)
qiaozhanwei Aug 17, 2020
78f0dcc
remove OGNL part of the mybaits notice (#3526)
lgcareer Aug 17, 2020
4d2f0b0
[maven-release-plugin] prepare release 1.3.2
qiaozhanwei Aug 17, 2020
32edd19
[maven-release-plugin] prepare for next development iteration
qiaozhanwei Aug 17, 2020
0559efa
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 17, 2020
917a4b2
release 1.3.2 version rollback (#3527)
qiaozhanwei Aug 17, 2020
54f0c2c
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 17, 2020
be3550c
[ui]Script input box to modify the delay loading time
break60 Aug 17, 2020
ce73b9b
fix
break60 Aug 17, 2020
3fca3b6
fix
break60 Aug 17, 2020
04c1066
fix
break60 Aug 17, 2020
30185c0
fix
break60 Aug 17, 2020
cc20827
Merge pull request #3530 from break60/1.3.2-release
xingchun-chen Aug 17, 2020
94e453c
modify general user can't create token
Aug 18, 2020
0d180ae
[ui]It is forbidden to select non-existent resources and modify the t…
break60 Aug 18, 2020
6ae1837
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 18, 2020
8093cd4
modify general user can't create token (#3533)
qiaozhanwei Aug 18, 2020
b497424
if task is null , set task type is null instead of "null"
Aug 18, 2020
1b5a817
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.…
Aug 18, 2020
276c599
Merge pull request #3534 from break60/1.3.2-release
xingchun-chen Aug 18, 2020
a3f6123
Merge pull request #3535 from qiaozhanwei/1.3.2-release
xingchun-chen Aug 18, 2020
0505ebf
[Fix-3536][api]If user didn't have tenant,create resource directory w…
lgcareer Aug 18, 2020
b8a9e2e
modify general user can't create,delete,update token (#3538)
qiaozhanwei Aug 18, 2020
a12283a
[ui]Resource delete OK button to increase loading, change the number …
break60 Aug 18, 2020
e1a112b
fix
break60 Aug 18, 2020
7486ad0
Merge pull request #3539 from break60/1.3.2-release
xingchun-chen Aug 18, 2020
29f1123
[Fix-3616][Server] when worker akc/response master exception , async …
qiaozhanwei Sep 17, 2020
70faea2
[fixbug][ui]Repair the master and worker management instrument display
break60 Sep 17, 2020
1c07892
[Fix-3238][docker]Fix that can not create folder in docker with stand…
lgcareer Sep 17, 2020
a75d050
Merge branch '1.3.3-release' of https://github.com/apache/incubator-d…
break60 Sep 17, 2020
2a77ac3
Merge pull request #3759 from break60/1.3.3-release
xingchun-chen Sep 17, 2020
ab3fc13
[fixbug][ui]Remove non-existent or deleted resources disabled
break60 Sep 17, 2020
f2a7958
Merge pull request #3761 from break60/1.3.3-release
xingchun-chen Sep 17, 2020
1da7d31
[fixBug-3621][ui]If the workflow instance status is executing status,…
break60 Sep 17, 2020
621f10f
Merge pull request #3762 from break60/1.3.3-release
xingchun-chen Sep 17, 2020
5ee2c13
[fix-3553][ui]Repair click workflow connection, select the entire path
break60 Aug 22, 2020
144d192
fix
break60 Aug 24, 2020
1caa9fd
fix
break60 Aug 24, 2020
973cbf8
Merge pull request #3763 from break60/1.3.3-release
xingchun-chen Sep 17, 2020
25bf49b
[Fix-3238][docker]Fix that can not create folder in docker with stand…
lgcareer Sep 21, 2020
b2e78cb
Merge pull request #3772 from lgcareer/1.3.3-release-docker
xingchun-chen Sep 21, 2020
d74f6e7
[Fix-3616][Server] when worker akc/response master exception , async…
qiaozhanwei Sep 21, 2020
05594d4
The batch delete function in the workflow definition and workflow ins…
Sep 9, 2020
4464565
Merge pull request #3781 from break60/1.3.3-release
xingchun-chen Sep 21, 2020
fd74939
[Improvement-3720][ui] js mailbox verification fix
break60 Sep 21, 2020
801d7bd
Merge pull request #3782 from break60/1.3.3-release
xingchun-chen Sep 21, 2020
5c8171e
[Fix-3549] [Server][sqlTask]The alias column in the query SQL does no…
qiaozhanwei Sep 21, 2020
09bdd99
[Fix-3124][docker]Fix that can not build a docker image on windows (#…
lgcareer Sep 22, 2020
4087485
[Fix-3549] [Server][sqlTask]The alias column in the query SQL does no…
qiaozhanwei Sep 22, 2020
dce518c
[Fix-3258][Security][Worker group manage] Connot get create time and …
qiaozhanwei Sep 22, 2020
387437a
[fixBug-3792][ui]Click on the sidebar to adapt the width of the pie c…
break60 Sep 24, 2020
2838254
Merge pull request #3803 from break60/1.3.3-release
xingchun-chen Sep 24, 2020
75bc3a6
[Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
BoYiZhang Sep 12, 2020
268d09d
[Fix-#3713][common]Fix that catfile method Stream not closed
lgcareer Sep 24, 2020
2e4f9f1
[Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
lgcareer Sep 24, 2020
d6f62f1
[Fix-#3487][api、dao] cherry pick from dev to fix that create folder d…
muzhongjiang Sep 9, 2020
f0abf92
Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.…
lgcareer Sep 24, 2020
ea56513
Merge pull request #3812 from lgcareer/1.3.3-release-cherrypick
xingchun-chen Sep 25, 2020
90c90b2
[Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
yangyichao-mango Jul 13, 2020
a51dafc
Set up JDK 11 for SonarCloud in github action. (#3052)
Jave-Chen Jun 25, 2020
b6761b0
[fixBug-3621][ui]Select the batch checkbox to unfilter the instances …
break60 Sep 29, 2020
d946717
Merge pull request #3848 from break60/1.3.3-release
xingchun-chen Sep 29, 2020
ec81f46
add verify tenant name cannot contain special characters.
zhuangchong Oct 9, 2020
cad4420
[fixBug-3840][ui]The tenant code only allows letters or a combination…
break60 Oct 9, 2020
a7e7d09
fix
break60 Oct 9, 2020
0ee1552
fix
break60 Oct 9, 2020
6829119
fix
break60 Oct 9, 2020
66e9a14
[Fix-#3702][api] When re-upload the resource file but don't change th…
lgcareer Oct 9, 2020
1bf2f0d
Merge pull request #3872 from break60/1.3.3-release
xingchun-chen Oct 9, 2020
ec2725d
[fixbug-3621][ui]Workflow instance ready to stop and ready to suspend…
break60 Oct 9, 2020
73bab11
Merge pull request #3877 from break60/1.3.3-release
xingchun-chen Oct 9, 2020
ef9221b
resolve the conflict.
zhuangchong Oct 9, 2020
e8db263
Merge pull request #3870 from zhuangchong/1.3.3-bug-ui-fix-3835
xingchun-chen Oct 10, 2020
5764192
[fixbug-3887][ui]Fix missing English translation of re-upload files
break60 Oct 12, 2020
fd0f572
add process define name verify. (#3879)
zhuangchong Oct 12, 2020
ac8d564
Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<…
lenboo Oct 12, 2020
8703b46
revert pr 3872
break60 Oct 12, 2020
7eb103d
Merge pull request #3888 from break60/1.3.3-release
xingchun-chen Oct 12, 2020
1894651
Merge pull request #3890 from apache/revert-3870-1.3.3-bug-ui-fix-3835
xingchun-chen Oct 12, 2020
f29f4e8
[FIX-3617][Service]after subtask fault tolerance, 2 task instances ar…
lenboo Oct 13, 2020
301d728
[Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
lgcareer Oct 14, 2020
e740dc7
[FIX-3836][1.3.3-release-API] process definition validation name inte…
BoYiZhang Oct 14, 2020
f0ff8e2
[FIX_#3789][remote]cherry pick from dev to support netty heart beat
CalvinKirs Oct 12, 2020
b368c53
[FIX_#3789][remote]cherry pick from dev to support netty heart beat
lgcareer Oct 14, 2020
51d476b
[FIX_#3789][remote]cherry pick from dev to support netty heart beat (…
lgcareer Oct 15, 2020
dc8e892
Repair check box cannot be canceled
break60 Oct 15, 2020
76609ba
Merge pull request #3915 from break60/1.3.3-release
xingchun-chen Oct 15, 2020
a703135
Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.…
lgcareer Oct 15, 2020
adda0eb
[fix-3843][api] When update workflow definition,if name already exist…
lgcareer Oct 15, 2020
ac9f5dc
[fix-3843][api] When update workflow definition,if name already exist…
lgcareer Oct 15, 2020
3361151
[fix-#3843][api]When update workflow definition,if name already exist…
lgcareer Oct 15, 2020
68c59fa
Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.…
lgcareer Oct 15, 2020
dbc9f14
[Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
lgcareer Oct 15, 2020
5018117
Merge pull request #3919 from lgcareer/1.3.3-release-fix#3789
xingchun-chen Oct 16, 2020
fb6c4db
Workflow definition name re-modified and added check
break60 Oct 16, 2020
72627be
Merge pull request #3925 from break60/1.3.3-release
xingchun-chen Oct 16, 2020
07ced8b
[fix-#3843][api]When update workflow definition,if name already exist…
zhuangchong Oct 16, 2020
a045827
update code.
zhuangchong Oct 16, 2020
9c71fed
Merge pull request #3927 from zhuangchong/1.3.3-release-fix#3789
xingchun-chen Oct 16, 2020
74914cf
[#3931][ui]Field name optimization for spark, flink, and mr
break60 Oct 17, 2020
0bcfa8b
Merge pull request #3932 from break60/1.3.3-release
xingchun-chen Oct 17, 2020
ae85116
change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
lgcareer Oct 17, 2020
c144d81
[maven-release-plugin] prepare release 1.3.3
Oct 17, 2020
92a7932
[maven-release-plugin] prepare for next development iteration
Oct 17, 2020
ccdaee9
[ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
lgcareer Oct 18, 2020
ba97191
fix bug:3615 After the task is executed successfully, but the next ta…
Oct 19, 2020
4f94943
Merge pull request #3947 from lenboo/133-fault
CalvinKirs Oct 19, 2020
81a720b
[fixBug-3964][ui]Switch back and forth over timeout alarm, the select…
break60 Oct 22, 2020
48261c5
Merge pull request #3969 from break60/1.3.3-release
xingchun-chen Oct 22, 2020
ccc8ba1
solve too many files, close logClientService (#3971)
davidzollo Oct 22, 2020
7a088b7
fix #3966 sub process doesnot send alert mail after process instance …
lenboo Oct 22, 2020
075d163
[Fix-#3618][server] resolve task executed finished but not release th…
lgcareer Oct 22, 2020
01975bd
[Fix-#3958][api] files should not be created successfully in the dire…
lgcareer Oct 23, 2020
292b0fc
Merge pull request #3980 from lgcareer/1.3.3-release-fix3958
xingchun-chen Oct 23, 2020
3dc5845
[FIX-3966] The timeout warning does not take effect in sub_process (#…
lenboo Oct 23, 2020
cd3dff5
fix import dolphinscheduler_mysql.sql insert admin user data
Oct 26, 2020
c11d97f
Merge pull request #3996 from KnightChess/Fix-3994
CalvinKirs Oct 27, 2020
6caac0f
[FIX-3929] condition task would post wrong tasks when failover. (#3999)
lenboo Oct 27, 2020
026957d
[FIX-3929] because of no lock, start up failover would dispatch two …
lenboo Oct 28, 2020
0d21fa9
revert pom version to 1.3.3-release
lgcareer Oct 28, 2020
ed01649
[maven-release-plugin] prepare release 1.3.3
Oct 28, 2020
1076a23
[maven-release-plugin] prepare for next development iteration
Oct 28, 2020
b01898a
[release]revert pom version to 1.3.3-release
lgcareer Oct 29, 2020
389c90e
fix bug 4010: remove failed condition tasks from error-task-list. (#4…
lenboo Oct 29, 2020
5524291
[maven-release-plugin] prepare release 1.3.3
Oct 29, 2020
be07cb6
[maven-release-plugin] prepare for next development iteration
Oct 29, 2020
494f30f
[Fix-4054][Api] Fix The last week of the month for adding/editing tim…
iyeeku Nov 18, 2020
e3644b6
[FIX#4033]cherry pick from dev to resolve that `$[]`` conflicts with …
lgcareer Dec 2, 2020
d91afd9
[Fix][Server] Fix clear task execute path is related to master.
yh2388 Dec 2, 2020
0e063a0
[update] Fix code smells
yh2388 Dec 2, 2020
a822f8d
[update] add unit test.
yh2388 Dec 2, 2020
35c8f96
Merge pull request #4145 from lgcareer/1.3.4-prepare-fix-4054
davidzollo Dec 2, 2020
23d7c72
fix ut
felix-thinkingdata Dec 3, 2020
7751b07
code style
felix-thinkingdata Dec 3, 2020
49a3591
code style
felix-thinkingdata Dec 3, 2020
9e6715f
code style
felix-thinkingdata Dec 3, 2020
04dc59b
sqoop task optimization
Eights-Li Jun 9, 2020
8834d8c
sqoop front-end optimization
Eights-Li Jun 9, 2020
5d0982d
modify sqoop task UT
Eights-Li Jun 10, 2020
d3693cd
add sqoop task UT to pom
Eights-Li Jun 10, 2020
93fb80a
sqoop task source type or target type is null throw exception
Eights-Li Jun 10, 2020
bf23fa5
fix testSqoopTaskTest bug (#3024)
CalvinKirs Jun 19, 2020
27a22cd
[FIX-4034][server] fix sqoop import fail (#4036)
Eights-Li Nov 25, 2020
c80e200
[FIX-4034][server] fix sqoop import fail (#4036)
Eights-Li Nov 25, 2020
c51a423
fix sqoop task jdbc string contains special char (#4105)
Eights-Li Nov 27, 2020
da58048
split sqoop import hive database and table (#4141)
Eights-Li Dec 2, 2020
e3eeacc
modify JSONUtils
Eights-Li Dec 6, 2020
047f55b
Merge pull request #4088 from liliang1991/dev11_20 (#4154)
lgcareer Dec 7, 2020
d796a63
[FIX-3900][server] Cherry pick from dev to kill multi yarn app in one…
lgcareer Dec 7, 2020
d53991e
[Feature-2925][server] Cherry pick from dev to init TaskLogger in Tas…
lgcareer Dec 7, 2020
6d3293c
[FIX-#4084][server]cherry pick from dev to fix taskInstance state cha…
lgcareer Dec 8, 2020
3865a7a
[Fix-4143][api,service][jar upgrade]cherry from dev to upgrade quartz…
lgcareer Dec 8, 2020
7720a77
chrry-pick sqoop task in dev to 1.3.4 (#4168)
Eights-Li Dec 8, 2020
bd8a8bd
cancel sqoop sql query import hive limit
Eights-Li Dec 9, 2020
6ea2177
[Improve-4143][docker]Some parameters were improved for Docker
lgcareer Dec 9, 2020
b310d40
cherry-pick load TaskInstance slow #4184
wangxj3 Dec 9, 2020
a04efe9
[Improve-4143][docker]Some parameters were improved for Docker
lgcareer Dec 9, 2020
2366097
update sqoop task params when upgrade to 1.3.4
Eights-Li Dec 9, 2020
e90438b
Merge from 1.3.4-prepare and fix conflicts.
yh2388 Dec 10, 2020
166dbd2
Clear code smells.
yh2388 Dec 10, 2020
22308c7
[Improve-4143][docker]No need to install kazoo
lgcareer Dec 10, 2020
586310f
[Improve-4143][docker]Update the docs how to build and run with docker
lgcareer Dec 10, 2020
e2d07d0
Merge remote-tracking branch 'remotes/upstream/1.3.4-prepare' into 1.…
lgcareer Dec 10, 2020
656ccab
cherry-pick task_ack_miss (#4198)
CalvinKirs Dec 10, 2020
b00025b
fix 4190: When the amount of json data is large, process list page di…
lenboo Dec 10, 2020
61998c7
[PrepareRelease][Ambari][SOFT_VERSION]Change version from 1.3.3 to 1.…
lgcareer Dec 10, 2020
ec7e4bf
Merge pull request #4200 from lgcareer/1.3.4-prepare-fix-4073
xingchun-chen Dec 11, 2020
85ab55d
Merge pull request #4149 from yh2388/fix-task-execpath-claer
xingchun-chen Dec 11, 2020
0420fe5
sqoop hive target add target dir field
Eights-Li Dec 11, 2020
6609b91
add target-dir param in sqoop task hive TargetHiveParameter
Eights-Li Dec 11, 2020
343b6f1
Merge branch '1.3.4-prepare' of https://github.com/apache/incubator-d…
Eights-Li Dec 11, 2020
b99d246
[Feature-3878][UI]Repair the last Sunday of each month
lgcareer Dec 11, 2020
e0963a7
Merge pull request #4213 from lgcareer/1.3.4-prepare-feature-3878
xingchun-chen Dec 11, 2020
5a6e1d3
fix hadoop params build failed in sqoop task
Eights-Li Dec 11, 2020
542ce2e
[Feature-4138][Master]Cherry pick from dev to dispatch add sleep when…
lgcareer Dec 12, 2020
937aa91
#4182-cherry-pick (#4210)
CalvinKirs Dec 12, 2020
933eac7
Merge pull request #4212 from Eights-Li/1.3.4-prepare-sqoop
xingchun-chen Dec 12, 2020
c7cb182
cherry pick #4219 to 1.3.4-pre (#4220)
CalvinKirs Dec 14, 2020
ac71e73
cherry pick #4288 to 1.3.4-pre (#4229)
CalvinKirs Dec 15, 2020
e5e05d4
[cherry-pick to 1.3.4-pre][ui] Fix dag node name verification
CalvinKirs Dec 15, 2020
c5bb72c
[Fix-4222][Master]Add the priority queue to ensure that tasks are sub…
lgcareer Dec 15, 2020
bd7db68
Merge remote-tracking branch 'remotes/upstream/1.3.4-prepare' into 1.…
lgcareer Dec 15, 2020
4cd1e7e
[Fix-4222][Master]Add the priority queue to ensure that tasks are sub…
lgcareer Dec 15, 2020
a6558bf
[Fix-4222][Master]update print log.
lgcareer Dec 15, 2020
1eceb58
Merge pull request #4231 from CalvinKirs/1.3.4-pre-ui
xingchun-chen Dec 16, 2020
e6118b8
Merge pull request #4232 from lgcareer/1.3.4-prepare-feature-3878
xingchun-chen Dec 16, 2020
c159017
cherry pick #4288 to 1.3.4-prepare
CalvinKirs Dec 16, 2020
d9aca29
Merge pull request #4238 from CalvinKirs/1.3.4-pre-date_convert_null
xingchun-chen Dec 16, 2020
f1df0ff
cherry pick date param cover
CalvinKirs Dec 16, 2020
13fefd0
fix time cover
CalvinKirs Dec 16, 2020
3d32a33
fix time cover
CalvinKirs Dec 16, 2020
1d892d0
Merge pull request #4241 from CalvinKirs/1.3.4-date_conver
xingchun-chen Dec 16, 2020
d2032a5
fix time cover
CalvinKirs Dec 16, 2020
18ac68b
Merge pull request #4243 from CalvinKirs/1.3.4fix_time_erroor
xingchun-chen Dec 16, 2020
9de1afc
fix time cover
CalvinKirs Dec 16, 2020
4acd4eb
Merge pull request #4246 from CalvinKirs/rerun_time_error
xingchun-chen Dec 16, 2020
d0e73ae
[maven-release-plugin] prepare release 1.3.4
davidfans Dec 16, 2020
b4fd362
[maven-release-plugin] prepare for next development iteration
davidfans Dec 16, 2020
ebc155d
[Merge] merge from 1.3.4
lgcareer Jan 5, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 158 additions & 0 deletions ambari_plugin/common-services/DOLPHIN/1.3.4/alerts.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
{
"DOLPHIN": {
"service": [],
"DOLPHIN_API": [
{
"name": "dolphin_api_port_check",
"label": "dolphin_api_port_check",
"description": "dolphin_api_port_check.",
"interval": 10,
"scope": "ANY",
"source": {
"type": "PORT",
"uri": "{{dolphin-application-api/server.port}}",
"default_port": 12345,
"reporting": {
"ok": {
"text": "TCP OK - {0:.3f}s response on port {1}"
},
"warning": {
"text": "TCP OK - {0:.3f}s response on port {1}",
"value": 1.5
},
"critical": {
"text": "Connection failed: {0} to {1}:{2}",
"value": 5.0
}
}
}
}
],
"DOLPHIN_LOGGER": [
{
"name": "dolphin_logger_port_check",
"label": "dolphin_logger_port_check",
"description": "dolphin_logger_port_check.",
"interval": 10,
"scope": "ANY",
"source": {
"type": "PORT",
"uri": "{{dolphin-common/loggerserver.rpc.port}}",
"default_port": 50051,
"reporting": {
"ok": {
"text": "TCP OK - {0:.3f}s response on port {1}"
},
"warning": {
"text": "TCP OK - {0:.3f}s response on port {1}",
"value": 1.5
},
"critical": {
"text": "Connection failed: {0} to {1}:{2}",
"value": 5.0
}
}
}
}
],
"DOLPHIN_MASTER": [
{
"name": "DOLPHIN_MASTER_CHECK",
"label": "check dolphin scheduler master status",
"description": "",
"interval":10,
"scope": "HOST",
"enabled": true,
"source": {
"type": "SCRIPT",
"path": "DOLPHIN/1.3.4/package/alerts/alert_dolphin_scheduler_status.py",
"parameters": [

{
"name": "connection.timeout",
"display_name": "Connection Timeout",
"value": 5.0,
"type": "NUMERIC",
"description": "The maximum time before this alert is considered to be CRITICAL",
"units": "seconds",
"threshold": "CRITICAL"
},
{
"name": "alertName",
"display_name": "alertName",
"value": "DOLPHIN_MASTER",
"type": "STRING",
"description": "alert name"
}
]
}
}
],
"DOLPHIN_WORKER": [
{
"name": "DOLPHIN_WORKER_CHECK",
"label": "check dolphin scheduler worker status",
"description": "",
"interval":10,
"scope": "HOST",
"enabled": true,
"source": {
"type": "SCRIPT",
"path": "DOLPHIN/1.3.4/package/alerts/alert_dolphin_scheduler_status.py",
"parameters": [

{
"name": "connection.timeout",
"display_name": "Connection Timeout",
"value": 5.0,
"type": "NUMERIC",
"description": "The maximum time before this alert is considered to be CRITICAL",
"units": "seconds",
"threshold": "CRITICAL"
},
{
"name": "alertName",
"display_name": "alertName",
"value": "DOLPHIN_WORKER",
"type": "STRING",
"description": "alert name"
}
]
}
}
],
"DOLPHIN_ALERT": [
{
"name": "DOLPHIN_DOLPHIN_ALERT_CHECK",
"label": "check dolphin scheduler alert status",
"description": "",
"interval":10,
"scope": "HOST",
"enabled": true,
"source": {
"type": "SCRIPT",
"path": "DOLPHIN/1.3.4/package/alerts/alert_dolphin_scheduler_status.py",
"parameters": [

{
"name": "connection.timeout",
"display_name": "Connection Timeout",
"value": 5.0,
"type": "NUMERIC",
"description": "The maximum time before this alert is considered to be CRITICAL",
"units": "seconds",
"threshold": "CRITICAL"
},
{
"name": "alertName",
"display_name": "alertName",
"value": "DOLPHIN_ALERT",
"type": "STRING",
"description": "alert name"
}
]
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -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.
-->
<configuration>
<property>
<name>alert.type</name>
<value>EMAIL</value>
<description>alert type is EMAIL/SMS</description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>mail.protocol</name>
<value>SMTP</value>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>mail.server.host</name>
<value>xxx.xxx.com</value>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>mail.server.port</name>
<value>25</value>
<value-attributes>
<type>int</type>
</value-attributes>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>mail.sender</name>
<value>admin</value>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>mail.user</name>
<value>admin</value>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>mail.passwd</name>
<value>000000</value>
<description></description>
<property-type>PASSWORD</property-type>
<value-attributes>
<type>password</type>
</value-attributes>
<on-ambari-upgrade add="true"/>
</property>

<property>
<name>mail.smtp.starttls.enable</name>
<value>true</value>
<value-attributes>
<type>boolean</type>
</value-attributes>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>mail.smtp.ssl.enable</name>
<value>true</value>
<value-attributes>
<type>boolean</type>
</value-attributes>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>mail.smtp.ssl.trust</name>
<value>xxx.xxx.com</value>
<description></description>
<on-ambari-upgrade add="true"/>
</property>

<property>
<name>enterprise.wechat.enable</name>
<value>false</value>
<description></description>
<value-attributes>
<type>value-list</type>
<entries>
<entry>
<value>true</value>
<label>Enabled</label>
</entry>
<entry>
<value>false</value>
<label>Disabled</label>
</entry>
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>enterprise.wechat.corp.id</name>
<value>wechatId</value>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>enterprise.wechat.secret</name>
<value>secret</value>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>enterprise.wechat.agent.id</name>
<value>agentId</value>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>enterprise.wechat.users</name>
<value>wechatUsers</value>
<description></description>
<on-ambari-upgrade add="true"/>
</property>
</configuration>
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<!--
~ 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.
-->
<configuration>
<property>
<name>server.port</name>
<value>12345</value>
<description>
server port
</description>
<value-attributes>
<type>int</type>
</value-attributes>
</property>
<property>
<name>server.servlet.session.timeout</name>
<value>7200</value>
<value-attributes>
<type>int</type>
</value-attributes>
<description>
</description>
</property>
<property>
<name>server.servlet.context-path</name>
<value>/dolphinscheduler/</value>
<description>
</description>
</property>
<property>
<name>spring.servlet.multipart.max-file-size</name>
<value>1024</value>
<value-attributes>
<unit>MB</unit>
<type>int</type>
</value-attributes>
<description>
</description>
</property>
<property>
<name>spring.servlet.multipart.max-request-size</name>
<value>1024</value>
<value-attributes>
<unit>MB</unit>
<type>int</type>
</value-attributes>
<description>
</description>
</property>
<property>
<name>server.jetty.max-http-post-size</name>
<value>5000000</value>
<value-attributes>
<type>int</type>
</value-attributes>
<description>
</description>
</property>
<property>
<name>spring.messages.encoding</name>
<value>UTF-8</value>
<description></description>
</property>
<property>
<name>spring.messages.basename</name>
<value>i18n/messages</value>
<description></description>
</property>
<property>
<name>security.authentication.type</name>
<value>PASSWORD</value>
<description></description>
</property>
</configuration>
Loading