[hertzbeat] release hertzbeat version v1.3.1 (#924)

* enable export monitors by excel, yaml in web * enable export monitors by excel, yaml in web * bugfix yaml instance is not thread-safe * [webapp] update monitor export * [hertzbeat] release hertzbeat version v1.3.1 * [script] update application.yml * [script] update gitignore
apache · May 2, 2023 · 9e66e0a · 9e66e0a
1 parent b63e466
commit 9e66e0a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ mvnw
 mvnw.bat
 *.log
 package-lock.json
+*.zip
 
 ### STS ###
 .apt_generated
@@ -47,4 +48,4 @@ node_modules
 
 # debug env
 application-dev.yml
-application-mysql.yml
+application-mysql.yml
diff --git a/manager/src/main/resources/application.yml b/manager/src/main/resources/application.yml
@@ -114,6 +114,9 @@ warehouse:
       url: jdbc:TAOS-RS://localhost:6041/hertzbeat
       username: root
       password: taosdata
+    greptime:
+      enabled: false
+      endpoint: localhost:4001
     iot-db:
       enabled: false
       host: 127.0.0.1

diff --git a/script/application.yml b/script/application.yml
@@ -111,6 +111,9 @@ warehouse:
       url: jdbc:TAOS-RS://localhost:6041/hertzbeat
       username: root
       password: taosdata
+    greptime:
+      enabled: false
+      endpoint: localhost:4001
     iot-db:
       enabled: false
       host: 127.0.0.1
@@ -123,6 +126,14 @@ warehouse:
       # 数据存储时间：默认'7776000000'（90天,单位为毫秒,-1代表永不过期）
       # data expire time, unit:ms, default '7776000000'(90 days, -1:never expire)
       expire-time: '7776000000'
+    influxdb:
+      enabled: false
+      server-url: http://127.0.0.1:8086
+      username: root
+      password: root
+      expire-time: '30d'
+      replication: 1
+
 # store real-time metrics data, enable only one below
 # 存储实时数据方式, 下方只能enabled启用一种方式
     memory:

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.3.0</id>
+    <id>1.3.1</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>

diff --git a/script/docker/server/Dockerfile b/script/docker/server/Dockerfile
@@ -2,7 +2,7 @@ FROM openjdk:11.0.16-jre-slim-buster
 
 MAINTAINER tancloud "tomsun28@outlook.com"
 
-ADD hertzbeat-1.3.0.tar /opt/
+ADD hertzbeat-1.3.1.tar /opt/
 
 ENV TZ=Asia/Shanghai
 #ENV LANG=zh_CN.UTF-8

diff --git a/web-app/src/app/shared/consts.ts b/web-app/src/app/shared/consts.ts
@@ -1,3 +1,3 @@
 export const CONSTS = {
-  VERSION: 'v1.3.0'
+  VERSION: 'v1.3.1'
 };