This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/bigtop-manager.git
The following commit(s) were added to refs/heads/main by this push:
new 388a704 BIGTOP-4167: Add longtext attr to config property and use
textarea for UI display (#24)
388a704 is described below
commit 388a704f8b1f504432e10a1358b6af335285757b
Author: Zhiguo Wu <[email protected]>
AuthorDate: Fri Jul 26 10:10:14 2024 +0800
BIGTOP-4167: Add longtext attr to config property and use textarea for UI
display (#24)
---
.../model/dto/{PropertyDTO.java => AttrsDTO.java} | 10 ++-------
.../manager/server/model/dto/PropertyDTO.java | 2 ++
.../server/model/mapper/ComponentMapper.java | 2 +-
.../manager/server/model/mapper/ServiceMapper.java | 2 +-
.../manager/server/model/mapper/StackMapper.java | 2 +-
.../{vo/PropertyVO.java => req/AttrsReq.java} | 12 +++-------
.../manager/server/model/req/PropertyReq.java | 2 ++
.../model/vo/{PropertyVO.java => AttrsVO.java} | 10 ++-------
.../bigtop/manager/server/model/vo/PropertyVO.java | 2 ++
.../AttrsModel.java} | 10 +++------
.../stack/{pojo => model}/ComponentModel.java | 2 +-
.../stack/{pojo => model}/CustomCommandModel.java | 2 +-
.../stack/{pojo => model}/OSSpecificModel.java | 2 +-
.../stack/{pojo => model}/PropertyModel.java | 5 ++++-
.../stack/{pojo => model}/QuickLinkModel.java | 2 +-
.../server/stack/{pojo => model}/RepoModel.java | 2 +-
.../server/stack/{pojo => model}/ScriptModel.java | 2 +-
.../server/stack/{pojo => model}/ServiceModel.java | 2 +-
.../server/stack/{pojo => model}/StackModel.java | 2 +-
.../manager/server/stack/xml/ConfigurationXml.java | 2 +-
.../server/stack/xml/ServiceMetainfoXml.java | 2 +-
.../manager/server/stack/xml/StackMetainfoXml.java | 2 +-
.../manager/server/utils/StackConfigUtils.java | 26 +++++++++++++++++-----
.../bigtop/manager/server/utils/StackUtils.java | 4 ++--
.../services/hdfs/configuration/hadoop-env.xml | 3 +++
.../services/hdfs/configuration/hdfs-log4j.xml | 3 +++
.../services/hdfs/configuration/hdfs.conf.xml | 3 +++
.../3.3.0/services/hdfs/configuration/workers.xml | 3 +++
.../services/kafka/configuration/kafka-env.xml | 3 +++
.../services/kafka/configuration/kafka-log4j.xml | 3 +++
.../services/kafka/configuration/kafka.conf.xml | 3 +++
.../services/yarn/configuration/exclude-nodes.xml | 3 +++
.../3.3.0/services/yarn/configuration/yarn-env.xml | 3 +++
.../services/yarn/configuration/yarn-log4j.xml | 3 +++
.../services/yarn/configuration/yarn.conf.xml | 3 +++
.../services/zookeeper/configuration/zoo.cfg.xml | 3 +++
.../zookeeper/configuration/zookeeper-env.xml | 3 +++
.../services/kafka/configuration/kafka-env.xml | 9 +++++---
.../services/kafka/configuration/kafka-log4j.xml | 3 +++
.../services/kafka/configuration/kafka.conf.xml | 3 +++
.../services/zookeeper/configuration/zoo.cfg.xml | 3 +++
.../zookeeper/configuration/zookeeper-env.xml | 3 +++
bigtop-manager-ui/src/api/config/types.ts | 5 +++++
.../components/service-add/configure-services.vue | 20 +++++++----------
bigtop-manager-ui/src/pages/service/index.vue | 25 ++++++++-------------
45 files changed, 135 insertions(+), 86 deletions(-)
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/PropertyDTO.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/AttrsDTO.java
similarity index 85%
copy from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/PropertyDTO.java
copy to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/AttrsDTO.java
index bab0ae2..422846b 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/PropertyDTO.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/AttrsDTO.java
@@ -23,13 +23,7 @@ import lombok.Data;
import java.io.Serializable;
@Data
-public class PropertyDTO implements Serializable {
+public class AttrsDTO implements Serializable {
- private String name;
-
- private String value;
-
- private String displayName;
-
- private String desc;
+ private String type;
}
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/PropertyDTO.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/PropertyDTO.java
index bab0ae2..f4845c4 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/PropertyDTO.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/PropertyDTO.java
@@ -32,4 +32,6 @@ public class PropertyDTO implements Serializable {
private String displayName;
private String desc;
+
+ private AttrsDTO attrs;
}
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ComponentMapper.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ComponentMapper.java
index 961967f..66a93e1 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ComponentMapper.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ComponentMapper.java
@@ -23,7 +23,7 @@ import org.apache.bigtop.manager.dao.entity.Component;
import org.apache.bigtop.manager.dao.entity.Service;
import org.apache.bigtop.manager.server.model.dto.ComponentDTO;
import org.apache.bigtop.manager.server.model.vo.ComponentVO;
-import org.apache.bigtop.manager.server.stack.pojo.ComponentModel;
+import org.apache.bigtop.manager.server.stack.model.ComponentModel;
import org.mapstruct.Context;
import org.mapstruct.Mapper;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ServiceMapper.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ServiceMapper.java
index 82d6b9f..1ebfab9 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ServiceMapper.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ServiceMapper.java
@@ -22,7 +22,7 @@ import org.apache.bigtop.manager.dao.entity.Cluster;
import org.apache.bigtop.manager.dao.entity.Service;
import org.apache.bigtop.manager.server.model.dto.ServiceDTO;
import org.apache.bigtop.manager.server.model.vo.ServiceVO;
-import org.apache.bigtop.manager.server.stack.pojo.ServiceModel;
+import org.apache.bigtop.manager.server.stack.model.ServiceModel;
import org.mapstruct.Context;
import org.mapstruct.Mapper;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StackMapper.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StackMapper.java
index 95e4649..76066c5 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StackMapper.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StackMapper.java
@@ -21,7 +21,7 @@ package org.apache.bigtop.manager.server.model.mapper;
import org.apache.bigtop.manager.dao.entity.Stack;
import org.apache.bigtop.manager.server.model.dto.StackDTO;
import org.apache.bigtop.manager.server.model.vo.StackVO;
-import org.apache.bigtop.manager.server.stack.pojo.StackModel;
+import org.apache.bigtop.manager.server.stack.model.StackModel;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/req/AttrsReq.java
similarity index 81%
copy from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
copy to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/req/AttrsReq.java
index 8442d84..71e26bc 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/req/AttrsReq.java
@@ -16,18 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.model.vo;
+package org.apache.bigtop.manager.server.model.req;
import lombok.Data;
@Data
-public class PropertyVO {
+public class AttrsReq {
- private String name;
-
- private String value;
-
- private String displayName;
-
- private String desc;
+ private String type;
}
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/req/PropertyReq.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/req/PropertyReq.java
index c665551..e3e961a 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/req/PropertyReq.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/req/PropertyReq.java
@@ -33,4 +33,6 @@ public class PropertyReq {
private String displayName;
private String desc;
+
+ private AttrsReq attrs;
}
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/AttrsVO.java
similarity index 86%
copy from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
copy to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/AttrsVO.java
index 8442d84..ec52426 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/AttrsVO.java
@@ -21,13 +21,7 @@ package org.apache.bigtop.manager.server.model.vo;
import lombok.Data;
@Data
-public class PropertyVO {
+public class AttrsVO {
- private String name;
-
- private String value;
-
- private String displayName;
-
- private String desc;
+ private String type;
}
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
index 8442d84..23fd72e 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PropertyVO.java
@@ -30,4 +30,6 @@ public class PropertyVO {
private String displayName;
private String desc;
+
+ private AttrsVO attrs;
}
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/CustomCommandModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/AttrsModel.java
similarity index 80%
copy from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/CustomCommandModel.java
copy to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/AttrsModel.java
index b23d4cf..e765bde 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/CustomCommandModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/AttrsModel.java
@@ -16,20 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.Data;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
@Data
@XmlAccessorType(XmlAccessType.FIELD)
-public class CustomCommandModel {
+public class AttrsModel {
- private String name;
-
- @XmlElement(name = "command-script")
- private ScriptModel commandScript;
+ private String type;
}
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/ComponentModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ComponentModel.java
similarity index 96%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/ComponentModel.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ComponentModel.java
index 10c5416..21c8dd7 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/ComponentModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ComponentModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/CustomCommandModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/CustomCommandModel.java
similarity index 95%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/CustomCommandModel.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/CustomCommandModel.java
index b23d4cf..1517c95 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/CustomCommandModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/CustomCommandModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/OSSpecificModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/OSSpecificModel.java
similarity index 96%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/OSSpecificModel.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/OSSpecificModel.java
index b38882c..b2dc423 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/OSSpecificModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/OSSpecificModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/PropertyModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/PropertyModel.java
similarity index 91%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/PropertyModel.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/PropertyModel.java
index 657f32a..e8fd9bd 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/PropertyModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/PropertyModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.Data;
@@ -37,4 +37,7 @@ public class PropertyModel {
@XmlElement(name = "description")
private String desc;
+
+ @XmlElement(name = "attrs")
+ private AttrsModel attrs;
}
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/QuickLinkModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/QuickLinkModel.java
similarity index 96%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/QuickLinkModel.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/QuickLinkModel.java
index f600333..b54059d 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/QuickLinkModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/QuickLinkModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/RepoModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/RepoModel.java
similarity index 96%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/RepoModel.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/RepoModel.java
index fc7883e..3ea4887 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/RepoModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/RepoModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/ScriptModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ScriptModel.java
similarity index 95%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/ScriptModel.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ScriptModel.java
index bc1d04c..6b71ac2 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/ScriptModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ScriptModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/ServiceModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ServiceModel.java
similarity index 97%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/ServiceModel.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ServiceModel.java
index abdeb0f..b665ee0 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/ServiceModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ServiceModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/StackModel.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/StackModel.java
similarity index 96%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/StackModel.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/StackModel.java
index e00c48e..45aeb40 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/pojo/StackModel.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/StackModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.bigtop.manager.server.stack.pojo;
+package org.apache.bigtop.manager.server.stack.model;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/ConfigurationXml.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/ConfigurationXml.java
index 5187be1..07f6a10 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/ConfigurationXml.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/ConfigurationXml.java
@@ -18,7 +18,7 @@
*/
package org.apache.bigtop.manager.server.stack.xml;
-import org.apache.bigtop.manager.server.stack.pojo.PropertyModel;
+import org.apache.bigtop.manager.server.stack.model.PropertyModel;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/ServiceMetainfoXml.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/ServiceMetainfoXml.java
index 97ee57b..cd8fb56 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/ServiceMetainfoXml.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/ServiceMetainfoXml.java
@@ -18,7 +18,7 @@
*/
package org.apache.bigtop.manager.server.stack.xml;
-import org.apache.bigtop.manager.server.stack.pojo.ServiceModel;
+import org.apache.bigtop.manager.server.stack.model.ServiceModel;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/StackMetainfoXml.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/StackMetainfoXml.java
index 72baabf..341589b 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/StackMetainfoXml.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/xml/StackMetainfoXml.java
@@ -18,7 +18,7 @@
*/
package org.apache.bigtop.manager.server.stack.xml;
-import org.apache.bigtop.manager.server.stack.pojo.StackModel;
+import org.apache.bigtop.manager.server.stack.model.StackModel;
import lombok.Data;
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/StackConfigUtils.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/StackConfigUtils.java
index 637bcf3..18ffc38 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/StackConfigUtils.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/StackConfigUtils.java
@@ -18,8 +18,10 @@
*/
package org.apache.bigtop.manager.server.utils;
+import org.apache.bigtop.manager.server.model.dto.AttrsDTO;
import org.apache.bigtop.manager.server.model.dto.PropertyDTO;
-import org.apache.bigtop.manager.server.stack.pojo.PropertyModel;
+import org.apache.bigtop.manager.server.stack.model.AttrsModel;
+import org.apache.bigtop.manager.server.stack.model.PropertyModel;
import org.apache.bigtop.manager.server.stack.xml.ConfigurationXml;
import java.util.ArrayList;
@@ -41,17 +43,29 @@ public class StackConfigUtils {
List<PropertyDTO> propertyDTOList = new ArrayList<>();
for (PropertyModel propertyModel : propertyModels) {
- PropertyDTO propertyDTO = new PropertyDTO();
- propertyDTO.setDisplayName(propertyModel.getDisplayName());
- propertyDTO.setDesc(propertyModel.getDesc());
- propertyDTO.setName(propertyModel.getName());
- propertyDTO.setValue(propertyModel.getValue());
+ PropertyDTO propertyDTO = getPropertyDTO(propertyModel);
propertyDTOList.add(propertyDTO);
}
return propertyDTOList;
}
+ private static PropertyDTO getPropertyDTO(PropertyModel propertyModel) {
+ PropertyDTO propertyDTO = new PropertyDTO();
+ propertyDTO.setDisplayName(propertyModel.getDisplayName());
+ propertyDTO.setDesc(propertyModel.getDesc());
+ propertyDTO.setName(propertyModel.getName());
+ propertyDTO.setValue(propertyModel.getValue());
+ if (propertyModel.getAttrs() != null) {
+ AttrsModel attrsModel = propertyModel.getAttrs();
+ AttrsDTO attrsDTO = new AttrsDTO();
+ attrsDTO.setType(attrsModel.getType());
+ propertyDTO.setAttrs(attrsDTO);
+ }
+
+ return propertyDTO;
+ }
+
/**
* extract config from List<Map<String,Object>> to Map<String,Object>
*
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/StackUtils.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/StackUtils.java
index 59bf63c..043b3a6 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/StackUtils.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/StackUtils.java
@@ -33,8 +33,8 @@ import
org.apache.bigtop.manager.server.model.mapper.StackMapper;
import org.apache.bigtop.manager.server.stack.dag.ComponentCommandWrapper;
import org.apache.bigtop.manager.server.stack.dag.DAG;
import org.apache.bigtop.manager.server.stack.dag.DagGraphEdge;
-import org.apache.bigtop.manager.server.stack.pojo.ServiceModel;
-import org.apache.bigtop.manager.server.stack.pojo.StackModel;
+import org.apache.bigtop.manager.server.stack.model.ServiceModel;
+import org.apache.bigtop.manager.server.stack.model.StackModel;
import org.apache.bigtop.manager.server.stack.xml.ServiceMetainfoXml;
import org.apache.bigtop.manager.server.stack.xml.StackMetainfoXml;
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hadoop-env.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hadoop-env.xml
index ba70783..b085204 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hadoop-env.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hadoop-env.xml
@@ -117,5 +117,8 @@ export HADOOP_LIBEXEC_DIR=${hadoop_libexec_dir}
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hdfs-log4j.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hdfs-log4j.xml
index 57ee738..7a0fd04 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hdfs-log4j.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hdfs-log4j.xml
@@ -376,5 +376,8 @@ log4j.logger.org.apache.commons.beanutils=WARN
</#noparse>
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hdfs.conf.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hdfs.conf.xml
index 748488c..72b7868 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hdfs.conf.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/hdfs.conf.xml
@@ -47,5 +47,8 @@ ${hdfs_group} - nproc ${hdfs_user_nproc_limit}
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/workers.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/workers.xml
index 0036089..4d5da3e 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/workers.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hdfs/configuration/workers.xml
@@ -50,5 +50,8 @@ ${host}
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-env.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-env.xml
index 525d2bf..e51666c 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-env.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-env.xml
@@ -64,5 +64,8 @@ export KAFKA_OPTS={{kafka_kerberos_params}}
export CLASSPATH=$CLASSPATH:${kafka_conf_dir}
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-log4j.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-log4j.xml
index 2c1a7fe..f6f76a0 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-log4j.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-log4j.xml
@@ -136,5 +136,8 @@ log4j.logger.state.change.logger=TRACE, stateChangeAppender
log4j.additivity.state.change.logger=false
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka.conf.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka.conf.xml
index d610187..48076cd 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka.conf.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka.conf.xml
@@ -47,5 +47,8 @@ ${kafka_group} - nproc ${kafka_user_nproc_limit}
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/exclude-nodes.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/exclude-nodes.xml
index 3f63b79..aaf8035 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/exclude-nodes.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/exclude-nodes.xml
@@ -50,5 +50,8 @@ ${host}
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn-env.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn-env.xml
index ccf4fba..2b7679d 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn-env.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn-env.xml
@@ -204,6 +204,9 @@ HADOOP_OPTS="$HADOOP_OPTS
-Djava.io.tmpdir=${hadoop_java_io_tmpdir}"
HADOOP_OPTS="$HADOOP_OPTS --add-opens java.base/java.lang=ALL-UNNAMED"
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
<property>
<name>service_check.queue.name</name>
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn-log4j.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn-log4j.xml
index 55f1f2c..413e27f 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn-log4j.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn-log4j.xml
@@ -96,6 +96,9 @@ log4j.appender.NMAUDIT.layout.ConversionPattern=%d{ISO8601}
%p %c{2}: %m%n
log4j.appender.NMAUDIT.DatePattern=.yyyy-MM-dd
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn.conf.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn.conf.xml
index 84f2d3f..79438b7 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn.conf.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/yarn/configuration/yarn.conf.xml
@@ -47,5 +47,8 @@ ${yarn_group} - nproc ${yarn_user_nproc_limit}
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/configuration/zoo.cfg.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/configuration/zoo.cfg.xml
index 608f633..bd09086 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/configuration/zoo.cfg.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/configuration/zoo.cfg.xml
@@ -121,5 +121,8 @@ kerberos.removeRealmFromPrincipal=true
</#noparse>
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/configuration/zookeeper-env.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/configuration/zookeeper-env.xml
index 84c8e77..c963833 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/configuration/zookeeper-env.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/configuration/zookeeper-env.xml
@@ -51,5 +51,8 @@ export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS
-Djava.security.auth.login.config=${zk_
</#if>
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
diff --git
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka-env.xml
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka-env.xml
index 01b51ac..794129d 100644
---
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka-env.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka-env.xml
@@ -23,13 +23,13 @@
<name>logDir</name>
<display-name>Kafka Log directory</display-name>
<value>/var/log/kafka</value>
- <description />
+ <description/>
</property>
<property>
<name>pidDir</name>
<value>/var/run/kafka</value>
<display-name>Kafka PID dir</display-name>
- <description />
+ <description/>
</property>
<property>
<name>kafkaUserNofileLimit</name>
@@ -63,6 +63,9 @@ export KAFKA_OPTS={{kafka_kerberos_params}}
</#if>
export CLASSPATH=$CLASSPATH:${CONF_DIR}
]]>
- </value>
+ </value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka-log4j.xml
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka-log4j.xml
index 2c1a7fe..f6f76a0 100644
---
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka-log4j.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka-log4j.xml
@@ -136,5 +136,8 @@ log4j.logger.state.change.logger=TRACE, stateChangeAppender
log4j.additivity.state.change.logger=false
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka.conf.xml
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka.conf.xml
index b302bc3..3b9a151 100644
---
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka.conf.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/kafka/configuration/kafka.conf.xml
@@ -46,5 +46,8 @@ ${kafkaUser} - nofile ${kafkaUserNofileLimit}
${kafkaGroup} - nproc ${kafkaUserNprocLimit}
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
\ No newline at end of file
diff --git
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/zookeeper/configuration/zoo.cfg.xml
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/zookeeper/configuration/zoo.cfg.xml
index 8a9b989..2613910 100644
---
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/zookeeper/configuration/zoo.cfg.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/zookeeper/configuration/zoo.cfg.xml
@@ -121,5 +121,8 @@ kerberos.removeRealmFromPrincipal=true
</#noparse>
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
diff --git
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/zookeeper/configuration/zookeeper-env.xml
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/zookeeper/configuration/zookeeper-env.xml
index 76f647b..44bdc24 100644
---
a/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/zookeeper/configuration/zookeeper-env.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/nop/1.0.0/services/zookeeper/configuration/zookeeper-env.xml
@@ -51,5 +51,8 @@ export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS
-Djava.security.auth.login.config=${zk_
</#if>
]]>
</value>
+ <attrs>
+ <type>longtext</type>
+ </attrs>
</property>
</configuration>
diff --git a/bigtop-manager-ui/src/api/config/types.ts
b/bigtop-manager-ui/src/api/config/types.ts
index db23f39..294eefc 100644
--- a/bigtop-manager-ui/src/api/config/types.ts
+++ b/bigtop-manager-ui/src/api/config/types.ts
@@ -17,11 +17,16 @@
* under the License.
*/
+export interface AttrsVO {
+ type: string
+}
+
export interface PropertyVO {
name: string
value: string
displayName: string
desc: string
+ attrs: AttrsVO
}
export interface TypeConfigVO {
diff --git
a/bigtop-manager-ui/src/components/service-add/configure-services.vue
b/bigtop-manager-ui/src/components/service-add/configure-services.vue
index 88e8855..cca1aa8 100644
--- a/bigtop-manager-ui/src/components/service-add/configure-services.vue
+++ b/bigtop-manager-ui/src/components/service-add/configure-services.vue
@@ -22,7 +22,6 @@
import { storeToRefs } from 'pinia'
import { useStackStore } from '@/store/stack'
import { execCommand } from '@/api/command'
- import { QuestionCircleOutlined } from '@ant-design/icons-vue'
import _ from 'lodash'
const serviceInfo = defineModel<any>('serviceInfo')
@@ -99,14 +98,16 @@
<div class="config-item-key">
{{ property.displayName ?? property.name }}
</div>
- <div class="config-item-value">
- <a-input v-model:value="property.value" />
- </div>
- <a-tooltip>
+ <a-tooltip class="config-item-value">
<template #title>
{{ property.desc }}
</template>
- <question-circle-outlined class="config-item-desc" />
+ <a-textarea
+ v-if="property.attrs && property.attrs.type === 'longtext'"
+ v-model:value="property.value"
+ :rows="10"
+ />
+ <a-input v-else v-model:value="property.value" />
</a-tooltip>
</div>
</a-collapse-panel>
@@ -153,12 +154,7 @@
}
.config-item-value {
- width: 60%;
- }
-
- .config-item-desc {
- cursor: pointer;
- margin-left: 1rem;
+ width: 75%;
}
}
}
diff --git a/bigtop-manager-ui/src/pages/service/index.vue
b/bigtop-manager-ui/src/pages/service/index.vue
index c05f821..a1e843d 100644
--- a/bigtop-manager-ui/src/pages/service/index.vue
+++ b/bigtop-manager-ui/src/pages/service/index.vue
@@ -21,11 +21,7 @@
import { computed, onMounted, ref, watch } from 'vue'
import { useRoute } from 'vue-router'
import type { SelectProps, MenuProps } from 'ant-design-vue'
- import {
- QuestionCircleOutlined,
- DownOutlined,
- UserOutlined
- } from '@ant-design/icons-vue'
+ import { DownOutlined, UserOutlined } from '@ant-design/icons-vue'
import { useConfigStore } from '@/store/config'
import { storeToRefs } from 'pinia'
import { ServiceConfigVO, TypeConfigVO } from '@/api/config/types.ts'
@@ -265,14 +261,16 @@
<div class="config-item-key">
{{ property.displayName ?? property.name }}
</div>
- <div class="config-item-value">
- <a-input v-model:value="property.value" />
- </div>
- <a-tooltip>
+ <a-tooltip class="config-item-value">
<template #title>
{{ property.desc }}
</template>
- <question-circle-outlined class="config-item-desc" />
+ <a-textarea
+ v-if="property.attrs && property.attrs.type === 'longtext'"
+ v-model:value="property.value"
+ :rows="10"
+ />
+ <a-input v-else v-model:value="property.value" />
</a-tooltip>
</div>
</a-collapse-panel>
@@ -408,12 +406,7 @@
}
.config-item-value {
- width: 60%;
- }
-
- .config-item-desc {
- cursor: pointer;
- margin-left: 1rem;
+ width: 75%;
}
}
}
