[hertzbeat] release hertzbeat version v1.4.2 (#1317)

apache · Jan 16, 2024 · 28c9ab5 · 28c9ab5
1 parent 8afc0e3
commit 28c9ab5
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 9 deletions.
diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java
@@ -45,7 +45,7 @@ public static String render(String template, Map<String, Object> replaceData) {
         }
         try {
             Matcher matcher = PATTERN.matcher(template);
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
             while (matcher.find()) {
                 Object objectValue = replaceData.getOrDefault(matcher.group(1), "NullValue");
                 String value = objectValue.toString();

diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeTemplate.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeTemplate.java
@@ -90,9 +90,8 @@ public class NoticeTemplate {
                     "${priorityLabel} : ${priority}\n" +
                     "${triggerTimeLabel} : ${triggerTime}\n" +
                     "${contentLabel} : ${content}", accessMode = READ_WRITE)
-    @Length(max = 100000)
+    @Length(max = 60000)
     @NotBlank
-    @Column(name = "content", columnDefinition = "MEDIUMTEXT")
     private String content;
 
     @Schema(title = "The creator of this record", description = "此条记录创建者", example = "tom", accessMode = READ_ONLY)

diff --git a/script/assembly/collector/assembly.xml b/script/assembly/collector/assembly.xml
@@ -3,7 +3,7 @@
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd
 http://maven.apache.org/ASSEMBLY/2.0.0 ">
     <!--必填,会追加到打包文件名称的末尾-->
-    <id>1.4.1</id>
+    <id>1.4.2</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>

diff --git a/script/assembly/server/assembly.xml b/script/assembly/server/assembly.xml
@@ -19,7 +19,7 @@
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd
 http://maven.apache.org/ASSEMBLY/2.0.0 ">
     <!--必填,会追加到打包文件名称的末尾-->
-    <id>1.4.1</id>
+    <id>1.4.2</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>

diff --git a/script/helm/hertzbeat/Chart.yaml b/script/helm/hertzbeat/Chart.yaml
@@ -13,9 +13,9 @@ icon: https://raw.githubusercontent.com/dromara/hertzbeat/master/home/static/img
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.1
+version: 1.4.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.4.1"
+appVersion: "v1.4.2"
diff --git a/script/sql/schema.sql b/script/sql/schema.sql
@@ -227,7 +227,7 @@ CREATE TABLE  hzb_alert
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
--- Table structure for notice_rule
+-- Table structure for hzb_notice_rule
 -- ----------------------------
 DROP TABLE IF EXISTS  hzb_notice_rule ;
 CREATE TABLE  hzb_notice_rule
@@ -236,6 +236,8 @@ CREATE TABLE  hzb_notice_rule
     name           varchar(100)     not null comment '策略名称',
     receiver_id    bigint           not null comment '消息接收人ID',
     receiver_name  varchar(100)     not null comment '消息接收人标识',
+    template_id    bigint           comment '消息接收人ID',
+    template_name  varchar(100)     comment '消息接收人标识',
     enable         boolean          not null default true comment '是否启用此策略',
     filter_all     boolean          not null default true comment '是否转发所有',
     priorities     varchar(100)     comment '匹配告警级别，空为全部告警级别',
@@ -250,6 +252,24 @@ CREATE TABLE  hzb_notice_rule
     primary key (id)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Table structure for hzb_notice_template
+-- ----------------------------
+DROP TABLE IF EXISTS  hzb_notice_template ;
+CREATE TABLE  hzb_notice_template
+(
+    id             bigint           not null auto_increment comment '通知模版主键索引ID',
+    name           varchar(100)     not null comment '模版名称',
+    type           tinyint          not null comment '通知信息方式: 0-手机短信 1-邮箱 2-webhook 3-微信公众号 4-企业微信机器人 5-钉钉机器人',
+    preset         boolean          default false comment '是否为预设模板: true-预设模板 false-自定义模板',
+    content        varchar(60000)   comment '模板内容',
+    creator        varchar(100)     comment '创建者',
+    modifier       varchar(100)     comment '最新修改者',
+    gmt_create     timestamp        default current_timestamp comment 'create time',
+    gmt_update     datetime         default current_timestamp on update current_timestamp comment 'update time',
+    primary key (id)
+) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4;
+
 -- ----------------------------
 -- Table structure for notice_receiver
 -- ----------------------------

diff --git a/script/sureness.yml b/script/sureness.yml
@@ -59,6 +59,7 @@ excludedResource:
   - /api/metrics===get
   - /api/apps/hierarchy===get
   - /actuator/**===get
+  - /api/push/**===*
   # web ui 前端静态资源
   - /===get
   - /dashboard/**===get

diff --git a/web-app/src/app/shared/constants.ts b/web-app/src/app/shared/constants.ts
@@ -1,3 +1,3 @@
 export const CONSTANTS = {
-  VERSION: 'v1.4.1'
+  VERSION: 'v1.4.2'
 };