Commit Graph

1828 Commits

Author SHA1 Message Date
Technoboy-
cfd3266ca2 we should insert alert DB once , and trigger this type of alert 3 times 2019-12-28 21:35:10 +08:00
Tboy
dce7441bea
Merge pull request #1611 from wenhemin/fixbug-20191227
fix:In a cluster environment, verify that nodes have matching bug. #{1613}
2019-12-28 20:01:48 +08:00
Tboy
f42dc82636
Merge pull request #1621 from Technoboy-/dev
refactor getKillProcessThread method
2019-12-28 20:00:36 +08:00
Tboy
49181fd08e
Merge pull request #1607 from samz406/1227-token
project checkResult may NPE
2019-12-28 19:57:42 +08:00
Tboy
34b6537350
Merge pull request #1608 from JinyLeeChina/dev
[fix] process instance alert bug #1595
2019-12-28 19:56:12 +08:00
Technoboy-
04df353b4c refactor getKillProcessThread method 2019-12-28 19:24:38 +08:00
Tboy
4b5f60d96e
Merge pull request #6 from apache/dev
merge
2019-12-28 19:22:36 +08:00
samz406
be5fc116ef update resource may NPE (#1610)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* update resource may NPE
2019-12-27 17:20:34 +08:00
lgcareer
7f27c8a86e update assemble and rpmbuild because config/*.* remove script to dolphinscheduler-server/src/main/resources (#1609) 2019-12-27 17:05:28 +08:00
DK.Pino
b6cca46d8f remove lombok annocation (#1603) 2019-12-27 17:04:25 +08:00
DK.Pino
63f396b61f refactor zk tree cache (#1577)
* refactor zk tree cache

* refactor zk tree cache
2019-12-27 17:03:10 +08:00
samz406
597d685955 delAlertgroupById add entity exist check (#1602)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* add MonitorServiceTest

* mobile phone need 11 number

* delete file

* delAlertgroupById add entity exist check
2019-12-27 17:00:33 +08:00
Tboy
8b2b5ba684 refactor TaskQueueZkImpl (#1591)
* fix #1515

* sleep when resource in not satisfy. fix #1522

* add sleep 1s for no command

* fix MasterBaseTaskExecThread submit method bug

* updates

* add log

* delete lombok

* remove duplicate code

* refactor TaskQueueZkImpl

* ignore First , we have to rewrite

* updates
2019-12-27 17:00:06 +08:00
DK.Pino
aadf0aae46 remove lombok annocation (#1600) 2019-12-27 16:59:47 +08:00
温合民
3c6780c3cd fix:In a cluster environment, verify that nodes have matching bug. 2019-12-27 16:53:51 +08:00
DK.Pino
c17fe38a6c remove lombok annocation (#1605) 2019-12-27 16:41:34 +08:00
samz406
f3f3ada959
Merge pull request #14 from apache/dev
update
2019-12-27 15:41:16 +08:00
lilin
6736765844 1 word error
2 modify check project perm may NPE
3  modify checkResult  may NPE
4 update project add desc check
2019-12-27 15:22:25 +08:00
JinyLeeChina
3b653328ef '#1595' 2019-12-27 15:20:57 +08:00
samz406
7826843620 update token add exist check (#1598)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* updateToken add entity exist check
2019-12-27 15:02:49 +08:00
lgcareer
9de928ea04 add profile nginx in order to deploy frontend (#1599)
* add profile nginx

* add dolphinscheduler-nginx.xml
2019-12-27 15:00:55 +08:00
lilin
3cccfa3037 updateToken add entity exist check 2019-12-27 14:44:01 +08:00
samz406
fe9344d4be mobile phone need 11 number (#1596)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* add MonitorServiceTest

* mobile phone need 11 number

* delete file
2019-12-27 14:42:21 +08:00
qiaozhanwei
ef401b98e2
add AlertGroupMapperTest UT in github action (#1590)
* remove LogViewServiceGrpc.java file and pom modify

* remove kazoo

* remove kazoo

* remove kazoo

* remove common monitor package

* add license

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* install.sh remove python kazoo

* add system param whether repeat running

* remove kazoo modify

* BusinessTimeUtils remove whther repeat running inner param

* add AccessTokenMapperTest UT

* CI UT yml modify,start postgresql and zookeeper by default

* add AlertGroupMapperTest UT in github action

* Conflicts reslove
2019-12-27 14:32:44 +08:00
gaojun2048
a526106952 Added the maven profile to build rpm packages (#1563)
* Update quick-start.md

* 更新demo的地址

* add rpm plugin

* delete the git ignore files

* 测试git ignore

* 测试ignore

* optimize the .gitignore file

* add rpm package, delete unuse copy jar action in assembly

* delete docs dir

* add rpm plugin support

* add rpm plugin support

* add rpm plugin support

* dolphinscheduler-common have not bin dir

* dolphinscheduler-common have not bin dir

* delete unuse config about assembly

* add defineSatement

* add rpm plugin support

* add rpm plugin support

* add rpm plugin support

* add rpm support

* update install dirname , make front and backend together

* update rpm name

* update rpm name

* update rpm config

* add jars excludes

* add jars excludes

* add rpm plugion

* add rpm plugion

* add rpm plugion

* add auto create /opt/soft
2019-12-27 14:32:24 +08:00
Tboy
2c3ec993d6
Merge pull request #1594 from clay4444/fixFormatBug
Fix format bug
2019-12-27 12:25:04 +08:00
loushang
110de68fcc fix Stirng format bug 2019-12-27 12:05:34 +08:00
loushang
9a7f262dee Merge remote-tracking branch 'upstream/dev' into fixFormatBug
merge upstream dev into local fixFormatBug branch
2019-12-27 12:03:58 +08:00
xingchun-chen
90730133ac common/ParameterUtils Utils Test (#1583)
* common/parameterUtils unit test
2019-12-26 20:09:21 +08:00
dk.technoboy
1610f434af updates 2019-12-26 20:03:40 +08:00
Yelli
eefb71855d #747 Worker Log desensitization(日志脱敏) (#1568)
* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl

* #747 sql task password Log desensitization

* cancel mail_temple

* edit ExcelUtils

* modify test method name

* #747 sql task password Log desensitization

* Constants add DATASOURCE_PASSWORD_REGEX
2019-12-26 19:56:15 +08:00
dk.technoboy
49402aa978 ignore First , we have to rewrite 2019-12-26 19:38:21 +08:00
dk.technoboy
f59bb10c2c refactor TaskQueueZkImpl 2019-12-26 19:16:33 +08:00
Tboy
35b6442fd9
Merge pull request #5 from apache/dev
merge
2019-12-26 18:53:18 +08:00
Tboy
e4edf3e4d0 remove duplicate code (#1587)
* fix #1515

* sleep when resource in not satisfy. fix #1522

* add sleep 1s for no command

* fix MasterBaseTaskExecThread submit method bug

* updates

* add log

* delete lombok

* remove duplicate code
2019-12-26 18:47:37 +08:00
qiaozhanwei
04a7b76b38 add AccessTokenMapperTest UT (#1588)
* remove LogViewServiceGrpc.java file and pom modify

* remove kazoo

* remove kazoo

* remove kazoo

* remove common monitor package

* add license

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* install.sh remove python kazoo

* add system param whether repeat running

* remove kazoo modify

* BusinessTimeUtils remove whther repeat running inner param

* add AccessTokenMapperTest UT

* CI UT yml modify,start postgresql and zookeeper by default
2019-12-26 16:43:31 +08:00
Yelli
1d65080507 #1300 Add right alignment function in sql email content (#1542)
* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl
2019-12-26 15:27:23 +08:00
zhukai
0f909fca12 Add FlinkArgsUtilsTest which is the UT of FlinkArgsUtils (#1557)
1.Add FlinkArgsUtilsTest
2.Optimize FlinkArgsUtils and fix bug.
use StringUtils.isNotEmpty(queue) instead of StringUtils.isNotEmpty(others)

3.Add the UT path in pom
2019-12-26 14:15:58 +08:00
dk.technoboy
373c2aeba4 remove duplicate code 2019-12-26 12:28:47 +08:00
Tboy
99ac146e54
Merge pull request #4 from apache/dev
merge
2019-12-26 11:57:32 +08:00
qiaozhanwei
18e8703b70 remove kazoo (#1575)
* remove LogViewServiceGrpc.java file and pom modify

* remove kazoo

* remove kazoo

* remove kazoo

* remove common monitor package

* add license

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* install.sh remove python kazoo

* add system param whether repeat running

* remove kazoo modify

* BusinessTimeUtils remove whther repeat running inner param
2019-12-26 11:41:58 +08:00
khadgarmage
5f4146eb4e prepare db env for ut mapper test (#1581)
* docker compose db

* docker compose db

* docker compose db

* docker compose db

* delete init
2019-12-26 10:23:35 +08:00
break60
026fdd9e1c License Corrected Version (#1565)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color

* Remove iconfont, awesome, replace with ans-ui icon

* Menu arrow style fix

* Script input box style fix

* console.log('Front-end third-party js, css introduced using npm

* Front-end supplemental license

* Modify naming

* Repair license

* replace cookie.js with js-cookie, add js-cookie license

* License Corrected Version

* License Corrected Version
2019-12-25 12:26:28 +08:00
Tboy
3e4c221463 delete lombok (#1567)
* fix #1515

* sleep when resource in not satisfy. fix #1522

* add sleep 1s for no command

* fix MasterBaseTaskExecThread submit method bug

* updates

* add log

* delete lombok
2019-12-25 12:25:40 +08:00
dk.technoboy
f5de617272 delete lombok 2019-12-25 11:47:18 +08:00
Tboy
13cf19cf1d
Merge pull request #3 from apache/dev
merge
2019-12-25 11:13:22 +08:00
DK.Pino
4bbf31f807 refactor zk client and zk config module (#1537)
* refactor zk client & zk config module

* refactor zk client & zk config module

* add license
2019-12-25 10:43:37 +08:00
break60
b4daa85f20 replace cookie.js with js-cookie, add js-cookie license (#1561)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color

* Remove iconfont, awesome, replace with ans-ui icon

* Menu arrow style fix

* Script input box style fix

* console.log('Front-end third-party js, css introduced using npm

* Front-end supplemental license

* Modify naming

* Repair license

* replace cookie.js with js-cookie, add js-cookie license
2019-12-25 10:32:17 +08:00
Tboy
613e96e570
Merge pull request #1559 from Nivane/dev
fix typos
2019-12-24 22:19:26 +08:00
魔方不在手
5cc82c5900 remove master server and worker server listening port (5566、7788) (#1551)
* fix:When there are multiple nodes, the monitoring center dashboard displays only one node.

* fix:Catching exceptions and printing exception information

* fix:rollback

* fix:getting project name field bug

* fix: remove master server and worker server listening port (5566、7788)
2019-12-24 22:11:11 +08:00