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 e7a3a0f87 Automated deployment:
4d97cc3dab28602c236aadcffb847cfa90bd99ad
e7a3a0f87 is described below
commit e7a3a0f87739a0a80c3947f81949cd00582daa57
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Jun 16 05:08:39 2022 +0000
Automated deployment: 4d97cc3dab28602c236aadcffb847cfa90bd99ad
---
en-us/docs/dev/user_doc/guide/security.html | 14 ++++++++++++++
en-us/docs/dev/user_doc/guide/security.json | 2 +-
img/new_ui/dev/security/create-cluster.png | Bin 0 -> 641597 bytes
python/_modules/pydolphinscheduler/tasks/sql.html | 8 ++++----
python/api.html | 4 ++--
python/tasks/sql.html | 8 ++++----
zh-cn/docs/dev/user_doc/guide/security.html | 14 ++++++++++++++
zh-cn/docs/dev/user_doc/guide/security.json | 2 +-
8 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/en-us/docs/dev/user_doc/guide/security.html
b/en-us/docs/dev/user_doc/guide/security.html
index 9a94a6059..1141ae0f4 100644
--- a/en-us/docs/dev/user_doc/guide/security.html
+++ b/en-us/docs/dev/user_doc/guide/security.html
@@ -172,6 +172,20 @@
<li>Create a task node in the workflow definition, select the worker group and
the environment corresponding to the worker group. When executing the task, the
Worker will execute the environment first before executing the task.</li>
</ul>
<p><img src="/img/new_ui/dev/security/use-environment.png"
alt="use-environment"></p>
+<h2>Cluster Management</h2>
+<blockquote>
+<p>Add or update cluster</p>
+</blockquote>
+<ul>
+<li>Each process can be related to zero or several clusters to support
multiple environment, now just support k8s.</li>
+</ul>
+<blockquote>
+<p>Usage cluster</p>
+</blockquote>
+<ul>
+<li>After creation and authorization, k8s namespaces and processes will
associate clusters. Each cluster will have separate workflows and task
instances running independently.</li>
+</ul>
+<p><img src="/img/new_ui/dev/security/create-cluster.png"
alt="create-cluster"></p>
<h2>Namespace Management</h2>
<blockquote>
<p>Add or update k8s cluster</p>
diff --git a/en-us/docs/dev/user_doc/guide/security.json
b/en-us/docs/dev/user_doc/guide/security.json
index 11e073e6d..fa44fd361 100644
--- a/en-us/docs/dev/user_doc/guide/security.json
+++ b/en-us/docs/dev/user_doc/guide/security.json
@@ -1,6 +1,6 @@
{
"filename": "security.md",
- "__html": "<h1>Security (Authorization System)</h1>\n<ul>\n<li>Only the
administrator account in the security center has the authority to operate. It
has functions such as queue management, tenant management, user management,
alarm group management, worker group management, token management, etc. In the
user management module, can authorize to the resources, data sources, projects,
etc.</li>\n<li>Administrator login, the default username and password is
<code>admin/dolphinscheduler123< [...]
+ "__html": "<h1>Security (Authorization System)</h1>\n<ul>\n<li>Only the
administrator account in the security center has the authority to operate. It
has functions such as queue management, tenant management, user management,
alarm group management, worker group management, token management, etc. In the
user management module, can authorize to the resources, data sources, projects,
etc.</li>\n<li>Administrator login, the default username and password is
<code>admin/dolphinscheduler123< [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/security.html",
"meta": {}
}
\ No newline at end of file
diff --git a/img/new_ui/dev/security/create-cluster.png
b/img/new_ui/dev/security/create-cluster.png
new file mode 100644
index 000000000..539c0ba25
Binary files /dev/null and b/img/new_ui/dev/security/create-cluster.png differ
diff --git a/python/_modules/pydolphinscheduler/tasks/sql.html
b/python/_modules/pydolphinscheduler/tasks/sql.html
index 3acf3bf75..5414ff500 100644
--- a/python/_modules/pydolphinscheduler/tasks/sql.html
+++ b/python/_modules/pydolphinscheduler/tasks/sql.html
@@ -106,8 +106,8 @@
<div class="viewcode-block" id="SqlType"><a class="viewcode-back"
href="../../../tasks/sql.html#pydolphinscheduler.tasks.SqlType">[docs]</a><span
class="k">class</span> <span class="nc">SqlType</span><span class="p">:</span>
<span class="sd">"""SQL type, for now it just contain
`SELECT` and `NO_SELECT`."""</span>
- <span class="n">SELECT</span> <span class="o">=</span> <span
class="mi">0</span>
- <span class="n">NOT_SELECT</span> <span class="o">=</span> <span
class="mi">1</span></div>
+ <span class="n">SELECT</span> <span class="o">=</span> <span
class="s2">"0"</span>
+ <span class="n">NOT_SELECT</span> <span class="o">=</span> <span
class="s2">"1"</span></div>
<div class="viewcode-block" id="Sql"><a class="viewcode-back"
href="../../../tasks/sql.html#pydolphinscheduler.tasks.Sql">[docs]</a><span
class="k">class</span> <span class="nc">Sql</span><span class="p">(</span><span
class="n">Task</span><span class="p">):</span>
@@ -139,7 +139,7 @@
<span class="n">name</span><span class="p">:</span> <span
class="nb">str</span><span class="p">,</span>
<span class="n">datasource_name</span><span class="p">:</span> <span
class="nb">str</span><span class="p">,</span>
<span class="n">sql</span><span class="p">:</span> <span
class="nb">str</span><span class="p">,</span>
- <span class="n">sql_type</span><span class="p">:</span> <span
class="n">Optional</span><span class="p">[</span><span
class="nb">int</span><span class="p">]</span> <span class="o">=</span> <span
class="kc">None</span><span class="p">,</span>
+ <span class="n">sql_type</span><span class="p">:</span> <span
class="n">Optional</span><span class="p">[</span><span
class="nb">str</span><span class="p">]</span> <span class="o">=</span> <span
class="kc">None</span><span class="p">,</span>
<span class="n">pre_statements</span><span class="p">:</span> <span
class="n">Optional</span><span class="p">[</span><span
class="nb">str</span><span class="p">]</span> <span class="o">=</span> <span
class="kc">None</span><span class="p">,</span>
<span class="n">post_statements</span><span class="p">:</span> <span
class="n">Optional</span><span class="p">[</span><span
class="nb">str</span><span class="p">]</span> <span class="o">=</span> <span
class="kc">None</span><span class="p">,</span>
<span class="n">display_rows</span><span class="p">:</span> <span
class="n">Optional</span><span class="p">[</span><span
class="nb">int</span><span class="p">]</span> <span class="o">=</span> <span
class="mi">10</span><span class="p">,</span>
@@ -155,7 +155,7 @@
<span class="bp">self</span><span class="o">.</span><span
class="n">display_rows</span> <span class="o">=</span> <span
class="n">display_rows</span>
<span class="nd">@property</span>
- <span class="k">def</span> <span class="nf">sql_type</span><span
class="p">(</span><span class="bp">self</span><span class="p">)</span> <span
class="o">-></span> <span class="nb">int</span><span class="p">:</span>
+ <span class="k">def</span> <span class="nf">sql_type</span><span
class="p">(</span><span class="bp">self</span><span class="p">)</span> <span
class="o">-></span> <span class="nb">str</span><span class="p">:</span>
<span class="sd">"""Judgement sql type, it will return
the SQL type for type `SELECT` or `NOT_SELECT`.</span>
<span class="sd"> If `param_sql_type` dot not specific, will use regexp
to check</span>
diff --git a/python/api.html b/python/api.html
index 1de4f0adf..874a52ff7 100644
--- a/python/api.html
+++ b/python/api.html
@@ -2014,7 +2014,7 @@ directly set as python property, so we Override
Task.task_params here.</p>
<dl class="py class">
<dt class="sig sig-object py" id="pydolphinscheduler.tasks.Sql">
-<em class="property"><span class="pre">class</span><span class="w">
</span></em><span class="sig-prename descclassname"><span
class="pre">pydolphinscheduler.tasks.</span></span><span class="sig-name
descname"><span class="pre">Sql</span></span><span
class="sig-paren">(</span><em class="sig-param"><span class="n"><span
class="pre">name</span></span><span class="p"><span
class="pre">:</span></span><span class="w"> </span><span class="n"><span
class="pre">str</span></span></em>, <em class=" [...]
+<em class="property"><span class="pre">class</span><span class="w">
</span></em><span class="sig-prename descclassname"><span
class="pre">pydolphinscheduler.tasks.</span></span><span class="sig-name
descname"><span class="pre">Sql</span></span><span
class="sig-paren">(</span><em class="sig-param"><span class="n"><span
class="pre">name</span></span><span class="p"><span
class="pre">:</span></span><span class="w"> </span><span class="n"><span
class="pre">str</span></span></em>, <em class=" [...]
<dd><p>Bases: <a class="reference internal"
href="#pydolphinscheduler.core.Task"
title="pydolphinscheduler.core.task.Task"><code class="xref py py-class
docutils literal notranslate"><span class="pre">Task</span></code></a></p>
<p>Task SQL object, declare behavior for SQL task to dolphinscheduler.</p>
<p>It should run sql job in multiply sql lik engine, such as:
@@ -2123,7 +2123,7 @@ object tries to communicate with Java gateway server.</p>
<dl class="py property">
<dt class="sig sig-object py" id="pydolphinscheduler.tasks.Sql.sql_type">
-<em class="property"><span class="pre">property</span><span class="w">
</span></em><span class="sig-name descname"><span
class="pre">sql_type</span></span><em class="property"><span class="p"><span
class="pre">:</span></span><span class="w"> </span><span
class="pre">int</span></em><a class="headerlink"
href="#pydolphinscheduler.tasks.Sql.sql_type" title="Permalink to this
definition"></a></dt>
+<em class="property"><span class="pre">property</span><span class="w">
</span></em><span class="sig-name descname"><span
class="pre">sql_type</span></span><em class="property"><span class="p"><span
class="pre">:</span></span><span class="w"> </span><span
class="pre">str</span></em><a class="headerlink"
href="#pydolphinscheduler.tasks.Sql.sql_type" title="Permalink to this
definition"></a></dt>
<dd><p>Judgement sql type, it will return the SQL type for type
<cite>SELECT</cite> or <cite>NOT_SELECT</cite>.</p>
<p>If <cite>param_sql_type</cite> dot not specific, will use regexp to check
which type of the SQL is. But if <cite>param_sql_type</cite> is specific
diff --git a/python/tasks/sql.html b/python/tasks/sql.html
index 55f34e98f..f0024b913 100644
--- a/python/tasks/sql.html
+++ b/python/tasks/sql.html
@@ -97,7 +97,7 @@
<p>Task sql.</p>
<dl class="py class">
<dt class="sig sig-object py" id="pydolphinscheduler.tasks.sql.Sql">
-<em class="property"><span class="pre">class</span><span class="w">
</span></em><span class="sig-prename descclassname"><span
class="pre">pydolphinscheduler.tasks.sql.</span></span><span class="sig-name
descname"><span class="pre">Sql</span></span><span
class="sig-paren">(</span><em class="sig-param"><span class="n"><span
class="pre">name</span></span><span class="p"><span
class="pre">:</span></span><span class="w"> </span><span class="n"><span
class="pre">str</span></span></em>, <em cla [...]
+<em class="property"><span class="pre">class</span><span class="w">
</span></em><span class="sig-prename descclassname"><span
class="pre">pydolphinscheduler.tasks.sql.</span></span><span class="sig-name
descname"><span class="pre">Sql</span></span><span
class="sig-paren">(</span><em class="sig-param"><span class="n"><span
class="pre">name</span></span><span class="p"><span
class="pre">:</span></span><span class="w"> </span><span class="n"><span
class="pre">str</span></span></em>, <em cla [...]
<dd><p>Bases: <a class="reference internal"
href="../api.html#pydolphinscheduler.core.Task"
title="pydolphinscheduler.core.task.Task"><code class="xref py py-class
docutils literal notranslate"><span class="pre">Task</span></code></a></p>
<p>Task SQL object, declare behavior for SQL task to dolphinscheduler.</p>
<p>It should run sql job in multiply sql lik engine, such as:
@@ -133,7 +133,7 @@ database type and database instance would run this sql.</p>
<dl class="py property">
<dt class="sig sig-object py" id="pydolphinscheduler.tasks.sql.Sql.sql_type">
-<em class="property"><span class="pre">property</span><span class="w">
</span></em><span class="sig-name descname"><span
class="pre">sql_type</span></span><em class="property"><span class="p"><span
class="pre">:</span></span><span class="w"> </span><span
class="pre">int</span></em><a class="headerlink"
href="#pydolphinscheduler.tasks.sql.Sql.sql_type" title="Permalink to this
definition"></a></dt>
+<em class="property"><span class="pre">property</span><span class="w">
</span></em><span class="sig-name descname"><span
class="pre">sql_type</span></span><em class="property"><span class="p"><span
class="pre">:</span></span><span class="w"> </span><span
class="pre">str</span></em><a class="headerlink"
href="#pydolphinscheduler.tasks.sql.Sql.sql_type" title="Permalink to this
definition"></a></dt>
<dd><p>Judgement sql type, it will return the SQL type for type
<cite>SELECT</cite> or <cite>NOT_SELECT</cite>.</p>
<p>If <cite>param_sql_type</cite> dot not specific, will use regexp to check
which type of the SQL is. But if <cite>param_sql_type</cite> is specific
@@ -157,12 +157,12 @@ directly set as python property, so we Override
Task.task_params here.</p>
<p>SQL type, for now it just contain <cite>SELECT</cite> and
<cite>NO_SELECT</cite>.</p>
<dl class="py attribute">
<dt class="sig sig-object py"
id="pydolphinscheduler.tasks.sql.SqlType.NOT_SELECT">
-<span class="sig-name descname"><span class="pre">NOT_SELECT</span></span><em
class="property"><span class="w"> </span><span class="p"><span
class="pre">=</span></span><span class="w"> </span><span
class="pre">1</span></em><a class="headerlink"
href="#pydolphinscheduler.tasks.sql.SqlType.NOT_SELECT" title="Permalink to
this definition"></a></dt>
+<span class="sig-name descname"><span class="pre">NOT_SELECT</span></span><em
class="property"><span class="w"> </span><span class="p"><span
class="pre">=</span></span><span class="w"> </span><span
class="pre">'1'</span></em><a class="headerlink"
href="#pydolphinscheduler.tasks.sql.SqlType.NOT_SELECT" title="Permalink to
this definition"></a></dt>
<dd></dd></dl>
<dl class="py attribute">
<dt class="sig sig-object py" id="pydolphinscheduler.tasks.sql.SqlType.SELECT">
-<span class="sig-name descname"><span class="pre">SELECT</span></span><em
class="property"><span class="w"> </span><span class="p"><span
class="pre">=</span></span><span class="w"> </span><span
class="pre">0</span></em><a class="headerlink"
href="#pydolphinscheduler.tasks.sql.SqlType.SELECT" title="Permalink to this
definition"></a></dt>
+<span class="sig-name descname"><span class="pre">SELECT</span></span><em
class="property"><span class="w"> </span><span class="p"><span
class="pre">=</span></span><span class="w"> </span><span
class="pre">'0'</span></em><a class="headerlink"
href="#pydolphinscheduler.tasks.sql.SqlType.SELECT" title="Permalink to this
definition"></a></dt>
<dd></dd></dl>
</dd></dl>
diff --git a/zh-cn/docs/dev/user_doc/guide/security.html
b/zh-cn/docs/dev/user_doc/guide/security.html
index ee47218d3..9d94e3844 100644
--- a/zh-cn/docs/dev/user_doc/guide/security.html
+++ b/zh-cn/docs/dev/user_doc/guide/security.html
@@ -168,6 +168,20 @@ worker.groups=default,test
<li>在工作流定义中创建任务节点选择 worker 分组和 worker 分组对应的环境，任务执行时 worker 会先执行环境在执行任务.</li>
</ul>
<p><img src="/img/new_ui/dev/security/use-environment.png"
alt="use-environment"></p>
+<h2>集群管理</h2>
+<blockquote>
+<p>创建/更新 集群</p>
+</blockquote>
+<ul>
+<li>每个工作流可以绑定零到若干个集群用来支持多集群，目前先用于k8s。</li>
+</ul>
+<blockquote>
+<p>使用集群</p>
+</blockquote>
+<ul>
+<li>创建和授权后，k8s命名空间和工作流会增加关联集群的功能。每一个集群会有独立的工作流和任务实例独立运行。</li>
+</ul>
+<p><img src="/img/new_ui/dev/security/create-cluster.png"
alt="create-cluster"></p>
<h2>命名空间管理</h2>
<blockquote>
<p>创建/更新 k8s集群</p>
diff --git a/zh-cn/docs/dev/user_doc/guide/security.json
b/zh-cn/docs/dev/user_doc/guide/security.json
index bce9c88c2..de88139e4 100644
--- a/zh-cn/docs/dev/user_doc/guide/security.json
+++ b/zh-cn/docs/dev/user_doc/guide/security.json
@@ -1,6 +1,6 @@
{
"filename": "security.md",
- "__html":
"<h1>安全中心（权限系统）</h1>\n<ul>\n<li>安全中心只有管理员账户才有权限操作，分别有队列管理、租户管理、用户管理、告警组管理、worker分组管理、令牌管理等功能，在用户管理模块可以对资源、数据源、项目等授权</li>\n<li>管理员登录，默认用户名/密码：admin/dolphinscheduler123</li>\n</ul>\n<h2>创建队列</h2>\n<ul>\n<li>队列是在执行
spark、mapreduce 等程序，需要用到“队列”参数时使用的。</li>\n<li>管理员进入安全中心 ->
队列管理页面，点击“创建队列”按钮，创建队列。</li>\n</ul>\n<p><img
src=\"/img/new_ui/dev/security/create-queue.png\"
alt=\"create-queue\"></p>\n<h2>添加租户</h2>\n<ul>\n<li>租户对应的是 Linux 的用户，用于 worker
提交作业所使用的用户。如果 linux 没有这个用户，则会导致任 [...]
+ "__html":
"<h1>安全中心（权限系统）</h1>\n<ul>\n<li>安全中心只有管理员账户才有权限操作，分别有队列管理、租户管理、用户管理、告警组管理、worker分组管理、令牌管理等功能，在用户管理模块可以对资源、数据源、项目等授权</li>\n<li>管理员登录，默认用户名/密码：admin/dolphinscheduler123</li>\n</ul>\n<h2>创建队列</h2>\n<ul>\n<li>队列是在执行
spark、mapreduce 等程序，需要用到“队列”参数时使用的。</li>\n<li>管理员进入安全中心 ->
队列管理页面，点击“创建队列”按钮，创建队列。</li>\n</ul>\n<p><img
src=\"/img/new_ui/dev/security/create-queue.png\"
alt=\"create-queue\"></p>\n<h2>添加租户</h2>\n<ul>\n<li>租户对应的是 Linux 的用户，用于 worker
提交作业所使用的用户。如果 linux 没有这个用户，则会导致任 [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/security.html",
"meta": {}
}
\ No newline at end of file
