From a6e30fd315dc57c00653e05e6167b9ac9f404692 Mon Sep 17 00:00:00 2001 From: Jay Chung Date: Tue, 5 Dec 2023 19:05:57 +0800 Subject: [PATCH] doc: Classify docs to avoid misleading (#15282) * only admin user can modify queue and tenent * task group is not related to tenant --------- Co-authored-by: Eric Gao --- docs/docs/en/guide/resource/task-group.md | 2 ++ docs/docs/en/guide/security/security.md | 4 ++++ docs/docs/zh/guide/resource/task-group.md | 2 ++ docs/docs/zh/guide/security/security.md | 4 ++++ 4 files changed, 12 insertions(+) diff --git a/docs/docs/en/guide/resource/task-group.md b/docs/docs/en/guide/resource/task-group.md index 66071f79e0..b66a4878b2 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. The user can only view the task groups belongs to authorized projects, and can create or update task groups belongs to one project only if they have write permission. +> 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/security.md b/docs/docs/en/guide/security/security.md index 50543041a5..d892571b29 100644 --- a/docs/docs/en/guide/security/security.md +++ b/docs/docs/en/guide/security/security.md @@ -9,6 +9,8 @@ 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. + ![create-queue](../../../../img/new_ui/dev/security/create-queue.png) ## Add Tenant @@ -17,6 +19,8 @@ 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-tenant](../../../../img/new_ui/dev/security/create-tenant.png) ## Create Normal User diff --git a/docs/docs/zh/guide/resource/task-group.md b/docs/docs/zh/guide/resource/task-group.md index 86b82c746d..58b46e26d5 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/security.md b/docs/docs/zh/guide/security/security.md index 4f2becbedd..5004d69e0e 100644 --- a/docs/docs/zh/guide/security/security.md +++ b/docs/docs/zh/guide/security/security.md @@ -8,6 +8,8 @@ - 队列是在执行 spark、mapreduce 等程序，需要用到“队列”参数时使用的。 - 管理员进入安全中心 -> 队列管理页面，点击“创建队列”按钮，创建队列。 +> 注意：目前仅有 admin 用户可以修改队列。 + ![create-queue](../../../../img/new_ui/dev/security/create-queue.png) ## 添加租户 @@ -16,6 +18,8 @@ - 租户编码：**租户编码是 Linux上 的用户，唯一，不能重复** - 管理员进入安全中心->租户管理页面，点击“创建租户”按钮，创建租户。 +> 注意：目前仅有 admin 用户可以修改租户。 + ![create-tenant](../../../../img/new_ui/dev/security/create-tenant.png) ## 创建普通用户