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 9785b9e52 Automated deployment:
4d97cc3dab28602c236aadcffb847cfa90bd99ad
9785b9e52 is described below
commit 9785b9e52547c8056de9e7d861b6eb8544e3a831
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 15 05:10:19 2022 +0000
Automated deployment: 4d97cc3dab28602c236aadcffb847cfa90bd99ad
---
.../development/development-environment-setup.html | 2 +-
.../development/development-environment-setup.json | 2 +-
.../dev/user_doc/architecture/configuration.html | 35 ++++++++++++++++++++
.../dev/user_doc/architecture/configuration.json | 2 +-
.../dev/user_doc/guide/resource/configuration.html | 2 +-
.../dev/user_doc/guide/resource/configuration.json | 2 +-
python/_modules/pydolphinscheduler/core/task.html | 2 +-
.../development/development-environment-setup.html | 2 +-
.../development/development-environment-setup.json | 2 +-
.../dev/user_doc/architecture/configuration.html | 37 +++++++++++++++++++++-
.../dev/user_doc/architecture/configuration.json | 2 +-
.../dev/user_doc/guide/resource/configuration.html | 2 +-
.../dev/user_doc/guide/resource/configuration.json | 2 +-
13 files changed, 82 insertions(+), 12 deletions(-)
diff --git a/en-us/development/development-environment-setup.html
b/en-us/development/development-environment-setup.html
index 9292af4a9..abe241a0f 100644
--- a/en-us/development/development-environment-setup.html
+++ b/en-us/development/development-environment-setup.html
@@ -97,7 +97,7 @@ find . -iname 'Dockerfile'
<li>If you want to develop the latest code, choose branch branch
<code>dev</code>.</li>
</ul>
<h3>Start backend server</h3>
-<p>Find the class
<code>org.apache.dolphinscheduler.server.StandaloneServer</code> in Intellij
IDEA and clikc run main function to startup.</p>
+<p>Find the class <code>org.apache.dolphinscheduler.StandaloneServer</code> in
Intellij IDEA and clikc run main function to startup.</p>
<h3>Start frontend server</h3>
<p>Install frontend dependencies and run it.</p>
<blockquote>
diff --git a/en-us/development/development-environment-setup.json
b/en-us/development/development-environment-setup.json
index c40f430a7..b6d01d016 100644
--- a/en-us/development/development-environment-setup.json
+++ b/en-us/development/development-environment-setup.json
@@ -1,6 +1,6 @@
{
"filename": "development-environment-setup.md",
- "__html": "<h1>DolphinScheduler development</h1>\n<h2>Software
Requirements</h2>\n<p>Before setting up the DolphinScheduler development
environment, please make sure you have installed the software as
below:</p>\n<ul>\n<li><a
href=\"https://git-scm.com/downloads\";>Git</a></li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
v1.8.x (Currently does not support jdk 11)</li>\n<li><a
href=\"http://maven.apache.org/download.cgi\";>Maven</a>: v3.5+ [...]
+ "__html": "<h1>DolphinScheduler development</h1>\n<h2>Software
Requirements</h2>\n<p>Before setting up the DolphinScheduler development
environment, please make sure you have installed the software as
below:</p>\n<ul>\n<li><a
href=\"https://git-scm.com/downloads\";>Git</a></li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
v1.8.x (Currently does not support jdk 11)</li>\n<li><a
href=\"http://maven.apache.org/download.cgi\";>Maven</a>: v3.5+ [...]
"link": "/dist/en-us/development/development-environment-setup.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.html
b/en-us/docs/dev/user_doc/architecture/configuration.html
index cecb22131..23bfb8588 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.html
+++ b/en-us/docs/dev/user_doc/architecture/configuration.html
@@ -521,6 +521,41 @@ Currently, DS just makes a basic config, remember to
config further JVM options
<td>PASSWORD</td>
<td>authentication type</td>
</tr>
+<tr>
+<td>security.authentication.ldap.user.admin</td>
+<td>read-only-admin</td>
+<td>admin user account when you log-in with LDAP</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.urls</td>
+<td>ldap://ldap.forumsys.com:389/</td>
+<td>LDAP urls</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.base.dn</td>
+<td>dc=example,dc=com</td>
+<td>LDAP base dn</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.username</td>
+<td>cn=read-only-admin,dc=example,dc=com</td>
+<td>LDAP username</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.password</td>
+<td>password</td>
+<td>LDAP password</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.user.identity.attribute</td>
+<td>uid</td>
+<td>LDAP user identity attribute</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.user.email.attribute</td>
+<td>mail</td>
+<td>LDAP user email attribute</td>
+</tr>
</tbody>
</table>
<h3>master.properties [master-service log config]</h3>
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.json
b/en-us/docs/dev/user_doc/architecture/configuration.json
index 108753610..c71493d89 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/resource/configuration.html
b/en-us/docs/dev/user_doc/guide/resource/configuration.html
index 2c8239326..001bc011d 100644
--- a/en-us/docs/dev/user_doc/guide/resource/configuration.html
+++ b/en-us/docs/dev/user_doc/guide/resource/configuration.html
@@ -126,7 +126,7 @@
<ul>
<li>If only the <code>api-server/conf/common.properties</code> file is
configured, then resource uploading is enabled, but you can not use resources
in task. If you want to use or execute the files in the workflow you need to
configure <code>worker-server/conf/common.properties</code> too.</li>
<li>If you want to use the resource upload function, the deployment user in <a
href="../installation/standalone.md">installation and deployment</a> must have
relevant operation authority.</li>
-<li>If you using a Hadoop cluster with HA, you need to enable HDFS resource
upload, and you need to copy the <code>core-site.xml</code> and
<code>hdfs-site.xml</code> under the Hadoop cluster to
<code>/opt/dolphinscheduler/conf</code>, otherwise skip this copy step.</li>
+<li>If you using a Hadoop cluster with HA, you need to enable HDFS resource
upload, and you need to copy the <code>core-site.xml</code> and
<code>hdfs-site.xml</code> under the Hadoop cluster to
<code>worker-server/conf</code> and <code>api-server/conf</code>, otherwise
skip this copy step.</li>
</ul>
</blockquote>
</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 [...]
diff --git a/en-us/docs/dev/user_doc/guide/resource/configuration.json
b/en-us/docs/dev/user_doc/guide/resource/configuration.json
index 4147903f6..2b07eba0c 100644
--- a/en-us/docs/dev/user_doc/guide/resource/configuration.json
+++ b/en-us/docs/dev/user_doc/guide/resource/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<h1>Configuration</h1>\n<p>The Resource Center is usually used
for operations such as uploading files, UDF functions, and task group
management. You can appoint the local file directory as the upload directory
for a single machine (this operation does not need to deploy Hadoop). Or you
can also upload to a Hadoop or MinIO cluster, at this time, you need to have
Hadoop (2.6+) or MinIO or other related environments.</p>\n<h2>Local File
Resource Configuration</h2>\n<p>For a sin [...]
+ "__html": "<h1>Configuration</h1>\n<p>The Resource Center is usually used
for operations such as uploading files, UDF functions, and task group
management. You can appoint the local file directory as the upload directory
for a single machine (this operation does not need to deploy Hadoop). Or you
can also upload to a Hadoop or MinIO cluster, at this time, you need to have
Hadoop (2.6+) or MinIO or other related environments.</p>\n<h2>Local File
Resource Configuration</h2>\n<p>For a sin [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/resource/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/python/_modules/pydolphinscheduler/core/task.html
b/python/_modules/pydolphinscheduler/core/task.html
index c9e5dcf2d..9a3a20b98 100644
--- a/python/_modules/pydolphinscheduler/core/task.html
+++ b/python/_modules/pydolphinscheduler/core/task.html
@@ -348,7 +348,7 @@
<span class="c1"># TODO get code from specific project process
definition and task name</span>
<span class="n">gateway</span> <span class="o">=</span> <span
class="n">launch_gateway</span><span class="p">()</span>
<span class="n">result</span> <span class="o">=</span> <span
class="n">gateway</span><span class="o">.</span><span
class="n">entry_point</span><span class="o">.</span><span
class="n">getCodeAndVersion</span><span class="p">(</span>
- <span class="bp">self</span><span class="o">.</span><span
class="n">process_definition</span><span class="o">.</span><span
class="n">_project</span><span class="p">,</span> <span
class="bp">self</span><span class="o">.</span><span class="n">name</span>
+ <span class="bp">self</span><span class="o">.</span><span
class="n">process_definition</span><span class="o">.</span><span
class="n">_project</span><span class="p">,</span> <span
class="bp">self</span><span class="o">.</span><span
class="n">process_definition</span><span class="o">.</span><span
class="n">name</span><span class="p">,</span> <span class="bp">self</span><span
class="o">.</span><span class="n">name</span>
<span class="p">)</span>
<span class="c1"># result =
gateway.entry_point.genTaskCodeList(DefaultTaskCodeNum.DEFAULT)</span>
<span class="c1"># gateway_result_checker(result)</span>
diff --git a/zh-cn/development/development-environment-setup.html
b/zh-cn/development/development-environment-setup.html
index 4497cf058..001847a12 100644
--- a/zh-cn/development/development-environment-setup.html
+++ b/zh-cn/development/development-environment-setup.html
@@ -96,7 +96,7 @@ find . -iname 'Dockerfile'
<li>如果想要开发最新代码，切换到 <code>dev</code> 分支</li>
</ul>
<h3>启动后端</h3>
-<p>在 Intellij IDEA 找到并启动类
<code>org.apache.dolphinscheduler.server.StandaloneServer</code> 即可完成后端启动</p>
+<p>在 Intellij IDEA 找到并启动类
<code>org.apache.dolphinscheduler.StandaloneServer</code> 即可完成后端启动</p>
<h3>启动前端</h3>
<p>安装前端依赖并运行前端组件</p>
<blockquote>
diff --git a/zh-cn/development/development-environment-setup.json
b/zh-cn/development/development-environment-setup.json
index c9bba7f90..a4382061f 100644
--- a/zh-cn/development/development-environment-setup.json
+++ b/zh-cn/development/development-environment-setup.json
@@ -1,6 +1,6 @@
{
"filename": "development-environment-setup.md",
- "__html": "<h1>DolphinScheduler 开发手册</h1>\n<h2>软件要求</h2>\n<p>在搭建
DolphinScheduler 开发环境之前请确保你已经安装以下软件:</p>\n<ul>\n<li><a
href=\"https://git-scm.com/downloads\";>Git</a></li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
v1.8.x (当前暂不支持 jdk 11)</li>\n<li><a
href=\"http://maven.apache.org/download.cgi\";>Maven</a>: v3.5+</li>\n<li><a
href=\"https://nodejs.org/en/download\";>Node</a>: v16.13+ (dolphinScheduler
版本低于 3.0, 请安装 node v12.20+)</li>\n<l [...]
+ "__html": "<h1>DolphinScheduler 开发手册</h1>\n<h2>软件要求</h2>\n<p>在搭建
DolphinScheduler 开发环境之前请确保你已经安装以下软件:</p>\n<ul>\n<li><a
href=\"https://git-scm.com/downloads\";>Git</a></li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
v1.8.x (当前暂不支持 jdk 11)</li>\n<li><a
href=\"http://maven.apache.org/download.cgi\";>Maven</a>: v3.5+</li>\n<li><a
href=\"https://nodejs.org/en/download\";>Node</a>: v16.13+ (dolphinScheduler
版本低于 3.0, 请安装 node v12.20+)</li>\n<l [...]
"link": "/dist/zh-cn/development/development-environment-setup.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.html
b/zh-cn/docs/dev/user_doc/architecture/configuration.html
index f838ead1b..5ba1e106a 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.html
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.html
@@ -520,6 +520,41 @@
<td>PASSWORD</td>
<td>权限校验类型</td>
</tr>
+<tr>
+<td>security.authentication.ldap.user.admin</td>
+<td>read-only-admin</td>
+<td>LDAP登陆时，系统管理员账号</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.urls</td>
+<td>ldap://ldap.forumsys.com:389/</td>
+<td>LDAP urls</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.base.dn</td>
+<td>dc=example,dc=com</td>
+<td>LDAP base dn</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.username</td>
+<td>cn=read-only-admin,dc=example,dc=com</td>
+<td>LDAP账号</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.password</td>
+<td>password</td>
+<td>LDAP密码</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.user.identity.attribute</td>
+<td>uid</td>
+<td>LDAP用户身份标识字段名</td>
+</tr>
+<tr>
+<td>security.authentication.ldap.user.email.attribute</td>
+<td>mail</td>
+<td>LDAP邮箱字段名</td>
+</tr>
</tbody>
</table>
<h2>6.master.properties [Master服务配置]</h2>
@@ -956,7 +991,7 @@ singleYarnIp=<span
class="hljs-string">"yarnIp1"</span>
resourceUploadPath=<span
class="hljs-string">"/dolphinscheduler"</span>
-<span class="hljs-comment"># HDFS/S3 操作用户</span>
+<span class="hljs-comment"># HDFS/S3 操作用户 </span>
hdfsRootUser=<span class="hljs-string">"hdfs"</span>
<span class="hljs-comment"># 以下为 kerberos 配置</span>
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.json
b/zh-cn/docs/dev/user_doc/architecture/configuration.json
index eb93baaeb..63cee1bac 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>├── LICENSE\n│\n├── NOTICE\n│\n├──
licenses licenses存放目录\n│\n├── bin
[...]
+ "__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/resource/configuration.html
b/zh-cn/docs/dev/user_doc/guide/resource/configuration.html
index 7b2aea961..04de36eea 100644
--- a/zh-cn/docs/dev/user_doc/guide/resource/configuration.html
+++ b/zh-cn/docs/dev/user_doc/guide/resource/configuration.html
@@ -126,7 +126,7 @@
<ul>
<li>如果只配置了 <code>api-server/conf/common.properties</code>
的文件，则只是开启了资源上传的操作，并不能满足正常使用。如果想要在工作流中执行相关文件则需要额外配置
<code>worker-server/conf/common.properties</code>。</li>
<li>如果用到资源上传的功能，那么<a
href="../installation/standalone.md">安装部署</a>中，部署用户需要有这部分的操作权限。</li>
-<li>如果 Hadoop 集群的 NameNode 配置了 HA 的话，需要开启 HDFS 类型的资源上传，同时需要将 Hadoop 集群下的
<code>core-site.xml</code> 和 <code>hdfs-site.xml</code> 复制到
<code>/opt/dolphinscheduler/conf</code>，非 NameNode HA 跳过次步骤。</li>
+<li>如果 Hadoop 集群的 NameNode 配置了 HA 的话，需要开启 HDFS 类型的资源上传，同时需要将 Hadoop 集群下的
<code>core-site.xml</code> 和 <code>hdfs-site.xml</code> 复制到
<code>worker-server/conf</code> 以及 <code>api-server/conf</code>，非 NameNode HA
跳过次步骤。</li>
</ul>
</blockquote>
</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 [...]
diff --git a/zh-cn/docs/dev/user_doc/guide/resource/configuration.json
b/zh-cn/docs/dev/user_doc/guide/resource/configuration.json
index dc28dc155..781e6e5df 100644
--- a/zh-cn/docs/dev/user_doc/guide/resource/configuration.json
+++ b/zh-cn/docs/dev/user_doc/guide/resource/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<h1>资源中心配置详情</h1>\n<p>资源中心通常用于上传文件、 UDF
函数，以及任务组管理等操作。针对单机环境可以选择本地文件目录作为上传文件夹（此操作不需要部署 Hadoop）。当然也可以选择上传到 Hadoop or
MinIO 集群上，此时则需要有 Hadoop（2.6+）或者 MinIOn
等相关环境。</p>\n<h2>本地资源配置</h2>\n<p>在单机环境下，可以选择使用本地文件目录作为上传文件夹（无需部署Hadoop），此时需要进行如下配置：</p>\n<h3>配置
<code>common.properties</code>
文件</h3>\n<p>对以下路径的文件进行配置：<code>api-server/conf/common.properties</code> 和
<code>worker-server/conf/common.properties</code></p>\n<ul>\n<li>将
<code>data.basedir.path</code> 改为本地存储路径，请确保部署 DolphinSche [...]
+ "__html": "<h1>资源中心配置详情</h1>\n<p>资源中心通常用于上传文件、 UDF
函数，以及任务组管理等操作。针对单机环境可以选择本地文件目录作为上传文件夹（此操作不需要部署 Hadoop）。当然也可以选择上传到 Hadoop or
MinIO 集群上，此时则需要有 Hadoop（2.6+）或者 MinIOn
等相关环境。</p>\n<h2>本地资源配置</h2>\n<p>在单机环境下，可以选择使用本地文件目录作为上传文件夹（无需部署Hadoop），此时需要进行如下配置：</p>\n<h3>配置
<code>common.properties</code>
文件</h3>\n<p>对以下路径的文件进行配置：<code>api-server/conf/common.properties</code> 和
<code>worker-server/conf/common.properties</code></p>\n<ul>\n<li>将
<code>data.basedir.path</code> 改为本地存储路径，请确保部署 DolphinSche [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/resource/configuration.html",
"meta": {}
}
\ No newline at end of file
