This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.9-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.9-prepare by this push:
new 443b3dc145 cherry-pick doc: Classify docs to avoid misleading #15282
443b3dc145 is described below
commit 443b3dc1454ac2887010a74a1daaf7c47c0591c4
Author: Jay Chung <[email protected]>
AuthorDate: Tue Dec 5 19:05:57 2023 +0800
cherry-pick doc: Classify docs to avoid misleading
#15282
---
docs/docs/en/guide/resource/task-group.md | 2 ++
docs/docs/en/guide/security.md | 9 +++++++--
docs/docs/zh/guide/resource/task-group.md | 2 ++
docs/docs/zh/guide/security.md | 10 ++++++++--
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/docs/docs/en/guide/resource/task-group.md
b/docs/docs/en/guide/resource/task-group.md
index 87e04b4cb0..9b152914fb 100644
--- a/docs/docs/en/guide/resource/task-group.md
+++ b/docs/docs/en/guide/resource/task-group.md
@@ -2,6 +2,8 @@
The task group is mainly used to control the concurrency of task instances,
and is designed to control the pressure of other resources (it can also control
the pressure of the Hadoop cluster, the cluster will have queue control it).
When creating a new task definition, you can configure the corresponding task
group and configure the priority of the task running in the task group.
+> Note: The task group's resource restrictions are on the project level and
unrelated to tenants.
+
## Task Group Configuration
### Create Task Group
diff --git a/docs/docs/en/guide/security.md b/docs/docs/en/guide/security.md
index eaeb12d8a0..0a67169838 100644
--- a/docs/docs/en/guide/security.md
+++ b/docs/docs/en/guide/security.md
@@ -9,7 +9,10 @@ Administrator login, default username/password:
admin/dolphinscheduler123
- The queue is used when executing programs such as spark and mapreduce, and
the "queue" parameter needs to be used.
- The administrator enters the `Security Center->Queue Management` page and
clicks the "Create Queue" button to create a new queue.
-
+
+> Note: Currently, only admin users can modify queues.
+
+
## Add Tenant
@@ -17,7 +20,9 @@ Administrator login, default username/password:
admin/dolphinscheduler123
- Tenant Code: **The tenant code is the user on Linux, unique and cannot be
repeated**
- The administrator enters the `Security Center->Tenant Management` page, and
clicks the `Create Tenant` button to create a tenant.
-
+> Note: Currently, only admin users can modify tenant.
+
+
## Create Normal User
diff --git a/docs/docs/zh/guide/resource/task-group.md
b/docs/docs/zh/guide/resource/task-group.md
index 1c5fb18cab..92d4836f32 100644
--- a/docs/docs/zh/guide/resource/task-group.md
+++ b/docs/docs/zh/guide/resource/task-group.md
@@ -2,6 +2,8 @@
任务组主要用于控制任务实例并发，旨在控制其他资源的压力（也可以控制 Hadoop
集群压力，不过集群会有队列管控）。您可在新建任务定义时，可配置对应的任务组，并配置任务在任务组内运行的优先级。
+> 注意：任务组的对资源的限制是在项目级别的，和租户没有关系
+
### 任务组配置
#### 新建任务组
diff --git a/docs/docs/zh/guide/security.md b/docs/docs/zh/guide/security.md
index f6536f4773..d8db1a96dc 100644
--- a/docs/docs/zh/guide/security.md
+++ b/docs/docs/zh/guide/security.md
@@ -8,7 +8,10 @@
- 队列是在执行 spark、mapreduce 等程序，需要用到“队列”参数时使用的。
- 管理员进入安全中心 -> 队列管理页面，点击“创建队列”按钮，创建队列。
-
+
+> 注意：目前仅有 admin 用户可以修改队列。
+
+
## 添加租户
@@ -16,7 +19,10 @@
- 租户编码：**租户编码是 Linux上 的用户，唯一，不能重复**
- 管理员进入安全中心->租户管理页面，点击“创建租户”按钮，创建租户。
-
+
+> 注意：目前仅有 admin 用户可以修改租户。
+
+
## 创建普通用户
