You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/02/06 10:30:17 UTC
[incubator-dolphinscheduler] branch 1.3.5-prepare updated: [ambari]
update ambari from 1.3.4 to 1.3.5 (#4707)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch 1.3.5-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.5-prepare by this push:
new a382590 [ambari] update ambari from 1.3.4 to 1.3.5 (#4707)
a382590 is described below
commit a3825904ad2316175afe5e60e3843e73983e1951
Author: lgcareer <18...@163.com>
AuthorDate: Sat Feb 6 18:30:04 2021 +0800
[ambari] update ambari from 1.3.4 to 1.3.5 (#4707)
---
ambari_plugin/common-services/DOLPHIN/{1.3.4 => 1.3.5}/alerts.json | 6 +++---
.../DOLPHIN/{1.3.4 => 1.3.5}/configuration/dolphin-alert.xml | 0
.../{1.3.4 => 1.3.5}/configuration/dolphin-application-api.xml | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/configuration/dolphin-common.xml | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/configuration/dolphin-datasource.xml | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/configuration/dolphin-env.xml | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/configuration/dolphin-master.xml | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/configuration/dolphin-quartz.xml | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/configuration/dolphin-worker.xml | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/configuration/dolphin-zookeeper.xml | 0
ambari_plugin/common-services/DOLPHIN/{1.3.4 => 1.3.5}/metainfo.xml | 2 +-
.../package/alerts/alert_dolphin_scheduler_status.py | 0
.../{1.3.4 => 1.3.5}/package/scripts/dolphin_alert_service.py | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/scripts/dolphin_api_service.py | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/scripts/dolphin_env.py | 0
.../{1.3.4 => 1.3.5}/package/scripts/dolphin_logger_service.py | 0
.../{1.3.4 => 1.3.5}/package/scripts/dolphin_master_service.py | 0
.../{1.3.4 => 1.3.5}/package/scripts/dolphin_worker_service.py | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/scripts/params.py | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/scripts/service_check.py | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/scripts/status_params.py | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/templates/alert.properties.j2 | 0
.../package/templates/application-api.properties.j2 | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/templates/common.properties.j2 | 0
.../{1.3.4 => 1.3.5}/package/templates/datasource.properties.j2 | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/templates/dolphin-daemon.sh.j2 | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/templates/master.properties.j2 | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/templates/quartz.properties.j2 | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/package/templates/worker.properties.j2 | 0
.../{1.3.4 => 1.3.5}/package/templates/zookeeper.properties.j2 | 0
.../DOLPHIN/{1.3.4 => 1.3.5}/quicklinks/quicklinks.json | 0
.../common-services/DOLPHIN/{1.3.4 => 1.3.5}/themes/theme.json | 0
ambari_plugin/statcks/DOLPHIN/metainfo.xml | 2 +-
33 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/alerts.json b/ambari_plugin/common-services/DOLPHIN/1.3.5/alerts.json
similarity index 95%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/alerts.json
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/alerts.json
index 08c7b22..d839672 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.4/alerts.json
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.5/alerts.json
@@ -65,7 +65,7 @@
"enabled": true,
"source": {
"type": "SCRIPT",
- "path": "DOLPHIN/1.3.4/package/alerts/alert_dolphin_scheduler_status.py",
+ "path": "DOLPHIN/1.3.5/package/alerts/alert_dolphin_scheduler_status.py",
"parameters": [
{
@@ -98,7 +98,7 @@
"enabled": true,
"source": {
"type": "SCRIPT",
- "path": "DOLPHIN/1.3.4/package/alerts/alert_dolphin_scheduler_status.py",
+ "path": "DOLPHIN/1.3.5/package/alerts/alert_dolphin_scheduler_status.py",
"parameters": [
{
@@ -131,7 +131,7 @@
"enabled": true,
"source": {
"type": "SCRIPT",
- "path": "DOLPHIN/1.3.4/package/alerts/alert_dolphin_scheduler_status.py",
+ "path": "DOLPHIN/1.3.5/package/alerts/alert_dolphin_scheduler_status.py",
"parameters": [
{
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-alert.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-alert.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-alert.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-alert.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-application-api.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-application-api.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-application-api.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-application-api.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-common.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-common.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-common.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-common.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-datasource.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-datasource.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-datasource.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-datasource.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-env.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-env.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-env.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-env.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-master.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-master.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-master.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-master.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-quartz.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-quartz.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-quartz.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-quartz.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-worker.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-worker.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-worker.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-worker.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-zookeeper.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-zookeeper.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/configuration/dolphin-zookeeper.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/configuration/dolphin-zookeeper.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/metainfo.xml b/ambari_plugin/common-services/DOLPHIN/1.3.5/metainfo.xml
similarity index 99%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/metainfo.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/metainfo.xml
index c25ded5..ac65d93 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.4/metainfo.xml
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.5/metainfo.xml
@@ -22,7 +22,7 @@
<name>DOLPHIN</name>
<displayName>Dolphin Scheduler</displayName>
<comment>分布式易扩展的可视化DAG工作流任务调度系统</comment>
- <version>1.3.4</version>
+ <version>1.3.5</version>
<components>
<component>
<name>DOLPHIN_MASTER</name>
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/alerts/alert_dolphin_scheduler_status.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/alerts/alert_dolphin_scheduler_status.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/alerts/alert_dolphin_scheduler_status.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/alerts/alert_dolphin_scheduler_status.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_alert_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_alert_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_alert_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_alert_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_api_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_api_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_api_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_api_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_env.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_env.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_env.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_env.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_logger_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_logger_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_logger_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_logger_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_master_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_master_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_master_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_master_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_worker_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_worker_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/dolphin_worker_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/dolphin_worker_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/params.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/params.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/params.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/params.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/service_check.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/service_check.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/service_check.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/service_check.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/status_params.py b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/status_params.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/scripts/status_params.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/scripts/status_params.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/alert.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/alert.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/alert.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/alert.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/application-api.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/application-api.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/application-api.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/application-api.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/common.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/common.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/common.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/common.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/datasource.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/datasource.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/datasource.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/datasource.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/dolphin-daemon.sh.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/dolphin-daemon.sh.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/dolphin-daemon.sh.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/dolphin-daemon.sh.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/master.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/master.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/master.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/master.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/quartz.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/quartz.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/quartz.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/quartz.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/worker.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/worker.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/worker.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/worker.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/zookeeper.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/zookeeper.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/package/templates/zookeeper.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/package/templates/zookeeper.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/quicklinks/quicklinks.json b/ambari_plugin/common-services/DOLPHIN/1.3.5/quicklinks/quicklinks.json
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/quicklinks/quicklinks.json
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/quicklinks/quicklinks.json
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.4/themes/theme.json b/ambari_plugin/common-services/DOLPHIN/1.3.5/themes/theme.json
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.4/themes/theme.json
rename to ambari_plugin/common-services/DOLPHIN/1.3.5/themes/theme.json
diff --git a/ambari_plugin/statcks/DOLPHIN/metainfo.xml b/ambari_plugin/statcks/DOLPHIN/metainfo.xml
index 2854c49..f3f5414 100755
--- a/ambari_plugin/statcks/DOLPHIN/metainfo.xml
+++ b/ambari_plugin/statcks/DOLPHIN/metainfo.xml
@@ -20,7 +20,7 @@
<services>
<service>
<name>DOLPHIN</name>
- <extends>common-services/DOLPHIN/1.3.4</extends>
+ <extends>common-services/DOLPHIN/1.3.5</extends>
</service>
</services>
</metainfo>
\ No newline at end of file