Browse Source

merge from dev-1.3.0

pull/3/MERGE
lenboo 4 years ago
parent
commit
cb6c711833
  1. 25
      ambari_plugin/README.md
  2. 60
      ambari_plugin/common-services/DOLPHIN/1.3.0/alerts.json
  3. 2
      ambari_plugin/common-services/DOLPHIN/1.3.0/metainfo.xml
  4. 3
      ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_alert_service.py
  5. 3
      ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_api_service.py
  6. 4
      ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_logger_service.py
  7. 3
      ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_master_service.py
  8. 3
      ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_worker_service.py

25
ambari_plugin/README.md

@ -3,7 +3,8 @@
#### Note #### Note
1. This document is intended for users with a basic understanding of Ambari 1. This document is intended for users with a basic understanding of Ambari
2. This document is a description of adding the Dolphin Scheduler(version 1.3.0) service to the installed Ambari service 2. This document is a description of adding the Dolphin Scheduler service to the installed Ambari service
3. This document is based on version 2.5.2 of Ambari
#### Installation preparation #### Installation preparation
@ -16,8 +17,12 @@
3. Install with rpm package 3. Install with rpm package
- Manual installation (recommended): - Manual installation (recommended):
- Copy the prepared RPM packages to each node of the cluster - Copy the prepared RPM packages to each node of the cluster.
- Execute with DS installation user: ```rpm -ivh apache-dolphinscheduler-incubating-xxx.noarch.rpm``` - Execute with DS installation user: ```rpm -ivh apache-dolphinscheduler-incubating-xxx.noarch.rpm```
- Mysql-connector-java packaged using the default POM file will not be included.
- The RPM package was packaged in the project with the installation path of /opt/soft.
If you use mysql as the database, you need add it manually.
- Automatic installation with ambari - Automatic installation with ambari
- Each node of the cluster needs to configure the local yum source - Each node of the cluster needs to configure the local yum source
- Copy the prepared RPM packages to each node local yum source - Copy the prepared RPM packages to each node local yum source
@ -45,6 +50,7 @@
#### Ambari Install Dolphin Scheduler #### Ambari Install Dolphin Scheduler
- **NOTE: You have to install zookeeper first**
1. Install Dolphin Scheduler on ambari web interface 1. Install Dolphin Scheduler on ambari web interface
@ -62,21 +68,25 @@
![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_004.png) ![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_004.png)
5. Configure the database information (same as in the initialization database in step 1) 5. System Env Optimization will export some system environment config. Modify according to actual situation
![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_020.png)
6. Configure the database information (same as in the initialization database in step 1)
![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_005.png) ![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_005.png)
6. Configure additional information if needed 7. Configure additional information if needed
![](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_006.png)
![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_007.png) ![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_007.png)
7. Perform the next steps as normal 8. Perform the next steps as normal
![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_008.png) ![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_008.png)
8. The interface after successful installation 9. The interface after successful installation
![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_009.png) ![](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_009.png)
@ -111,7 +121,6 @@
![DS2_AMBARI_016](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_016.png) ![DS2_AMBARI_016](https://github.com/apache/incubator-dolphinscheduler-website/blob/master/img/ambari-plugin/DS2_AMBARI_016.png)
#### Remove the component from the node with Ambari #### Remove the component from the node with Ambari
1. Stop the component in the corresponding node 1. Stop the component in the corresponding node

60
ambari_plugin/common-services/DOLPHIN/1.3.0/alerts.json

@ -28,6 +28,33 @@
} }
} }
], ],
"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": [ "DOLPHIN_MASTER": [
{ {
"name": "DOLPHIN_MASTER_CHECK", "name": "DOLPHIN_MASTER_CHECK",
@ -126,39 +153,6 @@
] ]
} }
} }
],
"DOLPHIN_LOGGER": [
{
"name": "DOLPHIN_LOGGER_CHECK",
"label": "check dolphin scheduler logger status",
"description": "",
"interval":10,
"scope": "HOST",
"enabled": true,
"source": {
"type": "SCRIPT",
"path": "DOLPHIN/1.3.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"
}
]
}
}
] ]
} }
} }

2
ambari_plugin/common-services/DOLPHIN/1.3.0/metainfo.xml

@ -103,7 +103,7 @@
<osFamily>any</osFamily> <osFamily>any</osFamily>
<packages> <packages>
<package> <package>
<name>apache-dolphinscheduler-incubating-1.3.0*</name> <name>apache-dolphinscheduler-incubating*</name>
</package> </package>
</packages> </packages>
</osSpecific> </osSpecific>

3
ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_alert_service.py

@ -26,7 +26,8 @@ class DolphinAlertService(Script):
import params import params
env.set_params(params) env.set_params(params)
self.install_packages(env) self.install_packages(env)
Execute(('chmod', '-R', '777', params.dolphin_home), user=params.dolphin_user, sudo=True) Execute(('chmod', '-R', '777', params.dolphin_home))
Execute(('chown', '-R', params.dolphin_user + ":" + params.dolphin_group, params.dolphin_home))
def configure(self, env): def configure(self, env):
import params import params

3
ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_api_service.py

@ -26,7 +26,8 @@ class DolphinApiService(Script):
import params import params
env.set_params(params) env.set_params(params)
self.install_packages(env) self.install_packages(env)
Execute(('chmod', '-R', '777', params.dolphin_home), user=params.dolphin_user, sudo=True) Execute(('chmod', '-R', '777', params.dolphin_home))
Execute(('chown', '-R', params.dolphin_user + ":" + params.dolphin_group, params.dolphin_home))
def configure(self, env): def configure(self, env):
import params import params

4
ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_logger_service.py

@ -26,8 +26,8 @@ class DolphinLoggerService(Script):
import params import params
env.set_params(params) env.set_params(params)
self.install_packages(env) self.install_packages(env)
Execute(('chmod', '-R', '777', params.dolphin_home), user=params.dolphin_user, sudo=True) Execute(('chmod', '-R', '777', params.dolphin_home))
Execute(('chown', '-R', params.dolphin_user + ":" + params.dolphin_group, params.dolphin_home))
def configure(self, env): def configure(self, env):
import params import params
params.pika_slave = True params.pika_slave = True

3
ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_master_service.py

@ -27,7 +27,8 @@ class DolphinMasterService(Script):
import params import params
env.set_params(params) env.set_params(params)
self.install_packages(env) self.install_packages(env)
Execute(('chmod', '-R', '777', params.dolphin_home), user=params.dolphin_user, sudo=True) Execute(('chmod', '-R', '777', params.dolphin_home))
Execute(('chown', '-R', params.dolphin_user + ":" + params.dolphin_group, params.dolphin_home))
def configure(self, env): def configure(self, env):
import params import params

3
ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_worker_service.py

@ -26,7 +26,8 @@ class DolphinWorkerService(Script):
import params import params
env.set_params(params) env.set_params(params)
self.install_packages(env) self.install_packages(env)
Execute(('chmod', '-R', '777', params.dolphin_home), user=params.dolphin_user, sudo=True) Execute(('chmod', '-R', '777', params.dolphin_home))
Execute(('chown', '-R', params.dolphin_user + ":" + params.dolphin_group, params.dolphin_home))
def configure(self, env): def configure(self, env):
import params import params

Loading…
Cancel
Save