This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 011c4cf5c Automated deployment:
bd5d4b4eadf206439824a437649690f6710ca0d8
011c4cf5c is described below
commit 011c4cf5caeb22b67e0a09ced19438155e04af34
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon May 23 05:10:58 2022 +0000
Automated deployment: bd5d4b4eadf206439824a437649690f6710ca0d8
---
.../dev/user_doc/architecture/configuration.html | 119 +++++++++++++-------
.../dev/user_doc/architecture/configuration.json | 2 +-
.../docs/dev/user_doc/guide/parameter/global.html | 23 ++--
.../docs/dev/user_doc/guide/parameter/global.json | 2 +-
img/new_ui/dev/parameter/global_parameter01.png | Bin 0 -> 148147 bytes
img/new_ui/dev/parameter/global_parameter02.png | Bin 0 -> 141585 bytes
img/new_ui/dev/parameter/global_parameter03.png | Bin 0 -> 312613 bytes
.../dev/user_doc/architecture/configuration.html | 122 ++++++++++++++-------
.../dev/user_doc/architecture/configuration.json | 2 +-
.../docs/dev/user_doc/guide/parameter/global.html | 23 ++--
.../docs/dev/user_doc/guide/parameter/global.json | 2 +-
11 files changed, 194 insertions(+), 101 deletions(-)
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.html
b/en-us/docs/dev/user_doc/architecture/configuration.html
index cd7e2f403..403919ca0 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.html
+++ b/en-us/docs/dev/user_doc/architecture/configuration.html
@@ -19,44 +19,87 @@
Check the following simplified DolphinScheduler installation directories to
have a direct view about the position of [conf] directory and configuration
files it has.
This document only describes DolphinScheduler configurations and other topics
are not going into.</p>
<p>[Note: the DolphinScheduler (hereinafter called the ‘DS’) .]</p>
-<pre><code>├─bin DS application commands
directory
-│ ├─dolphinscheduler-daemon.sh startup or shutdown DS application
-│ ├─start-all.sh startup all DS services with
configurations
-│ ├─stop-all.sh shutdown all DS services with
configurations
-├─conf configurations directory
-│ ├─application-api.properties API-service config properties
-│ ├─datasource.properties datasource config properties
-│ ├─zookeeper.properties ZooKeeper config properties
-│ ├─master.properties master-service config properties
-│ ├─worker.properties worker-service config properties
-│ ├─quartz.properties quartz config properties
-│ ├─common.properties common-service [storage] config
properties
-│ ├─alert.properties alert-service config properties
-│ ├─config environment variables config directory
-│ ├─install_config.conf DS environment variables
configuration script [install or start DS]
-│ ├─env load environment variables configs
script directory
-│ ├─dolphinscheduler_env.sh load environment variables configs
[eg: JAVA_HOME,HADOOP_HOME, HIVE_HOME ...]
-│ ├─org mybatis mapper files directory
-│ ├─i18n i18n configs directory
-│ ├─logback-api.xml API-service log config
-│ ├─logback-master.xml master-service log config
-│ ├─logback-worker.xml worker-service log config
-│ ├─logback-alert.xml alert-service log config
-├─sql .sql files to create or upgrade DS
metadata
-│ ├─create create SQL scripts directory
-│ ├─upgrade upgrade SQL scripts directory
-│ ├─dolphinscheduler_postgre.sql PostgreSQL database init script
-│ ├─dolphinscheduler_mysql.sql MySQL database init script
-│ ├─soft_version current DS version-id file
-├─script DS services deployment, database create or
upgrade scripts directory
-│ ├─create-dolphinscheduler.sh DS database init script
-│ ├─upgrade-dolphinscheduler.sh DS database upgrade script
-│ ├─monitor-server.sh DS monitor-server start script
-│ ├─scp-hosts.sh transfer installation files script
-│ ├─remove-zk-node.sh cleanup ZooKeeper caches script
-├─ui front-end web resources directory
-├─lib DS .jar dependencies directory
-├─install.sh auto-setup DS services script
+<pre><code>├── LICENSE
+│
+├── NOTICE
+│
+├── licenses directory of licenses
+│
+├── bin directory of DolphinScheduler
application commands, configrations scripts
+│ ├── dolphinscheduler-daemon.sh script to start or shut down
DolphinScheduler application
+│ ├── env directory of scripts to load
environment variables
+│ │ ├── dolphinscheduler_env.sh script to export environment
variables [eg: JAVA_HOME,HADOOP_HOME, HIVE_HOME ...] when you start or stop
service using script `dolphinscheduler-daemon.sh`
+│ │ └── install_env.sh script to export environment
variables for DolphinScheduler installation when you use scripts `install.sh`
`start-all.sh` `stop-all.sh` `status-all.sh`
+│ ├── install.sh script to auto-setup services
when you deploy DolphinScheduler in `psuedo-cluster` mode or `cluster` mode
+│ ├── remove-zk-node.sh script to cleanup ZooKeeper
caches
+│ ├── scp-hosts.sh script to copy installation
files to target hosts
+│ ├── start-all.sh script to start all services
when you deploy DolphinScheduler in `psuedo-cluster` mode or `cluster` mode
+│ ├── status-all.sh script to check the status of
all services when you deploy DolphinScheduler in `psuedo-cluster` mode or
`cluster` mode
+│ └── stop-all.sh script to shut down all
services when you deploy DolphinScheduler in `psuedo-cluster` mode or `cluster`
mode
+│
+├── alert-server directory of DolphinScheduler
alert-server commands, configrations scripts and libs
+│ ├── bin
+│ │ └── start.sh script to start
DolphinScheduler alert-server
+│ ├── conf
+│ │ ├── application.yaml configurations of alert-server
+│ │ ├── common.properties configurations of
common-service like storage, credentials, etc.
+│ │ ├── dolphinscheduler_env.sh script to load environment
variables for alert-server
+│ │ └── logback-spring.xml configurations of
alert-service log
+│ └── libs directory of alert-server libs
+│
+├── api-server directory of DolphinScheduler
api-server commands, configrations scripts and libs
+│ ├── bin
+│ │ └── start.sh script to start
DolphinScheduler api-server
+│ ├── conf
+│ │ ├── application.yaml configurations of api-server
+│ │ ├── common.properties configurations of
common-service like storage, credentials, etc.
+│ │ ├── dolphinscheduler_env.sh script to load environment
variables for api-server
+│ │ └── logback-spring.xml configurations of api-service
log
+│ ├── libs directory of api-server libs
+│ └── ui directory of api-server
related front-end web resources
+│
+├── master-server directory of DolphinScheduler
master-server commands, configrations scripts and libs
+│ ├── bin
+│ │ └── start.sh script to start
DolphinScheduler master-server
+│ ├── conf
+│ │ ├── application.yaml configurations of master-server
+│ │ ├── common.properties configurations of
common-service like storage, credentials, etc.
+│ │ ├── dolphinscheduler_env.sh script to load environment
variables for master-server
+│ │ └── logback-spring.xml configurations of
master-service log
+│ └── libs directory of master-server libs
+│
+├── standalone-server directory of DolphinScheduler
standalone-server commands, configrations scripts and libs
+│ ├── bin
+│ │ └── start.sh script to start
DolphinScheduler standalone-server
+│ ├── conf
+│ │ ├── application.yaml configurations of
standalone-server
+│ │ ├── common.properties configurations of
common-service like storage, credentials, etc.
+│ │ ├── dolphinscheduler_env.sh script to load environment
variables for standalone-server
+│ │ ├── logback-spring.xml configurations of
standalone-service log
+│ │ └── sql .sql files to create or
upgrade DolphinScheduler metadata
+│ ├── libs directory of standalone-server
libs
+│ └── ui directory of standalone-server
related front-end web resources
+│
+├── tools directory of DolphinScheduler
metadata tools commands, configrations scripts and libs
+│ ├── bin
+│ │ └── upgrade-schema.sh script to initialize or
upgrade DolphinScheduler metadata
+│ ├── conf
+│ │ ├── application.yaml configurations of tools
+│ │ └── common.properties configurations of
common-service like storage, credentials, etc.
+│ ├── libs directory of tool libs
+│ └── sql .sql files to create or
upgrade DolphinScheduler metadata
+│
+├── worker-server directory of DolphinScheduler
worker-server commands, configrations scripts and libs
+│ ├── bin
+│ │ └── start.sh script to start
DolphinScheduler worker-server
+│ ├── conf
+│ │ ├── application.yaml configurations of worker-server
+│ │ ├── common.properties configurations of
common-service like storage, credentials, etc.
+│ │ ├── dolphinscheduler_env.sh script to load environment
variables for worker-server
+│ │ └── logback-spring.xml configurations of
worker-service log
+│ └── libs directory of worker-server libs
+│
+└── ui directory of front-end web
resources
</code></pre>
<h2>Configurations in Details</h2>
<table>
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.json
b/en-us/docs/dev/user_doc/architecture/configuration.json
index adaab3615..04e3fd7e4 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.json
+++ b/en-us/docs/dev/user_doc/architecture/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h1>Configuration</h1>\n<h2>Preface</h2>\n<p>This document explains the
DolphinScheduler application configurations according to DolphinScheduler-1.3.x
versions.</p>\n<h2>Directory Structure</h2>\n<p>Currently, all the
configuration files are under [conf ] directory.\nCheck the following
simplified DolphinScheduler installation directories to have a direct view
about the position of [conf] directory and configuration files it has.\nThis
[...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h1>Configuration</h1>\n<h2>Preface</h2>\n<p>This document explains the
DolphinScheduler application configurations according to DolphinScheduler-1.3.x
versions.</p>\n<h2>Directory Structure</h2>\n<p>Currently, all the
configuration files are under [conf ] directory.\nCheck the following
simplified DolphinScheduler installation directories to have a direct view
about the position of [conf] directory and configuration files it has.\nThis
[...]
"link": "/dist/en-us/docs/dev/user_doc/architecture/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/parameter/global.html
b/en-us/docs/dev/user_doc/guide/parameter/global.html
index ab459d9ee..2025853af 100644
--- a/en-us/docs/dev/user_doc/guide/parameter/global.html
+++ b/en-us/docs/dev/user_doc/guide/parameter/global.html
@@ -12,16 +12,21 @@
<body>
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="banner-tips"><div>🤔
Have queries regarding Apache DolphinScheduler, Join Slack channel to disscuss
them <a class="link-tips"
href="https://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw">join
#dolphinscheduler channel</a>! 🌟</div></div><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span> [...]
<h2>Scope</h2>
-<p>The parameters defined on the process definition page can apply to all the
scope of the process tasks.</p>
+<p>Global parameters are parameters that are valid for all task nodes of the
entire workflow. It can be configured on the workflow definition page.</p>
<h2>Usage</h2>
-<p>Usage of global parameters is: at the process define page, click the '+'
beside the 'Set global' and fill in the key and value to save:</p>
-<p align="center">
- <img src="/img/supplement_global_parameter_en.png" width="80%" />
- </p>
-<p align="center">
- <img src="/img/local_parameter_en.png" width="80%" />
- </p>
-<p>The <code>global_bizdate</code> parameter defined here can be referenced by
local parameters of any other task node, and set the value of
<code>global_bizdate</code> by referencing the system parameter
<code>system.biz.date</code>.</p>
+<p>The specific use method can be determined according to the actual
production situation. This example uses a shell task to print out the date
value of yesterday.</p>
+<h3>Create a Shell task</h3>
+<p>Create a shell task and enter <code>echo ${dt}</code> in the script
content. In this case, dt is the global parameter we need to declare. As shown
below:</p>
+<p><img src="/img/new_ui/dev/parameter/global_parameter01.png"
alt="global-parameter01"></p>
+<h3>Save the workflow and set global parameters</h3>
+<p>You could follow this guide to set global parameter: On the workflow
definition page, click the plus sign to the right of "Set Global",
after filling in the variable name and value, then save it</p>
+<p><img src="/img/new_ui/dev/parameter/global_parameter02.png"
alt="global-parameter02"></p>
+<blockquote>
+<p>Note: The dt parameter defined here can be referenced by the local
parameters of any other node.</p>
+</blockquote>
+<h3>In task instance view execution result</h3>
+<p>On the task instance page, you can check the log to verify the execution
result of the task and determine whether the parameters are valid.</p>
+<p><img src="/img/new_ui/dev/parameter/global_parameter03.png"
alt="global-parameter03"></p>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>About us</h3><h4>Do you need feedback? Please
contact us through the following ways.</h4></div><div
class="contact-container"><ul><li><a
href="/en-us/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>Email List</p></a></li><li><a
href="https://twitter.com/dolphinschedule"><img class="img-base"
src="/img/twittergray.png [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/en-us/docs/dev/user_doc/guide/parameter/global.json
b/en-us/docs/dev/user_doc/guide/parameter/global.json
index 0e9d998b5..80aea6aab 100644
--- a/en-us/docs/dev/user_doc/guide/parameter/global.json
+++ b/en-us/docs/dev/user_doc/guide/parameter/global.json
@@ -1,6 +1,6 @@
{
"filename": "global.md",
- "__html": "<h1>Global Parameter</h1>\n<h2>Scope</h2>\n<p>The parameters
defined on the process definition page can apply to all the scope of the
process tasks.</p>\n<h2>Usage</h2>\n<p>Usage of global parameters is: at the
process define page, click the '+' beside the 'Set global' and fill in the key
and value to save:</p>\n<p align=\"center\">\n <img
src=\"/img/supplement_global_parameter_en.png\" width=\"80%\" />\n </p>\n<p
align=\"center\">\n <img src=\"/img/local_parameter_en.pn [...]
+ "__html": "<h1>Global Parameter</h1>\n<h2>Scope</h2>\n<p>Global parameters
are parameters that are valid for all task nodes of the entire workflow. It can
be configured on the workflow definition page.</p>\n<h2>Usage</h2>\n<p>The
specific use method can be determined according to the actual production
situation. This example uses a shell task to print out the date value of
yesterday.</p>\n<h3>Create a Shell task</h3>\n<p>Create a shell task and enter
<code>echo ${dt}</code> in the scri [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/parameter/global.html",
"meta": {}
}
\ No newline at end of file
diff --git a/img/new_ui/dev/parameter/global_parameter01.png
b/img/new_ui/dev/parameter/global_parameter01.png
new file mode 100644
index 000000000..f2d6c0303
Binary files /dev/null and b/img/new_ui/dev/parameter/global_parameter01.png
differ
diff --git a/img/new_ui/dev/parameter/global_parameter02.png
b/img/new_ui/dev/parameter/global_parameter02.png
new file mode 100644
index 000000000..326f4954a
Binary files /dev/null and b/img/new_ui/dev/parameter/global_parameter02.png
differ
diff --git a/img/new_ui/dev/parameter/global_parameter03.png
b/img/new_ui/dev/parameter/global_parameter03.png
new file mode 100644
index 000000000..2308b6a75
Binary files /dev/null and b/img/new_ui/dev/parameter/global_parameter03.png
differ
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.html
b/zh-cn/docs/dev/user_doc/architecture/configuration.html
index 06d610fc0..52715a3df 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.html
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.html
@@ -18,47 +18,87 @@
为了更直观的了解[conf]目录所在的位置以及包含的配置文件,请查看下面dolphinscheduler安装目录的简化说明.
本文主要讲述dolphinscheduler的配置文件.其他部分先不做赘述.</p>
<p>[注:以下 dolphinscheduler 简称为DS.]</p>
-<pre><code>
-├─bin DS命令存放目录
-│ ├─dolphinscheduler-daemon.sh 启动/关闭DS服务脚本
-│ ├─start-all.sh 根据配置文件启动所有DS服务
-│ ├─stop-all.sh 根据配置文件关闭所有DS服务
-├─conf 配置文件目录
-│ ├─application-api.properties api服务配置文件
-│ ├─datasource.properties 数据库配置文件
-│ ├─zookeeper.properties zookeeper配置文件
-│ ├─master.properties master服务配置文件
-│ ├─worker.properties worker服务配置文件
-│ ├─quartz.properties quartz服务配置文件
-│ ├─common.properties 公共服务[存储]配置文件
-│ ├─alert.properties alert服务配置文件
-│ ├─config 环境变量配置文件夹
-│ ├─install_config.conf DS环境变量配置脚本[用于DS安装/启动]
-│ ├─env 运行脚本环境变量配置目录
-│ ├─dolphinscheduler_env.sh 运行脚本加载环境变量配置文件[如:
JAVA_HOME,HADOOP_HOME, HIVE_HOME ...]
-│ ├─org mybatis mapper文件目录
-│ ├─i18n i18n配置文件目录
-│ ├─logback-api.xml api服务日志配置文件
-│ ├─logback-master.xml master服务日志配置文件
-│ ├─logback-worker.xml worker服务日志配置文件
-│ ├─logback-alert.xml alert服务日志配置文件
-├─sql DS的元数据创建升级sql文件
-│ ├─create 创建SQL脚本目录
-│ ├─upgrade 升级SQL脚本目录
-│ ├─dolphinscheduler_postgre.sql postgre数据库初始化脚本
-│ ├─dolphinscheduler_mysql.sql mysql数据库初始化脚本
-│ ├─soft_version 当前DS版本标识文件
-├─script DS服务部署,数据库创建/升级脚本目录
-│ ├─create-dolphinscheduler.sh DS数据库初始化脚本
-│ ├─upgrade-dolphinscheduler.sh DS数据库升级脚本
-│ ├─monitor-server.sh DS服务监控启动脚本
-│ ├─scp-hosts.sh 安装文件传输脚本
-│ ├─remove-zk-node.sh 清理zookeeper缓存文件脚本
-├─ui 前端WEB资源目录
-├─lib DS依赖的jar存放目录
-├─install.sh 自动安装DS服务脚本
-
-
+<pre><code>├── LICENSE
+│
+├── NOTICE
+│
+├── licenses licenses存放目录
+│
+├── bin DolphinScheduler命令和环境变量配置存放目录
+│ ├── dolphinscheduler-daemon.sh 启动/关闭DolphinScheduler服务脚本
+│ ├── env 环境变量配置存放目录
+│ │ ├── dolphinscheduler_env.sh
当使用`dolphinscheduler-daemon.sh`脚本起停服务时,运行此脚本加载环境变量配置文件
[如:JAVA_HOME,HADOOP_HOME, HIVE_HOME ...]
+│ │ └── install_env.sh 当使用`install.sh` `start-all.sh`
`stop-all.sh` `status-all.sh`脚本时,运行此脚本为DolphinScheduler安装加载环境变量配置
+│ ├── install.sh
当使用`集群`模式或`伪集群`模式部署DolphinScheduler时,运行此脚本自动安装服务
+│ ├── remove-zk-node.sh 清理zookeeper缓存文件脚本
+│ ├── scp-hosts.sh 安装文件传输脚本
+│ ├── start-all.sh
当使用`集群`模式或`伪集群`模式部署DolphinScheduler时,运行此脚本启动所有服务
+│ ├── status-all.sh
当使用`集群`模式或`伪集群`模式部署DolphinScheduler时,运行此脚本获取所有服务状态
+│ └── stop-all.sh
当使用`集群`模式或`伪集群`模式部署DolphinScheduler时,运行此脚本终止所有服务
+│
+├── alert-server DolphinScheduler
alert-server命令、配置和依赖存放目录
+│ ├── bin
+│ │ └── start.sh DolphinScheduler
alert-server启动脚本
+│ ├── conf
+│ │ ├── application.yaml alert-server配置文件
+│ │ ├── common.properties 公共服务(存储等信息)配置文件
+│ │ ├── dolphinscheduler_env.sh alert-server环境变量配置加载脚本
+│ │ └── logback-spring.xml alert-service日志配置文件
+│ └── libs alert-server依赖jar包存放目录
+│
+├── api-server DolphinScheduler
api-server命令、配置和依赖存放目录
+│ ├── bin
+│ │ └── start.sh DolphinScheduler api-server启动脚本
+│ ├── conf
+│ │ ├── application.yaml api-server配置文件
+│ │ ├── common.properties 公共服务(存储等信息)配置文件
+│ │ ├── dolphinscheduler_env.sh api-server环境变量配置加载脚本
+│ │ └── logback-spring.xml api-service日志配置文件
+│ ├── libs api-server依赖jar包存放目录
+│ └── ui api-server相关前端WEB资源存放目录
+│
+├── master-server DolphinScheduler
master-server命令、配置和依赖存放目录
+│ ├── bin
+│ │ └── start.sh DolphinScheduler
master-server启动脚本
+│ ├── conf
+│ │ ├── application.yaml master-server配置文件
+│ │ ├── common.properties 公共服务(存储等信息)配置文件
+│ │ ├── dolphinscheduler_env.sh master-server环境变量配置加载脚本
+│ │ └── logback-spring.xml master-service日志配置文件
+│ └── libs master-server依赖jar包存放目录
+│
+├── standalone-server DolphinScheduler
standalone-server命令、配置和依赖存放目录
+│ ├── bin
+│ │ └── start.sh DolphinScheduler
standalone-server启动脚本
+│ ├── conf
+│ │ ├── application.yaml standalone-server配置文件
+│ │ ├── common.properties 公共服务(存储等信息)配置文件
+│ │ ├── dolphinscheduler_env.sh standalone-server环境变量配置加载脚本
+│ │ ├── logback-spring.xml standalone-service日志配置文件
+│ │ └── sql DolphinScheduler元数据创建/升级sql文件
+│ ├── libs standalone-server依赖jar包存放目录
+│ └── ui standalone-server相关前端WEB资源存放目录
+│
+├── tools
DolphinScheduler元数据工具命令、配置和依赖存放目录
+│ ├── bin
+│ │ └── upgrade-schema.sh DolphinScheduler元数据创建/升级脚本
+│ ├── conf
+│ │ ├── application.yaml 元数据工具配置文件
+│ │ └── common.properties 公共服务(存储等信息)配置文件
+│ ├── libs 元数据工具依赖jar包存放目录
+│ └── sql DolphinScheduler元数据创建/升级sql文件
+│
+├── worker-server DolphinScheduler
worker-server命令、配置和依赖存放目录
+│ ├── bin
+│ │ └── start.sh DolphinScheduler
worker-server启动脚本
+│ ├── conf
+│ │ ├── application.yaml worker-server配置文件
+│ │ ├── common.properties 公共服务(存储等信息)配置文件
+│ │ ├── dolphinscheduler_env.sh worker-server环境变量配置加载脚本
+│ │ └── logback-spring.xml worker-service日志配置文件
+│ └── libs worker-server依赖jar包存放目录
+│
+└── ui 前端WEB资源目录
</code></pre>
<h1>配置文件详解</h1>
<table>
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.json
b/zh-cn/docs/dev/user_doc/architecture/configuration.json
index dc221d5aa..413661147 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.json
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h1>前言</h1>\n<p>本文档为dolphinscheduler配置文件说明文档,针对版本为 dolphinscheduler-1.3.x
版本.</p>\n<h1>目录结构</h1>\n<p>目前dolphinscheduler 所有的配置文件都在 [conf ]
目录中.\n为了更直观的了解[conf]目录所在的位置以及包含的配置文件,请查看下面dolphinscheduler安装目录的简化说明.\n本文主要讲述dolphinscheduler的配置文件.其他部分先不做赘述.</p>\n<p>[注:以下
dolphinscheduler 简称为DS.]</p>\n<pre><code>\n├─bin
DS命令存放目录\n│ ├─dolphinscheduler-daemon.sh 启动/关闭DS服务脚本\n│
├─start-all.sh [...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h1>前言</h1>\n<p>本文档为dolphinscheduler配置文件说明文档,针对版本为 dolphinscheduler-1.3.x
版本.</p>\n<h1>目录结构</h1>\n<p>目前dolphinscheduler 所有的配置文件都在 [conf ]
目录中.\n为了更直观的了解[conf]目录所在的位置以及包含的配置文件,请查看下面dolphinscheduler安装目录的简化说明.\n本文主要讲述dolphinscheduler的配置文件.其他部分先不做赘述.</p>\n<p>[注:以下
dolphinscheduler 简称为DS.]</p>\n<pre><code>├── LICENSE\n│\n├── NOTICE\n│\n├──
licenses licenses存放目录\n│\n├── bin
[...]
"link": "/dist/zh-cn/docs/dev/user_doc/architecture/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/parameter/global.html
b/zh-cn/docs/dev/user_doc/guide/parameter/global.html
index 9d8c7eb4c..1d39b1819 100644
--- a/zh-cn/docs/dev/user_doc/guide/parameter/global.html
+++ b/zh-cn/docs/dev/user_doc/guide/parameter/global.html
@@ -12,16 +12,21 @@
<body>
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="banner-tips"><div>🤔
有关于 Apache DolphinScheduler 的疑问,加入 Slack 频道来讨论他们 <a class="link-tips"
href="https://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw">join
#dolphinscheduler channel</a>! 🌟</div></div><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/zh-cn/index.html"><img cl [...]
<h2>作用域</h2>
-<p>在工作流定义页面配置的参数,作用于该工作流中全部的任务</p>
+<p>全局参数是指针对<strong>整个工作流</strong>的所有任务节点都有效的参数,在工作流定义页面配置。</p>
<h2>使用方式</h2>
-<p>全局参数配置方式如下:在工作流定义页面,点击“设置全局”右边的加号,填写对应的变量名称和对应的值,保存即可</p>
-<p align="center">
- <img src="/img/supplement_global_parameter.png" width="80%" />
-</p>
-<p align="center">
- <img src="/img/local_parameter.png" width="80%" />
-</p>
-<p>这里定义的global_bizdate参数可以被其它任一节点的局部参数引用,并设置global_bizdate的value为通过引用系统参数system.biz.date获得的值</p>
+<p>具体的使用方式可结合实际的生产情况而定,这里演示为使用 Shell 任务打印出前一天的日期。</p>
+<h3>创建 Shell 任务</h3>
+<p>创建一个 Shell 任务,并在脚本内容中输入 <code>echo ${dt}</code>。此时 dt
则为我们需要声明的全局参数。如下图所示:</p>
+<p><img src="/img/new_ui/dev/parameter/global_parameter01.png"
alt="global-parameter01"></p>
+<h3>保存工作流,并设置全局参数</h3>
+<p>全局参数配置方式如下:在工作流定义页面,点击“设置全局”右边的加号,填写对应的变量名称和对应的值,保存即可。如下图所示:</p>
+<p><img src="/img/new_ui/dev/parameter/global_parameter02.png"
alt="global-parameter02"></p>
+<blockquote>
+<p>注:这里定义的 dt 参数可以被其它任一节点的局部参数引用。</p>
+</blockquote>
+<h3>任务实例查看执行结果</h3>
+<p>进入任务实例页面,可以通过查看日志,验证任务的执行结果,判断参数是否有效。</p>
+<p><img src="/img/new_ui/dev/parameter/global_parameter03.png"
alt="global-parameter03"></p>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>联系我们</h3><h4>有问题需要反馈?请通过以下方式联系我们。</h4></div><div
class="contact-container"><ul><li><a
href="/zh-cn/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>邮件列表</p></a></li><li><a
href="https://twitter.com/dolphinschedule"><img class="img-base"
src="/img/twittergray.png"/><img class="img-change"
src="/img/twitterblue.png"/><p [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/zh-cn/docs/dev/user_doc/guide/parameter/global.json
b/zh-cn/docs/dev/user_doc/guide/parameter/global.json
index e207e05dd..f0df4b5ee 100644
--- a/zh-cn/docs/dev/user_doc/guide/parameter/global.json
+++ b/zh-cn/docs/dev/user_doc/guide/parameter/global.json
@@ -1,6 +1,6 @@
{
"filename": "global.md",
- "__html":
"<h1>全局参数</h1>\n<h2>作用域</h2>\n<p>在工作流定义页面配置的参数,作用于该工作流中全部的任务</p>\n<h2>使用方式</h2>\n<p>全局参数配置方式如下:在工作流定义页面,点击“设置全局”右边的加号,填写对应的变量名称和对应的值,保存即可</p>\n<p
align=\"center\">\n <img src=\"/img/supplement_global_parameter.png\"
width=\"80%\" />\n</p>\n<p align=\"center\">\n <img
src=\"/img/local_parameter.png\" width=\"80%\"
/>\n</p>\n<p>这里定义的global_bizdate参数可以被其它任一节点的局部参数引用,并设置global_bizdate的value为通过引用系统参数system.biz.date获得的值</p>\n",
+ "__html":
"<h1>全局参数</h1>\n<h2>作用域</h2>\n<p>全局参数是指针对<strong>整个工作流</strong>的所有任务节点都有效的参数,在工作流定义页面配置。</p>\n<h2>使用方式</h2>\n<p>具体的使用方式可结合实际的生产情况而定,这里演示为使用
Shell 任务打印出前一天的日期。</p>\n<h3>创建 Shell 任务</h3>\n<p>创建一个 Shell 任务,并在脚本内容中输入
<code>echo ${dt}</code>。此时 dt 则为我们需要声明的全局参数。如下图所示:</p>\n<p><img
src=\"/img/new_ui/dev/parameter/global_parameter01.png\"
alt=\"global-parameter01\"></p>\n<h3>保存工作流,并设置全局参数</h3>\n<p>全局参数配置方式如下:在工作流定义页面,点击“设置全局”右边的加号,填写对应的变量名称和对应的值,保存即可。如下图所示:</p>\n<p><img
src=\"/img/n [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/parameter/global.html",
"meta": {}
}
\ No newline at end of file