hf200012 commented on a change in pull request #4:
URL:
https://github.com/apache/incubator-doris-manager/pull/4#discussion_r825579876
##########
File path:
manager/dm-server/src/main/java/org/apache/doris/stack/model/request/control/ModelControlReq.java
##########
@@ -0,0 +1,54 @@
+package org.apache.doris.stack.model.request.control;
Review comment:
add License head
##########
File path: manager/doc/Doris Manager 编译部署文档.md
##########
@@ -0,0 +1,90 @@
+# Doris Manager 编译部署文档
Review comment:
Do not use Chinese names for files
##########
File path: manager/doc/Doris Manger初始化使用文档.md
##########
@@ -0,0 +1,261 @@
+# 初始化
Review comment:
Do not use Chinese names for files
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/PasswordWeakException.java
##########
@@ -0,0 +1,28 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.stack.exception;
+
+public class PasswordWeakException extends Exception {
+
+ public static final String MESSAGE = "密码强度太低，请重新输入";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/InputLengthException.java
##########
@@ -15,16 +15,13 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.manager.agent.task;
+package org.apache.doris.stack.exception;
-public class TaskDesc {
- private String taskName;
+public class InputLengthException extends Exception {
- public String getTaskName() {
- return taskName;
- }
+ public static final String MESSAGE = "输入长度错误，请重新输入";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/DorisConnectionException.java
##########
@@ -19,9 +19,9 @@
public class DorisConnectionException extends Exception {
- public static final String MESSAGE = "引擎连接信息有误，请检查后重新输入";
+ public static final String MESSAGE = "引擎连接信息错误，请检查后重新输入. 错误信息为:";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/model/request/permission/PermissionGroupAddReq.java
##########
@@ -0,0 +1,21 @@
+package org.apache.doris.stack.model.request.permission;
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -87,26 +87,26 @@ private ConfigConstant() {
httpsDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.REDIRECT_HTTPS_ENV,
"false"));
- String localeDesc = "Doris Stack服务的默认语言.";
+ String localeDesc = "Palo Stack服务的默认语言.";
PUBLIC_CONFIGS.put(SITE_LOCALE_KEY, new ConfigItem(SITE_LOCALE_KEY,
ConfigItem.Type.STRING,
localeDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.SITE_LOCALE_ENV,
"zh"));
- String siteNameDesc = "Doris Stack服务实例的名称.";
+ String siteNameDesc = "Palo Stack服务实例的名称.";
Review comment:
```suggestion
String siteNameDesc = "The name of the Doris Manager service
instance.";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -158,11 +159,11 @@ private ConfigConstant() {
EMAIL_CONFIGS.put(EMAIL_CONFIGURED_KEY, new
ConfigItem(EMAIL_CONFIGURED_KEY, ConfigItem.Type.BOOLEAN,
configuredDesc, false, ConfigItem.Visibility.ADMIN));
- String addressDesc = "Doris Studio SMTP邮箱服务的邮件地址.";
+ String addressDesc = "Palo Studio SMTP邮箱服务的邮件地址.";
EMAIL_CONFIGS.put(EMAIL_ADDRESS_KEY, new ConfigItem(EMAIL_ADDRESS_KEY,
ConfigItem.Type.STRING,
addressDesc, false, ConfigItem.Visibility.ADMIN));
- String hostDesc = "Doris Studio SMTP服务器地址.";
+ String hostDesc = "Palo Studio SMTP服务器地址.";
Review comment:
```suggestion
String hostDesc = "Doris Manager SMTP server address.";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -158,11 +159,11 @@ private ConfigConstant() {
EMAIL_CONFIGS.put(EMAIL_CONFIGURED_KEY, new
ConfigItem(EMAIL_CONFIGURED_KEY, ConfigItem.Type.BOOLEAN,
configuredDesc, false, ConfigItem.Visibility.ADMIN));
- String addressDesc = "Doris Studio SMTP邮箱服务的邮件地址.";
+ String addressDesc = "Palo Studio SMTP邮箱服务的邮件地址.";
Review comment:
```suggestion
String addressDesc = "Email address of Doris Manager SMTP mailbox
service.";
```
##########
File path:
manager/dm-agent/src/main/java/org/apache/doris/manager/agent/util/Request.java
##########
@@ -33,12 +35,43 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Slf4j
public class Request {
+ public static List<HeartBeatEventInfo> getHeartBeatEventInfo(String
requestUrl) {
+ String getHeartBeatEventResults = sendGetRequest(requestUrl, new
HashMap<>());
+ log.info("getHeartBeatEventResults:" + getHeartBeatEventResults);
+// ManagerServerResponse response =
JSON.parseObject(getHeartBeatEventResults, ManagerServerResponse.class);
Review comment:
remove
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/RequestFieldNullException.java
##########
@@ -22,7 +22,7 @@
*/
public class RequestFieldNullException extends Exception {
- public static final String MESSAGE = "请求信息异常，请刷新后重试或联系技术人员";
+ public static final String MESSAGE = "存在必填字段未填写，请重新填写";
Review comment:
Please use English
##########
File path: manager/doc/Doris Manger集群管理使用文档.md
##########
@@ -0,0 +1,44 @@
+# **集群管理**
Review comment:
Do not use Chinese names for files
##########
File path: manager/doc/Doris Manger系统设置使用文档.md
##########
@@ -0,0 +1,56 @@
+# **平台设置**
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserActiveException.java
##########
@@ -0,0 +1,27 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.stack.exception;
+
+public class UserActiveException extends Exception {
+
+ public static final String MESSAGE = "用户处于激活状态，不能进行这个操作";
Review comment:
Please use English
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/controller/permission/GeneralPermissionsController.java
##########
@@ -0,0 +1,131 @@
+package org.apache.doris.stack.controller.permission;
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/permission/GeneralPermissionsService.java
##########
@@ -0,0 +1,415 @@
+package org.apache.doris.stack.service.permission;
Review comment:
add license head
##########
File path: manager/doc/Doris Manger初始化使用文档.md
##########
@@ -0,0 +1,261 @@
+# 初始化
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/PasswordFormatException.java
##########
@@ -19,7 +19,7 @@
public class PasswordFormatException extends Exception {
- public static final String MESSAGE = "密码强度太低，请重新输入";
+ public static final String MESSAGE = "密码格式错误（长度或者字符内容不支持），请重新输入";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserDisabledException.java
##########
@@ -19,7 +19,7 @@
public class UserDisabledException extends Exception {
- public static final String MESSAGE = "用户名已经被禁用，请联系管理员";
+ public static final String MESSAGE = "用户已经被停用，请联系管理员激活后再操作";
Review comment:
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserActiveException.java
##########
@@ -0,0 +1,27 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.stack.exception;
+
+public class UserActiveException extends Exception {
+
+ public static final String MESSAGE = "用户处于激活状态，不能进行这个操作";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserDisabledException.java
##########
@@ -19,7 +19,7 @@
public class UserDisabledException extends Exception {
- public static final String MESSAGE = "用户名已经被禁用，请联系管理员";
+ public static final String MESSAGE = "用户已经被停用，请联系管理员激活后再操作";
Review comment:
Please use English
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserEmailDuplicatedException.java
##########
@@ -19,7 +19,7 @@
public class UserEmailDuplicatedException extends Exception {
- public static final String MESSAGE = "账号已被使用，请修改后重试";
+ public static final String MESSAGE = "账号邮箱已被使用，请修改后重试";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserNoSelectClusterException.java
##########
@@ -15,14 +15,13 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.manager.agent.command;
+package org.apache.doris.stack.exception;
-public abstract class ExpandCommand extends Command {
- @Override
- public Command setup() {
- beforeSetup();
- return super.setup();
- }
+public class UserNoSelectClusterException extends Exception {
+
+ public static final String MESSAGE = "UserNotSelectSpace";
Review comment:
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserLoginException.java
##########
@@ -19,7 +19,7 @@
public class UserLoginException extends Exception {
- public static final String MESSAGE = "用户名或者密码错误，请重新输入";
+ public static final String MESSAGE = "UsernameOrPasswordError";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/RequestFieldNullException.java
##########
@@ -22,7 +22,7 @@
*/
public class RequestFieldNullException extends Exception {
- public static final String MESSAGE = "请求信息异常，请刷新后重试或联系技术人员";
+ public static final String MESSAGE = "存在必填字段未填写，请重新填写";
Review comment:
Is it possible to define a global configuration class
##########
File path: manager/doc/Doris Manger空间管理使用文档.md
##########
@@ -0,0 +1,78 @@
+# **空间管理**
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserOperationSelfException.java
##########
@@ -15,15 +15,13 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.manager.agent.task;
+package org.apache.doris.stack.exception;
-import java.util.Date;
+public class UserOperationSelfException extends Exception {
-public abstract class TaskHandler {
- public void handle(Task task) {
- task.getTaskResult().setSubmitTime(new Date());
- doHandle(task);
- }
+ public static final String MESSAGE = "用户不能对自身进行这个操作，请联系管理员";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserNameDuplicatedException.java
##########
@@ -15,16 +15,13 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.manager.common.domain;
+package org.apache.doris.stack.exception;
-public class WriteBrokerConfCommandRequestBody {
- private String content;
+public class UserNameDuplicatedException extends Exception {
- public String getContent() {
- return content;
- }
+ public static final String MESSAGE = "账号名称已被使用，请修改后重试";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/model/request/permission/BatchPermissionMembershipReq.java
##########
@@ -0,0 +1,36 @@
+package org.apache.doris.stack.model.request.permission;
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UserNotExistException.java
##########
@@ -19,7 +19,7 @@
public class UserNotExistException extends Exception {
- public static final String MESSAGE = "用户名或者密码错误，请重新输入";
+ public static final String MESSAGE = "用户不存在，请重新输入";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/exception/UsernameDuplicateException.java
##########
@@ -0,0 +1,9 @@
+package org.apache.doris.stack.exception;
+
+public class UsernameDuplicateException extends Exception {
+ public static final String MESSAGE = "版本升级涉及用户名兼容性问题，需要及时修改用户名，请先使用邮箱登录。";
Review comment:
Please use English
Is it possible to define a global configuration class
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/model/request/permission/PermissionsGroupInfo.java
##########
@@ -0,0 +1,41 @@
+package org.apache.doris.stack.model.request.permission;
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -87,26 +87,26 @@ private ConfigConstant() {
httpsDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.REDIRECT_HTTPS_ENV,
"false"));
- String localeDesc = "Doris Stack服务的默认语言.";
+ String localeDesc = "Palo Stack服务的默认语言.";
Review comment:
```suggestion
String localeDesc = "Default language for Doris Manager service.";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/model/request/permission/PermissionMembershipReq.java
##########
@@ -0,0 +1,34 @@
+package org.apache.doris.stack.model.request.permission;
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -77,7 +77,7 @@ private ConfigConstant() {
PUBLIC_CONFIGS.put(ADMIN_EMAIL_KEY, new ConfigItem(ADMIN_EMAIL_KEY,
ConfigItem.Type.STRING,
mailDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.ADMIN_EMAIL_ENV));
- String trackingDesc = "启用匿名使用数据的收集，以帮助改进Doris Studio.";
+ String trackingDesc = "启用匿名使用数据的收集，以帮助改进Palo Studio.";
Review comment:
```suggestion
String trackingDesc = "Enable the collection of anonymous usage data
to help improve Doris Manager.";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -87,26 +87,26 @@ private ConfigConstant() {
httpsDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.REDIRECT_HTTPS_ENV,
"false"));
- String localeDesc = "Doris Stack服务的默认语言.";
+ String localeDesc = "Palo Stack服务的默认语言.";
PUBLIC_CONFIGS.put(SITE_LOCALE_KEY, new ConfigItem(SITE_LOCALE_KEY,
ConfigItem.Type.STRING,
localeDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.SITE_LOCALE_ENV,
"zh"));
- String siteNameDesc = "Doris Stack服务实例的名称.";
+ String siteNameDesc = "Palo Stack服务实例的名称.";
PUBLIC_CONFIGS.put(SITE_NAME_KEY, new ConfigItem(SITE_NAME_KEY,
ConfigItem.Type.STRING,
siteNameDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.SITE_NAME_ENV));
- String siteUrlDesc = "Doris Stack服务实例的访问地址.";
+ String siteUrlDesc = "Palo Stack服务实例的访问地址.";
Review comment:
```suggestion
String siteUrlDesc = "The access address of the Doris Manager
service instance.";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -87,26 +87,26 @@ private ConfigConstant() {
httpsDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.REDIRECT_HTTPS_ENV,
"false"));
- String localeDesc = "Doris Stack服务的默认语言.";
+ String localeDesc = "Palo Stack服务的默认语言.";
PUBLIC_CONFIGS.put(SITE_LOCALE_KEY, new ConfigItem(SITE_LOCALE_KEY,
ConfigItem.Type.STRING,
localeDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.SITE_LOCALE_ENV,
"zh"));
- String siteNameDesc = "Doris Stack服务实例的名称.";
+ String siteNameDesc = "Palo Stack服务实例的名称.";
PUBLIC_CONFIGS.put(SITE_NAME_KEY, new ConfigItem(SITE_NAME_KEY,
ConfigItem.Type.STRING,
siteNameDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.SITE_NAME_ENV));
- String siteUrlDesc = "Doris Stack服务实例的访问地址.";
+ String siteUrlDesc = "Palo Stack服务实例的访问地址.";
PUBLIC_CONFIGS.put(SITE_URL_KEY, new ConfigItem(SITE_URL_KEY,
ConfigItem.Type.STRING,
siteUrlDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.SITE_URL_ENV));
- String versionDesc = "Doris Stack服务的版本信息.";
+ String versionDesc = "Palo Stack服务的版本信息.";
Review comment:
```suggestion
String versionDesc = "Version information of the Doris Manager
service.";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -87,26 +87,26 @@ private ConfigConstant() {
httpsDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.REDIRECT_HTTPS_ENV,
"false"));
- String localeDesc = "Doris Stack服务的默认语言.";
+ String localeDesc = "Palo Stack服务的默认语言.";
PUBLIC_CONFIGS.put(SITE_LOCALE_KEY, new ConfigItem(SITE_LOCALE_KEY,
ConfigItem.Type.STRING,
localeDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.SITE_LOCALE_ENV,
"zh"));
- String siteNameDesc = "Doris Stack服务实例的名称.";
+ String siteNameDesc = "Palo Stack服务实例的名称.";
PUBLIC_CONFIGS.put(SITE_NAME_KEY, new ConfigItem(SITE_NAME_KEY,
ConfigItem.Type.STRING,
siteNameDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.SITE_NAME_ENV));
- String siteUrlDesc = "Doris Stack服务实例的访问地址.";
+ String siteUrlDesc = "Palo Stack服务实例的访问地址.";
PUBLIC_CONFIGS.put(SITE_URL_KEY, new ConfigItem(SITE_URL_KEY,
ConfigItem.Type.STRING,
siteUrlDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.SITE_URL_ENV));
- String versionDesc = "Doris Stack服务的版本信息.";
+ String versionDesc = "Palo Stack服务的版本信息.";
VersionInfo versionInfo = new VersionInfo("v1.0.0", "2021-08-20", "for
test");
PUBLIC_CONFIGS.put(VERSION_INFO_KEY, new ConfigItem(VERSION_INFO_KEY,
ConfigItem.Type.JSON,
versionDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.VERSION_INFO_ENV,
JSON.toJSONString(versionInfo)));
- String defaultGroupDesc = "Doris Stack 默认用户池分组";
+ String defaultGroupDesc = "Palo Stack 默认用户池分组";
Review comment:
```suggestion
String defaultGroupDesc = "Doris Manager default user pool grouping";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -77,7 +77,7 @@ private ConfigConstant() {
PUBLIC_CONFIGS.put(ADMIN_EMAIL_KEY, new ConfigItem(ADMIN_EMAIL_KEY,
ConfigItem.Type.STRING,
mailDesc, false, ConfigItem.Visibility.PUBLIC,
EnvironmentDefine.ADMIN_EMAIL_ENV));
- String trackingDesc = "启用匿名使用数据的收集，以帮助改进Doris Studio.";
+ String trackingDesc = "启用匿名使用数据的收集，以帮助改进Palo Studio.";
Review comment:
Please use English
here is doris should not be palo
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -298,17 +299,23 @@ private ConfigConstant() {
// Other configurations cannot be written through environment variables,
but can only be configured by users
public static final String AUTH_TYPE_KEY = "auth_type";
+ public static final String INIT_STEP_KEY = "init_step";
+
public static final String DEPLOY_TYPE = "deploy-type";
public static final Map<String, ConfigItem> CLUSTER_CONFIGS;
static {
CLUSTER_CONFIGS = new HashMap<>();
- String authTypeDesc = "Doris Studio服务认证方式";
+ String authTypeDesc = "Palo Studio服务认证方式";
CLUSTER_CONFIGS.put(AUTH_TYPE_KEY, new ConfigItem(AUTH_TYPE_KEY,
ConfigItem.Type.STRING,
authTypeDesc, false, ConfigItem.Visibility.ADMIN));
+ String authStepDesc = "Palo Studio服务部署步骤";
Review comment:
```suggestion
String authStepDesc = "Doris Manager Service Deployment Steps";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -370,10 +377,20 @@ private ConfigConstant() {
// All user space configuration items
public static final Map<String, ConfigItem> ALL_ADMIN_CONFIGS;
+ public static final String MONITOR_SOURCE = "monitor-source";
+
+ public static final String MONITOR_SRC_PROMETHEUS = "prometheus";
+
+ public static final String MONITOR_SRC_PALO = "palo";
+
static {
ALL_ADMIN_CONFIGS = new HashMap<>();
ALL_ADMIN_CONFIGS.putAll(CHCHE_CONFIGS);
+
+ String monitorSourceDesc = "Doris Manger的监控数据源";
Review comment:
```suggestion
String monitorSourceDesc = "Monitoring data sources by Doris Manger";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -298,17 +299,23 @@ private ConfigConstant() {
// Other configurations cannot be written through environment variables,
but can only be configured by users
public static final String AUTH_TYPE_KEY = "auth_type";
+ public static final String INIT_STEP_KEY = "init_step";
+
public static final String DEPLOY_TYPE = "deploy-type";
public static final Map<String, ConfigItem> CLUSTER_CONFIGS;
static {
CLUSTER_CONFIGS = new HashMap<>();
- String authTypeDesc = "Doris Studio服务认证方式";
+ String authTypeDesc = "Palo Studio服务认证方式";
CLUSTER_CONFIGS.put(AUTH_TYPE_KEY, new ConfigItem(AUTH_TYPE_KEY,
ConfigItem.Type.STRING,
authTypeDesc, false, ConfigItem.Visibility.ADMIN));
+ String authStepDesc = "Palo Studio服务部署步骤";
+ CLUSTER_CONFIGS.put(INIT_STEP_KEY, new ConfigItem(INIT_STEP_KEY,
ConfigItem.Type.STRING,
+ authStepDesc, false, ConfigItem.Visibility.ADMIN));
+
String deployNameDesc = "服务部署名称";
Review comment:
```suggestion
String deployNameDesc = "Service deployment name";
```
##########
File path: manager/doc/Doris Manager 编译部署文档.md
##########
@@ -0,0 +1,90 @@
+# Doris Manager 编译部署文档
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/util/CredsUtil.java
##########
@@ -17,16 +17,32 @@
package org.apache.doris.stack.util;
Review comment:
add license head
##########
File path: manager/doc/Doris Manger集群管理使用文档.md
##########
@@ -0,0 +1,44 @@
+# **集群管理**
Review comment:
add license head
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/ConfigConstant.java
##########
@@ -298,17 +299,23 @@ private ConfigConstant() {
// Other configurations cannot be written through environment variables,
but can only be configured by users
public static final String AUTH_TYPE_KEY = "auth_type";
+ public static final String INIT_STEP_KEY = "init_step";
+
public static final String DEPLOY_TYPE = "deploy-type";
public static final Map<String, ConfigItem> CLUSTER_CONFIGS;
static {
CLUSTER_CONFIGS = new HashMap<>();
- String authTypeDesc = "Doris Studio服务认证方式";
+ String authTypeDesc = "Palo Studio服务认证方式";
Review comment:
```suggestion
String authTypeDesc = "Doris Manager service authentication method";
```
##########
File path:
manager/general/src/main/java/org/apache/doris/stack/service/config/SettingService.java
##########
@@ -66,6 +79,40 @@
@Autowired
private IdaasComponent idaasComponent;
+ @Autowired
+ private CoreUserRepository userRepository;
+
+ @Autowired
+ private UtilService utilService;
+
+ @Autowired
+ private CoreSessionRepository sessionRepository;
+
+ @Autowired
+ private PermissionsGroupMembershipRepository groupMembershipRepository;
+
+ @Transactional
+ public void initStudioAuthType(LdapAuthTypeReq req) throws Exception {
+ String authType = req.getAuthType();
+ checkRequestBody(authType == null);
+ if (!(authType.equals("ldap") || authType.equals("studio"))) {
+ throw new StudioInitException();
+ }
+ SettingEntity entity =
settingComponent.readSetting(ConfigConstant.AUTH_TYPE_KEY);
+
+ if (entity != null && !StringUtils.isEmpty(entity.getValue())) {
+ log.error("Auth config type already exists.");
+ throw new BadRequestException("认证类型已选择，不能修改，请刷新页面");
Review comment:
english
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
