Skip to content

Commit dc381ea

Browse files
tomsun28tomsun28
authored
[improve] update docker compose and k8s helm deploy script (apache#2076)
1 parent 3ed52c5 commit dc381ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+530
-269
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ Detailed config refer to [Install HertzBeat via Package](https://hertzbeat.apach
160160

161161
Detailed steps refer to [CONTRIBUTING](CONTRIBUTING.md)
162162

163-
##### 4：Install All(hertzbeat+mysql+tsdb) via Docker-compose
163+
##### 4：Install All(hertzbeat+postgresql+tsdb) via Docker-compose
164164

165-
Install the mysql/postgresql database, iotdb/tdengine/victoria-metrics database and hertzbeat at one time through [docker-compose deployment script](script/docker-compose).
165+
Install the postgresql/mysql database, victoria-metrics/iotdb/tdengine database and hertzbeat at one time through [docker-compose deployment script](script/docker-compose).
166166

167167
Detailed steps refer to [Install via Docker-Compose](script/docker-compose/README.md)
168168

169-
##### 5. Install All(hertzbeat+collector+mysql+tsdb) via kubernetes helm charts
169+
##### 5. Install All(hertzbeat+collector+postgresql+tsdb) via kubernetes helm charts
170170

171171
Install HertzBeat cluster in a Kubernetes cluster by Helm chart.
172172

‎README_CN.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,13 @@ docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MAN
159159

160160
详细步骤参考 [参与贡献之本地代码启动](CONTRIBUTING.md)
161161

162-
##### 方式四：Docker-Compose 统一安装 hertzbeat+mysql+tsdb
162+
##### 方式四：Docker-Compose 统一安装 hertzbeat+postgresql+tsdb
163163

164-
通过 [Docker-Compose 部署脚本](script/docker-compose) 一次性把 mysql/postgresql 数据库, iotdb/tdengine/victoria-metrics 时序数据库和 hertzbeat 安装部署。
164+
通过 [Docker-Compose 部署脚本](script/docker-compose) 一次性把 postgresql/mysql 数据库, victoria-metrics/iotdb/tdengine 时序数据库和 hertzbeat 安装部署。
165165

166166
详细步骤参考 [通过Docker-Compose安装HertzBeat](script/docker-compose/README.md)
167167

168-
##### 方式五：Kubernetes Helm Charts 部署 hertzbeat+collector+mysql+tsdb
168+
##### 方式五：Kubernetes Helm Charts 部署 hertzbeat+collector+postgresql+tsdb
169169

170170
通过 Helm Chart 一次性将 HertzBeat 集群组件部署到 Kubernetes 集群中。
171171

‎home/docs/community/how-to-release.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -578,20 +578,25 @@ The rename the release-1.6.0-rc1 branch to release-1.6.0.
578578
579579
> `Send to`: [email protected] <br />
580580
> `cc`: [email protected] <br />
581-
> `Title`: [ANNOUNCE] Release Apache HertzBeat (incubating) 1.6.0 <br />
581+
> `Title`: [ANNOUNCE] Apache HertzBeat (incubating) 1.6.0 released <br />
582582
> `Body`:
583583
584584
```
585-
Hi Incubator Community,
585+
Hi Community,
586586
587587
We are glad to announce the release of Apache HertzBeat (incubating) 1.6.0.
588-
Once again I would like to express my thanks to your help.
588+
Thanks again for your help.
589+
590+
Apache HertzBeat (https://hertzbeat.apache.org/) - a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
589591
590-
Apache HertzBeat(https://hertzbeat.apache.org/) - a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
592+
Download Link:
593+
https://hertzbeat.apache.org/docs/download/
591594
592-
Download Links: https://hertzbeat.apache.org/download/
595+
Release Note:
596+
https://github.com/apache/hertzbeat/releases/tag/v1.6.0
593597
594-
Release Notes: https://github.com/apache/hertzbeat/releases/tag/v1.6.0
598+
Website:
599+
https://hertzbeat.apache.org/
595600
596601
HertzBeat Resources:
597602
- Issue: https://github.com/apache/hertzbeat/issues
@@ -600,6 +605,7 @@ HertzBeat Resources:
600605
601606
Apache HertzBeat Team
602607
608+
603609
Best,
604610
ChunJin Mu
605611
```

‎home/docs/start/greptime-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: greptime-init
33
title: Use Time Series Database GreptimeDB to Store Metrics Data (Optional)
4-
sidebar_label: Use GreptimeDB Store Metrics
4+
sidebar_label: Metrics Store GreptimeDB
55
---
66

77
Apache HertzBeat (incubating)'s historical data storage relies on the time series database, you can choose one of them to install and initialize, or not to install (note ⚠️ but it is strongly recommended to configure in the production environment)

‎home/docs/start/influxdb-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: influxdb-init
33
title: Use Time Series Database InfluxDB to Store Metrics Data (Optional)
4-
sidebar_label: Use InfluxDB Store Metrics
4+
sidebar_label: Metrics Store InfluxDB
55
---
66

77
Apache HertzBeat (incubating)'s historical data storage relies on the time series database, you can choose one of them to install and initialize, or not to install (note ⚠️ but it is strongly recommended to configure in the production environment)

‎home/docs/start/iotdb-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: iotdb-init
33
title: Use Time Series Database IoTDB to Store Metrics Data (Optional)
4-
sidebar_label: Use IoTDB Store Metrics
4+
sidebar_label: Metrics Store IoTDB
55
---
66
Apache HertzBeat (incubating)'s historical data storage relies on the time series database, you can choose one of them to install and initialize, or not to install (note ⚠️ but it is strongly recommended to configure in the production environment)
77

‎home/docs/start/mysql-change.md

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: mysql-change
33
title: Use MYSQL Replace H2 Database to Store Metadata(Optional)
4-
sidebar_label: Use MYSQL Instead of H2
4+
sidebar_label: Meta Store MYSQL
55
---
66
MYSQL is a reliable relational database. In addition to default built-in H2 database, Apache HertzBeat (incubating) allow you to use MYSQL to store structured relational data such as monitoring information, alarm information and configuration information.
77

@@ -49,29 +49,45 @@ MYSQL is a reliable relational database. In addition to default built-in H2 data
4949
Replace `spring.database` data source parameters, URL account and password.
5050

5151
For example:
52-
```yaml
53-
spring:
54-
datasource:
55-
driver-class-name: org.h2.Driver
56-
username: sa
57-
password: 123456
58-
url: jdbc:h2:./data/hertzbeat;MODE=MYSQL
59-
jpa:
60-
database: h2
61-
```
52+
```yaml
53+
spring:
54+
datasource:
55+
driver-class-name: org.h2.Driver
56+
username: sa
57+
password: 123456
58+
url: jdbc:h2:./data/hertzbeat;MODE=MYSQL
59+
hikari:
60+
max-lifetime: 120000
61+
62+
jpa:
63+
show-sql: false
64+
database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
65+
database: h2
66+
properties:
67+
eclipselink:
68+
logging:
69+
level: SEVERE
70+
```
6271
Specific replacement parameters are as follows and you need to configure account according to the mysql environment:
63-
```yaml
64-
spring:
65-
datasource:
66-
driver-class-name: com.mysql.cj.jdbc.Driver
67-
username: root
68-
password: 123456
69-
url: jdbc:mysql://localhost:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&useSSL=false
70-
platform: mysql
72+
```yaml
73+
spring:
74+
datasource:
75+
driver-class-name: com.mysql.cj.jdbc.Driver
76+
username: root
77+
password: 123456
78+
url: jdbc:mysql://mysql:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false
79+
hikari:
80+
max-lifetime: 120000
7181
jpa:
82+
show-sql: false
83+
database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
7284
database: mysql
73-
```
85+
properties:
86+
eclipselink:
87+
logging:
88+
level: SEVERE
89+
```
7490
75-
- It is recommended to set the host field in the MySQL URL or Redis URL to the public IP address when using Hertzbeat in docker.
91+
- It is recommended to set the host field in the MySQL URL to the public IP address when using Hertzbeat in docker.
7692
7793
**Start HertzBeat visit http://ip:1157/ on the browser You can use HertzBeat monitoring alarm, default account and password are admin/hertzbeat**

‎home/docs/start/postgresql-change.md

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: postgresql-change
3-
title: Use PostgreSQL Replace H2 Database to Store Metadata(Optional)
4-
sidebar_label: Use PostgreSQL Instead of H2
3+
title: Use PostgreSQL Replace H2 Database to Store Metadata(Recommended)
4+
sidebar_label: Meta Store PostgreSQL (Recommended)
55
---
66
PostgreSQL is a RDBMS emphasizing extensibility and SQL compliance. In addition to default built-in H2 database, Apache HertzBeat (incubating) allow you to use PostgreSQL to store structured relational data such as monitoring information, alarm information and configuration information.
77

@@ -46,28 +46,36 @@ spring:
4646
username: sa
4747
password: 123456
4848
url: jdbc:h2:./data/hertzbeat;MODE=MYSQL
49+
hikari:
50+
max-lifetime: 120000
51+
52+
jpa:
53+
show-sql: false
54+
database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
55+
database: h2
56+
properties:
57+
eclipselink:
58+
logging:
59+
level: SEVERE
4960
```
5061
Specific replacement parameters are as follows and you need to configure account, ip, port according to the postgresql environment:
5162
```yaml
5263
spring:
53-
config:
54-
activate:
55-
on-profile: prod
56-
datasource:
57-
driver-class-name: org.postgresql.Driver
58-
username: root
59-
password: 123456
60-
url: jdbc:postgresql://127.0.0.1:5432/hertzbeat
61-
hikari:
62-
max-lifetime: 120000
63-
64-
jpa:
65-
database: postgresql
66-
hibernate:
67-
ddl-auto: update
68-
properties:
69-
hibernate:
70-
dialect: org.hibernate.dialect.PostgreSQLDialect
64+
datasource:
65+
driver-class-name: org.postgresql.Driver
66+
username: root
67+
password: 123456
68+
url: jdbc:postgresql://postgresql:5432/hertzbeat
69+
hikari:
70+
max-lifetime: 120000
71+
jpa:
72+
show-sql: false
73+
database-platform: org.eclipse.persistence.platform.database.PostgreSQLPlatform
74+
database: postgresql
75+
properties:
76+
eclipselink:
77+
logging:
78+
level: SEVERE
7179
```
7280
7381
**Start HertzBeat visit http://ip:1157/ on the browser You can use HertzBeat monitoring alarm, default account and password are admin/hertzbeat**

‎home/docs/start/quickstart.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ Detailed config refer to [Install HertzBeat via Package](package-deploy)
7070

7171
Detailed steps refer to [CONTRIBUTING](../community/contribution)
7272

73-
##### 4：Install All(hertzbeat+mysql+iotdb/tdengine) via Docker-compose
73+
##### 4：Install All(hertzbeat+postgresql+tsdb) via Docker-compose
7474

75-
Install and deploy the mysql database, iotdb/tdengine database and hertzbeat at one time through [docker-compose deployment script](https://github.com/apache/hertzbeat/tree/master/script/docker-compose).
75+
Install and deploy the postgresql/mysql database, victoria-metrics/iotdb/tdengine database and hertzbeat at one time through [docker-compose deployment script](https://github.com/apache/hertzbeat/tree/master/script/docker-compose).
7676

7777
Detailed steps refer to [Install via Docker-Compose](https://github.com/apache/hertzbeat/tree/master/script/docker-compose)
7878

79-
##### 5. Install All(hertzbeat+collector+mysql+iotdb) via kubernetes helm charts
79+
##### 5. Install All(hertzbeat+collector+postgresql+tsdb) via kubernetes helm charts
8080

8181
Install HertzBeat cluster in a Kubernetes cluster by Helm chart.
8282

‎home/docs/start/tdengine-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: tdengine-init
33
title: Use Time Series Database TDengine to Store Metrics Data (Optional)
4-
sidebar_label: Use TDengine Store Metrics
4+
sidebar_label: Metrics Store TDengine
55
---
66

77
Apache HertzBeat (incubating)'s historical data storage relies on the time series database, you can choose one of them to install and initialize, or not to install (note ⚠️ but it is strongly recommended to configure in the production environment)

‎home/docs/start/victoria-metrics-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: victoria-metrics-init
33
title: Use Time Series Database VictoriaMetrics to Store Metrics Data (Recommended)
4-
sidebar_label: Use VictoriaMetrics Store Metrics(Recommended)
4+
sidebar_label: Metrics Store VictoriaMetrics (Recommended)
55
---
66

77
Apache HertzBeat (incubating)'s historical data storage relies on the time series database, you can choose one of them to install and initialize, or not to install (note ⚠️ but it is strongly recommended to configure in the production environment)

‎home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -580,19 +580,25 @@ release note: xxx
580580
581581
> `Send to`: [email protected] <br />
582582
> `cc`: [email protected] <br />
583-
> `Title`: [ANNOUNCE] Release Apache HertzBeat (incubating) 1.6.0 <br />
583+
> `Title`: [ANNOUNCE] Apache HertzBeat (incubating) 1.6.0 released <br />
584584
> `Body`:
585585
586586
```
587-
Hi Incubator Community,
587+
Hi Community,
588588

589589
We are glad to announce the release of Apache HertzBeat (incubating) 1.6.0.
590-
Once again I would like to express my thanks to your help.
590+
Thanks again for your help.
591+
592+
Apache HertzBeat (https://hertzbeat.apache.org/) - a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
593+
594+
Download Link:
595+
https://hertzbeat.apache.org/docs/download/
591596

592-
Apache HertzBeat(https://hertzbeat.apache.org/) - a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
597+
Release Note:
598+
https://github.com/apache/hertzbeat/releases/tag/v1.6.0
593599

594-
Download Links: https://hertzbeat.apache.org/download/
595-
Release Notes: https://github.com/apache/hertzbeat/releases/tag/v1.6.0
600+
Website:
601+
https://hertzbeat.apache.org/
596602

597603
HertzBeat Resources:
598604
- Issue: https://github.com/apache/hertzbeat/issues

‎home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/greptime-init.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: greptime-init
3-
title: 依赖时序数据库服务GreptimeDB安装初始化
4-
sidebar_label: 使用GreptimeDB存储指标数据(可选)
3+
title: 依赖时序数据库服务GreptimeDB安装初始化(可选)
4+
sidebar_label: 指标数据存储GreptimeDB
55
---
66

77
Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置)

‎home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/influxdb-init.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: influxdb-init
3-
title: 依赖时序数据库服务InfluxDB安装初始化
4-
sidebar_label: 使用InfluxDB存储指标数据(可选)
3+
title: 依赖时序数据库服务InfluxDB安装初始化(可选)
4+
sidebar_label: 指标数据存储InfluxDB
55
---
66

77
Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置)

‎home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/iotdb-init.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
id: iotdb-init
3-
title: 依赖时序数据库服务IoTDB安装初始化
4-
sidebar_label: 使用IoTDB存储指标数据(可选)
3+
title: 依赖时序数据库服务IoTDB安装初始化(可选)
4+
sidebar_label: 指标数据存储IoTDB
55
---
66
Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置)
77

0 commit comments

Comments
 (0)