Skip to content

Commit 9e66e0a

Browse files
authored
[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
1 parent b63e466 commit 9e66e0a

File tree

6 files changed

+19
-4
lines changed

6 files changed

+19
-4
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ mvnw
1111
mvnw.bat
1212
*.log
1313
package-lock.json
14+
*.zip
1415

1516
### STS ###
1617
.apt_generated
@@ -47,4 +48,4 @@ node_modules
4748

4849
# debug env
4950
application-dev.yml
50-
application-mysql.yml
51+
application-mysql.yml

manager/src/main/resources/application.yml

+3
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ warehouse:
114114
url: jdbc:TAOS-RS://localhost:6041/hertzbeat
115115
username: root
116116
password: taosdata
117+
greptime:
118+
enabled: false
119+
endpoint: localhost:4001
117120
iot-db:
118121
enabled: false
119122
host: 127.0.0.1

script/application.yml

+11
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ warehouse:
111111
url: jdbc:TAOS-RS://localhost:6041/hertzbeat
112112
username: root
113113
password: taosdata
114+
greptime:
115+
enabled: false
116+
endpoint: localhost:4001
114117
iot-db:
115118
enabled: false
116119
host: 127.0.0.1
@@ -123,6 +126,14 @@ warehouse:
123126
# 数据存储时间:默认'7776000000'(90天,单位为毫秒,-1代表永不过期)
124127
# data expire time, unit:ms, default '7776000000'(90 days, -1:never expire)
125128
expire-time: '7776000000'
129+
influxdb:
130+
enabled: false
131+
server-url: http://127.0.0.1:8086
132+
username: root
133+
password: root
134+
expire-time: '30d'
135+
replication: 1
136+
126137
# store real-time metrics data, enable only one below
127138
# 存储实时数据方式, 下方只能enabled启用一种方式
128139
memory:

script/assembly/server/assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd
2020
http://maven.apache.org/ASSEMBLY/2.0.0 ">
2121
<!--必填,会追加到打包文件名称的末尾-->
22-
<id>1.3.0</id>
22+
<id>1.3.1</id>
2323
<!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
2424
<formats>
2525
<format>tar</format>

script/docker/server/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM openjdk:11.0.16-jre-slim-buster
22

33
MAINTAINER tancloud "[email protected]"
44

5-
ADD hertzbeat-1.3.0.tar /opt/
5+
ADD hertzbeat-1.3.1.tar /opt/
66

77
ENV TZ=Asia/Shanghai
88
#ENV LANG=zh_CN.UTF-8

web-app/src/app/shared/consts.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export const CONSTS = {
2-
VERSION: 'v1.3.0'
2+
VERSION: 'v1.3.1'
33
};

0 commit comments

Comments
 (0)