Merge branch 'dev' into dev (d3640ebb) · Commits · SUMMER2020 / students / proj-2002251

.github/workflows/ci_backend.yml

+5 −17

Original line number	Diff line number	Diff line
		@@ -56,21 +56,9 @@ jobs:
		uses: actions/setup-java@v1
		with:
		java-version: 1.8
		- name: Check license
		run: ./mvnw -B apache-rat:check
		- name: Compile
		run: mvn -B clean compile package -Prelease -Dmaven.test.skip=true
		License-check:
		runs-on: ubuntu-latest
		steps:
		- uses: actions/checkout@v2
		# In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
		- name: checkout submodules
		shell: bash
		run: \|
		git submodule sync --recursive
		git -c protocol.version=2 submodule update --init --force --recursive --depth=1
		- name: Set up JDK 1.8
		uses: actions/setup-java@v1
		with:
		java-version: 1.8
		- name: Check
		run: mvn -B apache-rat:check
		run: mvn -B clean compile install -Prelease -Dmaven.test.skip=true
		- name: Check dependency license
		run: tools/dependencies/check-LICENSE.sh

.gitignore

+11 −114

Original line number	Diff line number	Diff line
		@@ -4,27 +4,24 @@
		.zip
		.gz
		.DS_Store
		.idea
		.idea/
		.idea/*
		.target
		.target/
		//target/**
		target/*
		*/target
		/target/
		dist/
		all-dependencies.txt
		self-modules.txt
		third-party-dependencies.txt
		**/target/
		.settings
		.nbproject
		.classpath
		.project
		*.iml
		*/.iml
		*.ipr
		*.iws
		*.tgz
		.*.swp
		.vim
		.tmp
		node_modules
		**/node_modules
		npm-debug.log
		.vscode
		logs/*
		@@ -41,110 +38,10 @@ dolphinscheduler-alert/logs/
		dolphinscheduler-alert/src/main/resources/alert.properties_bak
		dolphinscheduler-alert/src/main/resources/logback.xml
		dolphinscheduler-server/src/main/resources/logback.xml
		dolphinscheduler-ui/dist
		dolphinscheduler-ui/dist/
		dolphinscheduler-ui/node
		dolphinscheduler-ui/dist/css/common.16ac5d9.css
		dolphinscheduler-ui/dist/css/home/index.b444b91.css
		dolphinscheduler-ui/dist/css/login/index.5866c64.css
		dolphinscheduler-ui/dist/js/0.ac94e5d.js
		dolphinscheduler-ui/dist/js/0.ac94e5d.js.map
		dolphinscheduler-ui/dist/js/1.0b043a3.js
		dolphinscheduler-ui/dist/js/1.0b043a3.js.map
		dolphinscheduler-ui/dist/js/10.1bce3dc.js
		dolphinscheduler-ui/dist/js/10.1bce3dc.js.map
		dolphinscheduler-ui/dist/js/11.79f04d8.js
		dolphinscheduler-ui/dist/js/11.79f04d8.js.map
		dolphinscheduler-ui/dist/js/12.420daa5.js
		dolphinscheduler-ui/dist/js/12.420daa5.js.map
		dolphinscheduler-ui/dist/js/13.e5bae1c.js
		dolphinscheduler-ui/dist/js/13.e5bae1c.js.map
		dolphinscheduler-ui/dist/js/14.f2a0dca.js
		dolphinscheduler-ui/dist/js/14.f2a0dca.js.map
		dolphinscheduler-ui/dist/js/15.45373e8.js
		dolphinscheduler-ui/dist/js/15.45373e8.js.map
		dolphinscheduler-ui/dist/js/16.fecb0fc.js
		dolphinscheduler-ui/dist/js/16.fecb0fc.js.map
		dolphinscheduler-ui/dist/js/17.84be279.js
		dolphinscheduler-ui/dist/js/17.84be279.js.map
		dolphinscheduler-ui/dist/js/18.307ea70.js
		dolphinscheduler-ui/dist/js/18.307ea70.js.map
		dolphinscheduler-ui/dist/js/19.144db9c.js
		dolphinscheduler-ui/dist/js/19.144db9c.js.map
		dolphinscheduler-ui/dist/js/2.8b4ef29.js
		dolphinscheduler-ui/dist/js/2.8b4ef29.js.map
		dolphinscheduler-ui/dist/js/20.4c527e9.js
		dolphinscheduler-ui/dist/js/20.4c527e9.js.map
		dolphinscheduler-ui/dist/js/21.831b2a2.js
		dolphinscheduler-ui/dist/js/21.831b2a2.js.map
		dolphinscheduler-ui/dist/js/22.2b4bb2a.js
		dolphinscheduler-ui/dist/js/22.2b4bb2a.js.map
		dolphinscheduler-ui/dist/js/23.81467ef.js
		dolphinscheduler-ui/dist/js/23.81467ef.js.map
		dolphinscheduler-ui/dist/js/24.54a00e4.js
		dolphinscheduler-ui/dist/js/24.54a00e4.js.map
		dolphinscheduler-ui/dist/js/25.8d7bd36.js
		dolphinscheduler-ui/dist/js/25.8d7bd36.js.map
		dolphinscheduler-ui/dist/js/26.2ec5e78.js
		dolphinscheduler-ui/dist/js/26.2ec5e78.js.map
		dolphinscheduler-ui/dist/js/27.3ab48c2.js
		dolphinscheduler-ui/dist/js/27.3ab48c2.js.map
		dolphinscheduler-ui/dist/js/28.363088a.js
		dolphinscheduler-ui/dist/js/28.363088a.js.map
		dolphinscheduler-ui/dist/js/29.6c5853a.js
		dolphinscheduler-ui/dist/js/29.6c5853a.js.map
		dolphinscheduler-ui/dist/js/3.a0edb5b.js
		dolphinscheduler-ui/dist/js/3.a0edb5b.js.map
		dolphinscheduler-ui/dist/js/30.940fdd3.js
		dolphinscheduler-ui/dist/js/30.940fdd3.js.map
		dolphinscheduler-ui/dist/js/31.168a460.js
		dolphinscheduler-ui/dist/js/31.168a460.js.map
		dolphinscheduler-ui/dist/js/32.8df6594.js
		dolphinscheduler-ui/dist/js/32.8df6594.js.map
		dolphinscheduler-ui/dist/js/33.4480bbe.js
		dolphinscheduler-ui/dist/js/33.4480bbe.js.map
		dolphinscheduler-ui/dist/js/34.b407fe1.js
		dolphinscheduler-ui/dist/js/34.b407fe1.js.map
		dolphinscheduler-ui/dist/js/35.f340b0a.js
		dolphinscheduler-ui/dist/js/35.f340b0a.js.map
		dolphinscheduler-ui/dist/js/36.8880c2d.js
		dolphinscheduler-ui/dist/js/36.8880c2d.js.map
		dolphinscheduler-ui/dist/js/37.ea2a25d.js
		dolphinscheduler-ui/dist/js/37.ea2a25d.js.map
		dolphinscheduler-ui/dist/js/38.98a59ee.js
		dolphinscheduler-ui/dist/js/38.98a59ee.js.map
		dolphinscheduler-ui/dist/js/39.a5e958a.js
		dolphinscheduler-ui/dist/js/39.a5e958a.js.map
		dolphinscheduler-ui/dist/js/4.4ca44db.js
		dolphinscheduler-ui/dist/js/4.4ca44db.js.map
		dolphinscheduler-ui/dist/js/40.e187b1e.js
		dolphinscheduler-ui/dist/js/40.e187b1e.js.map
		dolphinscheduler-ui/dist/js/41.0e89182.js
		dolphinscheduler-ui/dist/js/41.0e89182.js.map
		dolphinscheduler-ui/dist/js/42.341047c.js
		dolphinscheduler-ui/dist/js/42.341047c.js.map
		dolphinscheduler-ui/dist/js/43.27b8228.js
		dolphinscheduler-ui/dist/js/43.27b8228.js.map
		dolphinscheduler-ui/dist/js/44.e8869bc.js
		dolphinscheduler-ui/dist/js/44.e8869bc.js.map
		dolphinscheduler-ui/dist/js/45.8d54901.js
		dolphinscheduler-ui/dist/js/45.8d54901.js.map
		dolphinscheduler-ui/dist/js/5.e1ed7f3.js
		dolphinscheduler-ui/dist/js/5.e1ed7f3.js.map
		dolphinscheduler-ui/dist/js/6.241ba07.js
		dolphinscheduler-ui/dist/js/6.241ba07.js.map
		dolphinscheduler-ui/dist/js/7.ab2e297.js
		dolphinscheduler-ui/dist/js/7.ab2e297.js.map
		dolphinscheduler-ui/dist/js/8.83ff814.js
		dolphinscheduler-ui/dist/js/8.83ff814.js.map
		dolphinscheduler-ui/dist/js/9.39cb29f.js
		dolphinscheduler-ui/dist/js/9.39cb29f.js.map
		dolphinscheduler-ui/dist/js/common.733e342.js
		dolphinscheduler-ui/dist/js/common.733e342.js.map
		dolphinscheduler-ui/dist/js/home/index.78a5d12.js
		dolphinscheduler-ui/dist/js/home/index.78a5d12.js.map
		dolphinscheduler-ui/dist/js/login/index.291b8e3.js
		dolphinscheduler-ui/dist/js/login/index.291b8e3.js.map
		dolphinscheduler-ui/dist/lib/external/
		/dolphinscheduler-dao/src/main/resources/dao/data_source.properties
		dolphinscheduler-dao/src/main/resources/dao/data_source.properties

		.mvn/wrapper/*.jar

		!/zookeeper_data/

ambari_plugin/README.md

0 → 100644

+68 −0

Original line number	Diff line number	Diff line
		### Dolphin Scheduler的Ambari插件使用说明

		##### 备注

		1. 本文档适用于对Ambari中基本了解的用户
		2. 本文档是对已安装Ambari服务添加Dolphin Scheduler(1.3.0版本)服务的说明

		##### 一安装准备

		1. 准备RPM包

		- 在源码dolphinscheduler-dist目录下执行命令```mvn -U clean install rpm:attached-rpm -Prpmbuild -Dmaven.test.skip=true -X```即可生成(在目录 dolphinscheduler-dist/target/rpm/apache-dolphinscheduler-incubating/RPMS/noarch 下)

		2. 创建DS的安装用户--权限

		3. 初始化数据库信息

		```
		-- 创建Dolphin Scheduler的数据库：dolphinscheduler
		CREATE DATABASE dolphinscheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE
		utf8_general_ci;

		-- 初始化dolphinscheduler数据库的用户和密码，并分配权限
		-- 替换下面sql语句中的{user}为dolphinscheduler数据库的用户
		GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'%' IDENTIFIED BY '{password}';
		GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'localhost' IDENTIFIED BY
		'{password}';
		flush privileges;
		```



		##### 二 Ambari安装Dolphin Scheduler

		1. Ambari界面安装Dolphin Scheduler

		![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_001.png)

		2. 选择Dolphin Scheduler的Master安装的节点

		![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_002.png)

		3. 配置Dolphin Scheduler的Worker、Api、Logger、Alert安装的节点

		![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_003.png)

		4. 设置Dolphin Scheduler服务的安装用户（步骤一中创建的）及所属的用户组

		![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_004.png)

		5. 配置数据库的信息（和步骤一中初始化数据库中一致）

		![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_005.png)

		6. 配置其它的信息--如果需要的话

		![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_006.png)

		![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_007.png)

		7. 正常执行接下来的步骤

		![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_008.png)

		8. 安装成功后的界面

		![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_009.png)

ambari_plugin/common-services/DOLPHIN/2.0.0/alerts.json

deleted100644 → 0

+0 −164

Original line number	Diff line number	Diff line
		{
		"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_MASTER": [
		{
		"name": "DOLPHIN_MASTER_CHECK",
		"label": "check dolphin scheduler master status",
		"description": "",
		"interval":10,
		"scope": "HOST",
		"enabled": true,
		"source": {
		"type": "SCRIPT",
		"path": "DOLPHIN/2.0.0/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/2.0.0/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/2.0.0/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"
		}
		]
		}
		}
		],
		"DOLPHIN_ALERT": [
		{
		"name": "DOLPHIN_DOLPHIN_LOGGER_CHECK",
		"label": "check dolphin scheduler alert status",
		"description": "",
		"interval":10,
		"scope": "HOST",
		"enabled": true,
		"source": {
		"type": "SCRIPT",
		"path": "DOLPHIN/2.0.0/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_LOGGER",
		"type": "STRING",
		"description": "alert name"
		}
		]
		}
		}
		]
		}
		}
		No newline at end of file

ambari_plugin/common-services/DOLPHIN/2.0.0/configuration/dolphin-alert.xml

deleted100644 → 0

+0 −143

Original line number	Diff line number	Diff line
		<!--
		~ 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>alert.template</name>
		<value>html</value>
		<description>alter msg template, default is html template</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>
		No newline at end of file