diff --git a/README.md b/README.md index 1f21c29f2c3..96a502d8fcf 100644 --- a/README.md +++ b/README.md @@ -160,13 +160,13 @@ Detailed config refer to [Install HertzBeat via Package](https://hertzbeat.apach Detailed steps refer to [CONTRIBUTING](CONTRIBUTING.md) -##### 4:Install All(hertzbeat+mysql+tsdb) via Docker-compose +##### 4:Install All(hertzbeat+postgresql+tsdb) via Docker-compose -Install the mysql/postgresql database, iotdb/tdengine/victoria-metrics database and hertzbeat at one time through [docker-compose deployment script](script/docker-compose). +Install the postgresql/mysql database, victoria-metrics/iotdb/tdengine database and hertzbeat at one time through [docker-compose deployment script](script/docker-compose). Detailed steps refer to [Install via Docker-Compose](script/docker-compose/README.md) -##### 5. Install All(hertzbeat+collector+mysql+tsdb) via kubernetes helm charts +##### 5. Install All(hertzbeat+collector+postgresql+tsdb) via kubernetes helm charts Install HertzBeat cluster in a Kubernetes cluster by Helm chart. diff --git a/README_CN.md b/README_CN.md index 5d96a696456..e42adc95171 100644 --- a/README_CN.md +++ b/README_CN.md @@ -159,13 +159,13 @@ docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MAN 详细步骤参考 [参与贡献之本地代码启动](CONTRIBUTING.md) -##### 方式四:Docker-Compose 统一安装 hertzbeat+mysql+tsdb +##### 方式四:Docker-Compose 统一安装 hertzbeat+postgresql+tsdb -通过 [Docker-Compose 部署脚本](script/docker-compose) 一次性把 mysql/postgresql 数据库, iotdb/tdengine/victoria-metrics 时序数据库和 hertzbeat 安装部署。 +通过 [Docker-Compose 部署脚本](script/docker-compose) 一次性把 postgresql/mysql 数据库, victoria-metrics/iotdb/tdengine 时序数据库和 hertzbeat 安装部署。 详细步骤参考 [通过Docker-Compose安装HertzBeat](script/docker-compose/README.md) -##### 方式五:Kubernetes Helm Charts 部署 hertzbeat+collector+mysql+tsdb +##### 方式五:Kubernetes Helm Charts 部署 hertzbeat+collector+postgresql+tsdb 通过 Helm Chart 一次性将 HertzBeat 集群组件部署到 Kubernetes 集群中。 diff --git a/home/docs/community/how-to-release.md b/home/docs/community/how-to-release.md index 8ffca0302cb..f92b328c8f7 100644 --- a/home/docs/community/how-to-release.md +++ b/home/docs/community/how-to-release.md @@ -578,20 +578,25 @@ The rename the release-1.6.0-rc1 branch to release-1.6.0. > `Send to`: general@incubator.apache.org
> `cc`: dev@hertzbeat.apache.org
-> `Title`: [ANNOUNCE] Release Apache HertzBeat (incubating) 1.6.0
+> `Title`: [ANNOUNCE] Apache HertzBeat (incubating) 1.6.0 released
> `Body`: ``` -Hi Incubator Community, +Hi Community, We are glad to announce the release of Apache HertzBeat (incubating) 1.6.0. -Once again I would like to express my thanks to your help. +Thanks again for your help. + +Apache HertzBeat (https://hertzbeat.apache.org/) - a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities. -Apache HertzBeat(https://hertzbeat.apache.org/) - a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities. +Download Link: +https://hertzbeat.apache.org/docs/download/ -Download Links: https://hertzbeat.apache.org/download/ +Release Note: +https://github.com/apache/hertzbeat/releases/tag/v1.6.0 -Release Notes: https://github.com/apache/hertzbeat/releases/tag/v1.6.0 +Website: +https://hertzbeat.apache.org/ HertzBeat Resources: - Issue: https://github.com/apache/hertzbeat/issues @@ -600,6 +605,7 @@ HertzBeat Resources: Apache HertzBeat Team + Best, ChunJin Mu ``` diff --git a/home/docs/start/greptime-init.md b/home/docs/start/greptime-init.md index 1ed73d35cfe..d2b73d39068 100644 --- a/home/docs/start/greptime-init.md +++ b/home/docs/start/greptime-init.md @@ -1,7 +1,7 @@ --- id: greptime-init title: Use Time Series Database GreptimeDB to Store Metrics Data (Optional) -sidebar_label: Use GreptimeDB Store Metrics +sidebar_label: Metrics Store GreptimeDB --- 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) diff --git a/home/docs/start/influxdb-init.md b/home/docs/start/influxdb-init.md index 1dd7c28785f..6e5aabcd91d 100644 --- a/home/docs/start/influxdb-init.md +++ b/home/docs/start/influxdb-init.md @@ -1,7 +1,7 @@ --- id: influxdb-init title: Use Time Series Database InfluxDB to Store Metrics Data (Optional) -sidebar_label: Use InfluxDB Store Metrics +sidebar_label: Metrics Store InfluxDB --- 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) diff --git a/home/docs/start/iotdb-init.md b/home/docs/start/iotdb-init.md index ee7a66a87f4..33b82a79183 100644 --- a/home/docs/start/iotdb-init.md +++ b/home/docs/start/iotdb-init.md @@ -1,7 +1,7 @@ --- id: iotdb-init title: Use Time Series Database IoTDB to Store Metrics Data (Optional) -sidebar_label: Use IoTDB Store Metrics +sidebar_label: Metrics Store IoTDB --- 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) diff --git a/home/docs/start/mysql-change.md b/home/docs/start/mysql-change.md index f224a418e4f..dc48ce9bf60 100644 --- a/home/docs/start/mysql-change.md +++ b/home/docs/start/mysql-change.md @@ -1,7 +1,7 @@ --- id: mysql-change title: Use MYSQL Replace H2 Database to Store Metadata(Optional) -sidebar_label: Use MYSQL Instead of H2 +sidebar_label: Meta Store MYSQL --- 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. @@ -49,29 +49,45 @@ MYSQL is a reliable relational database. In addition to default built-in H2 data Replace `spring.database` data source parameters, URL account and password. For example: - ```yaml - spring: - datasource: - driver-class-name: org.h2.Driver - username: sa - password: 123456 - url: jdbc:h2:./data/hertzbeat;MODE=MYSQL - jpa: - database: h2 - ``` +```yaml +spring: + datasource: + driver-class-name: org.h2.Driver + username: sa + password: 123456 + url: jdbc:h2:./data/hertzbeat;MODE=MYSQL + hikari: + max-lifetime: 120000 + + jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.MySQLPlatform + database: h2 + properties: + eclipselink: + logging: + level: SEVERE +``` Specific replacement parameters are as follows and you need to configure account according to the mysql environment: - ```yaml - spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: 123456 - url: jdbc:mysql://localhost:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&useSSL=false - platform: mysql +```yaml +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + username: root + password: 123456 + url: jdbc:mysql://mysql:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false + hikari: + max-lifetime: 120000 jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql - ``` + properties: + eclipselink: + logging: + level: SEVERE +``` -- 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. +- It is recommended to set the host field in the MySQL URL to the public IP address when using Hertzbeat in docker. **Start HertzBeat visit http://ip:1157/ on the browser You can use HertzBeat monitoring alarm, default account and password are admin/hertzbeat** diff --git a/home/docs/start/postgresql-change.md b/home/docs/start/postgresql-change.md index c78a24a1ca7..60956f42f77 100644 --- a/home/docs/start/postgresql-change.md +++ b/home/docs/start/postgresql-change.md @@ -1,7 +1,7 @@ --- id: postgresql-change -title: Use PostgreSQL Replace H2 Database to Store Metadata(Optional) -sidebar_label: Use PostgreSQL Instead of H2 +title: Use PostgreSQL Replace H2 Database to Store Metadata(Recommended) +sidebar_label: Meta Store PostgreSQL (Recommended) --- 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. @@ -46,28 +46,36 @@ spring: username: sa password: 123456 url: jdbc:h2:./data/hertzbeat;MODE=MYSQL + hikari: + max-lifetime: 120000 + + jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.MySQLPlatform + database: h2 + properties: + eclipselink: + logging: + level: SEVERE ``` Specific replacement parameters are as follows and you need to configure account, ip, port according to the postgresql environment: ```yaml spring: - config: - activate: - on-profile: prod - datasource: - driver-class-name: org.postgresql.Driver - username: root - password: 123456 - url: jdbc:postgresql://127.0.0.1:5432/hertzbeat - hikari: - max-lifetime: 120000 - - jpa: - database: postgresql - hibernate: - ddl-auto: update - properties: - hibernate: - dialect: org.hibernate.dialect.PostgreSQLDialect + datasource: + driver-class-name: org.postgresql.Driver + username: root + password: 123456 + url: jdbc:postgresql://postgresql:5432/hertzbeat + hikari: + max-lifetime: 120000 + jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.PostgreSQLPlatform + database: postgresql + properties: + eclipselink: + logging: + level: SEVERE ``` **Start HertzBeat visit http://ip:1157/ on the browser You can use HertzBeat monitoring alarm, default account and password are admin/hertzbeat** diff --git a/home/docs/start/quickstart.md b/home/docs/start/quickstart.md index 7be19dcd691..56ecac4df45 100644 --- a/home/docs/start/quickstart.md +++ b/home/docs/start/quickstart.md @@ -70,13 +70,13 @@ Detailed config refer to [Install HertzBeat via Package](package-deploy) Detailed steps refer to [CONTRIBUTING](../community/contribution) -##### 4:Install All(hertzbeat+mysql+iotdb/tdengine) via Docker-compose +##### 4:Install All(hertzbeat+postgresql+tsdb) via Docker-compose -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). +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). Detailed steps refer to [Install via Docker-Compose](https://github.com/apache/hertzbeat/tree/master/script/docker-compose) -##### 5. Install All(hertzbeat+collector+mysql+iotdb) via kubernetes helm charts +##### 5. Install All(hertzbeat+collector+postgresql+tsdb) via kubernetes helm charts Install HertzBeat cluster in a Kubernetes cluster by Helm chart. diff --git a/home/docs/start/tdengine-init.md b/home/docs/start/tdengine-init.md index d96223c4cb1..a56bc2cc71b 100644 --- a/home/docs/start/tdengine-init.md +++ b/home/docs/start/tdengine-init.md @@ -1,7 +1,7 @@ --- id: tdengine-init title: Use Time Series Database TDengine to Store Metrics Data (Optional) -sidebar_label: Use TDengine Store Metrics +sidebar_label: Metrics Store TDengine --- 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) diff --git a/home/docs/start/victoria-metrics-init.md b/home/docs/start/victoria-metrics-init.md index 327bc4999af..455e91e86cf 100644 --- a/home/docs/start/victoria-metrics-init.md +++ b/home/docs/start/victoria-metrics-init.md @@ -1,7 +1,7 @@ --- id: victoria-metrics-init title: Use Time Series Database VictoriaMetrics to Store Metrics Data (Recommended) -sidebar_label: Use VictoriaMetrics Store Metrics(Recommended) +sidebar_label: Metrics Store VictoriaMetrics (Recommended) --- 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) diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md index 541444473d2..0af99b19c08 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md @@ -580,19 +580,25 @@ release note: xxx > `Send to`: general@incubator.apache.org
> `cc`: dev@hertzbeat.apache.org
-> `Title`: [ANNOUNCE] Release Apache HertzBeat (incubating) 1.6.0
+> `Title`: [ANNOUNCE] Apache HertzBeat (incubating) 1.6.0 released
> `Body`: ``` -Hi Incubator Community, +Hi Community, We are glad to announce the release of Apache HertzBeat (incubating) 1.6.0. -Once again I would like to express my thanks to your help. +Thanks again for your help. + +Apache HertzBeat (https://hertzbeat.apache.org/) - a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities. + +Download Link: +https://hertzbeat.apache.org/docs/download/ -Apache HertzBeat(https://hertzbeat.apache.org/) - a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities. +Release Note: +https://github.com/apache/hertzbeat/releases/tag/v1.6.0 -Download Links: https://hertzbeat.apache.org/download/ -Release Notes: https://github.com/apache/hertzbeat/releases/tag/v1.6.0 +Website: +https://hertzbeat.apache.org/ HertzBeat Resources: - Issue: https://github.com/apache/hertzbeat/issues diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/greptime-init.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/greptime-init.md index 5016b190b50..5b3279b1f40 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/greptime-init.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/greptime-init.md @@ -1,7 +1,7 @@ --- id: greptime-init -title: 依赖时序数据库服务GreptimeDB安装初始化 -sidebar_label: 使用GreptimeDB存储指标数据(可选) +title: 依赖时序数据库服务GreptimeDB安装初始化(可选) +sidebar_label: 指标数据存储GreptimeDB --- Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库,任选其一安装初始化即可,也可不安装(注意⚠️但强烈建议生产环境配置) diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/influxdb-init.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/influxdb-init.md index 125934d2f54..91d30eef74d 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/influxdb-init.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/influxdb-init.md @@ -1,7 +1,7 @@ --- id: influxdb-init -title: 依赖时序数据库服务InfluxDB安装初始化 -sidebar_label: 使用InfluxDB存储指标数据(可选) +title: 依赖时序数据库服务InfluxDB安装初始化(可选) +sidebar_label: 指标数据存储InfluxDB --- Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库,任选其一安装初始化即可,也可不安装(注意⚠️但强烈建议生产环境配置) diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/iotdb-init.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/iotdb-init.md index b4888e2af03..b4c924f6d9f 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/iotdb-init.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/iotdb-init.md @@ -1,7 +1,7 @@ --- id: iotdb-init -title: 依赖时序数据库服务IoTDB安装初始化 -sidebar_label: 使用IoTDB存储指标数据(可选) +title: 依赖时序数据库服务IoTDB安装初始化(可选) +sidebar_label: 指标数据存储IoTDB --- Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库,任选其一安装初始化即可,也可不安装(注意⚠️但强烈建议生产环境配置) diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/mysql-change.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/mysql-change.md index b0c902c575c..7c8f4f64c92 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/mysql-change.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/mysql-change.md @@ -1,7 +1,7 @@ --- id: mysql-change -title: 关系型数据库使用 Mysql 替换依赖的 H2 存储系统元数据 -sidebar_label: 元数据使用Mysql存储(可选) +title: 关系型数据库使用 Mysql 替换依赖的 H2 存储系统元数据(可选) +sidebar_label: 元数据存储Mysql --- MYSQL是一款值得信赖的关系型数据库,Apache HertzBeat (incubating) 除了支持使用默认内置的H2数据库外,还可以切换为使用MYSQL存储监控信息,告警信息,配置信息等结构化关系数据。 @@ -51,29 +51,45 @@ MYSQL是一款值得信赖的关系型数据库,Apache HertzBeat (incubating) ⚠️注意`application.yml`文件内容需完整,除下方修改内容外其他参数需保留,完整内容见[/script/application.yml](https://github.com/hertzbeat/hertzbeat/raw/master/script/application.yml) 需修改部分原参数: - ```yaml - spring: - datasource: - driver-class-name: org.h2.Driver - username: sa - password: 123456 - url: jdbc:h2:./data/hertzbeat;MODE=MYSQL - jpa: - database: h2 - ``` +```yaml +spring: + datasource: + driver-class-name: org.h2.Driver + username: sa + password: 123456 + url: jdbc:h2:./data/hertzbeat;MODE=MYSQL + hikari: + max-lifetime: 120000 + + jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.MySQLPlatform + database: h2 + properties: + eclipselink: + logging: + level: SEVERE +``` 具体替换参数如下,需根据mysql环境配置账户密码IP: - ```yaml - spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: 123456 - url: jdbc:mysql://localhost:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&useSSL=false - platform: mysql +```yaml +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + username: root + password: 123456 + url: jdbc:mysql://mysql:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false + hikari: + max-lifetime: 120000 jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql - ``` + properties: + eclipselink: + logging: + level: SEVERE +``` -- 通过docker启动时,建议修改host为宿主机的外网IP地址,包括mysql连接字符串和redis。 +- 通过docker启动时,建议修改host为宿主机的外网IP地址,包括mysql连接字符串。 **启动 HertzBeat 浏览器访问 http://ip:1157/ 开始使用HertzBeat进行监控告警,默认账户密码 admin/hertzbeat** diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/postgresql-change.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/postgresql-change.md index 3d554d84f0a..a1835610a02 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/postgresql-change.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/postgresql-change.md @@ -1,7 +1,7 @@ --- id: postgresql-change -title: 关系型数据库使用 PostgreSQL 替换依赖的 H2 存储系统元数据 -sidebar_label: 元数据使用PostgreSQL存储(可选) +title: 关系型数据库使用 PostgreSQL 替换依赖的 H2 存储系统元数据(推荐) +sidebar_label: 元数据存储PostgreSQL(推荐) --- PostgreSQL是一个功能强大,开源的关系型数据库管理系统(RDBMS)。Apache HertzBeat (incubating) 除了支持使用默认内置的H2数据库外,还可以切换为使用PostgreSQL存储监控信息,告警信息,配置信息等结构化关系数据。 @@ -57,28 +57,36 @@ spring: username: sa password: 123456 url: jdbc:h2:./data/hertzbeat;MODE=MYSQL + hikari: + max-lifetime: 120000 + + jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.MySQLPlatform + database: h2 + properties: + eclipselink: + logging: + level: SEVERE ``` 具体替换参数如下,需根据 PostgreSQL 环境配置账户密码IP: ```yaml spring: - config: - activate: - on-profile: prod - datasource: - driver-class-name: org.postgresql.Driver - username: root - password: 123456 - url: jdbc:postgresql://127.0.0.1:5432/hertzbeat - hikari: - max-lifetime: 120000 - - jpa: - database: postgresql - hibernate: - ddl-auto: update - properties: - hibernate: - dialect: org.hibernate.dialect.PostgreSQLDialect + datasource: + driver-class-name: org.postgresql.Driver + username: root + password: 123456 + url: jdbc:postgresql://postgresql:5432/hertzbeat + hikari: + max-lifetime: 120000 + jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.PostgreSQLPlatform + database: postgresql + properties: + eclipselink: + logging: + level: SEVERE ``` **启动 HertzBeat 浏览器访问 http://ip:1157/ 开始使用HertzBeat进行监控告警,默认账户密码 admin/hertzbeat** diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md index 2eb4d893e93..3702a89d87d 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md @@ -70,55 +70,16 @@ docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MAN 详细步骤参考 [参与贡献之本地代码启动](../community/contribution) -##### 方式四:Docker-Compose 统一安装 hertzbeat+mysql+iotdb/tdengine +##### 方式四:Docker-Compose 统一安装 hertzbeat+postgresql+tsdb -通过 [docker-compose部署脚本](https://github.com/apache/hertzbeat/tree/master/script/docker-compose) 一次性把 mysql 数据库, iotdb/tdengine 时序数据库和 hertzbeat 安装部署。 +通过 [docker-compose部署脚本](https://github.com/apache/hertzbeat/tree/master/script/docker-compose) 一次性把 postgresql/mysql 数据库, victoria-metrics/iotdb/tdengine 时序数据库和 hertzbeat 安装部署。 详细步骤参考 [docker-compose部署方案](https://github.com/apache/hertzbeat/tree/master/script/docker-compose/README.md) -##### 方式五:Kubernetes Helm Charts 部署 hertzbeat+collector+mysql+iotdb +##### 方式五:Kubernetes Helm Charts 部署 hertzbeat+collector+postgresql+tsdb 通过 Helm Chart 一次性将 HertzBeat 集群组件部署到 Kubernetes 集群中。 详细步骤参考 [Artifact Hub](https://artifacthub.io/packages/helm/hertzbeat/hertzbeat) **HAVE FUN** - -### 🐵 依赖服务部署(可选) - -> HertzBeat依赖于 **关系型数据库** H2(默认已内置无需安装) 或 [Mysql](mysql-change) 和 **时序性数据库** [TDengine2+](tdengine-init) 或 [IOTDB](iotdb-init) (可选) - -**注意⚠️ 若需要部署时序数据库,IotDB 和 TDengine 任选其一即可!** - -##### 安装Mysql(可选) - -1. docker安装Mysql - ` $ docker run -d --name mysql -p 3306:3306 -v /opt/data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=123456 mysql:5.7` - `-v /opt/data:/var/lib/mysql` - 为mysql数据目录本地持久化挂载,需将`/opt/data`替换为实际本地存在的目录 -2. 创建名称为hertzbeat的数据库 - `create database hertzbeat default charset utf8mb4 collate utf8mb4_general_ci;` -3. 在hertzbeat的配置文件`application.yml`配置Mysql数据库替换H2内置数据库连接参数 - -详细步骤参考 [使用Mysql替换内置H2数据库](mysql-change) - -##### 安装TDengine(可选) - -1. docker安装TDengine - `docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp --name tdengine tdengine/tdengine:3.0.4.0` -2. 创建名称为hertzbeat的数据库 -3. 在hertzbeat的配置文件`application.yml`配置tdengine连接 - -详细步骤参考 [使用时序数据库TDengine存储指标数据(可选)](tdengine-init) - -##### 安装IotDB(可选) - -1. Docker安装IoTDB - -```shell -$ docker run -d -p 6667:6667 -p 31999:31999 -p 8181:8181 \ - -v /opt/iotdb/data:/iotdb/data \ - --name iotdb \ - apache/iotdb:0.13.3-node -``` - -详细步骤参考 [使用时序数据库IoTDB存储指标数据(可选)](iotdb-init) diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/tdengine-init.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/tdengine-init.md index 73989a592f6..b64743d1f7b 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/tdengine-init.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/tdengine-init.md @@ -1,7 +1,7 @@ --- id: tdengine-init -title: 依赖时序数据库服务TDengine安装初始化 -sidebar_label: 使用TDengine存储指标数据(可选) +title: 依赖时序数据库服务TDengine安装初始化(可选) +sidebar_label: 指标数据存储TDengine --- Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库,任选其一安装初始化即可,也可不安装(注意⚠️但强烈建议生产环境配置) diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/victoria-metrics-init.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/victoria-metrics-init.md index 7668cefcaf3..abc8a1f94b2 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/victoria-metrics-init.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/victoria-metrics-init.md @@ -1,7 +1,7 @@ --- id: victoria-metrics-init title: 依赖时序数据库服务VictoriaMetrics安装初始化 -sidebar_label: 使用VictoriaMetrics存储指标数据(推荐) +sidebar_label: 指标数据存储VictoriaMetrics(推荐) --- Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库,任选其一安装初始化即可,也可不安装(注意⚠️但强烈建议生产环境配置) diff --git a/home/sidebars.json b/home/sidebars.json index f79a6d5c439..1bceafcf58d 100755 --- a/home/sidebars.json +++ b/home/sidebars.json @@ -19,10 +19,9 @@ "start/victoria-metrics-init", "start/iotdb-init", "start/tdengine-init", - "start/greptime-init", "start/influxdb-init", - "start/mysql-change", "start/postgresql-change", + "start/mysql-change", "start/custom-config", "start/ssl-cert-practice" ] diff --git a/script/docker-compose/README.md b/script/docker-compose/README.md index 2af823ea563..6f7fd427d33 100644 --- a/script/docker-compose/README.md +++ b/script/docker-compose/README.md @@ -1,6 +1,9 @@ ## Docker-Compose Deploy +Suggest the [HertzBeat + VictoriaMetrics + Postgresql Solution](hertzbeat-postgresql-victoria-metrics) for the best performance and stability. + +- Use Postgresql + VictoriaMetrics as Hertzbeat dependent storage -> [HertzBeat+PostgreSQL+VictoriaMetrics Solution](hertzbeat-postgresql-victoria-metrics) - Use Mysql + VictoriaMetrics as Hertzbeat dependent storage -> [HertzBeat+Mysql+VictoriaMetrics Solution](hertzbeat-mysql-victoria-metrics) - Use Mysql + IoTDB as Hertzbeat dependent storage -> [HertzBeat+Mysql+IoTDB Solution](hertzbeat-mysql-iotdb) - Use Mysql + Tdengine as Hertzbeat dependent storage -> [HertzBeat+Mysql+Tdengine Solution](hertzbeat-mysql-tdengine) -- Use Postgresql + IoTDB as Hertzbeat dependent storage -> [HertzBeat+PostgreSQL+IoTDB Solution](hertzbeat-postgresql-iotdb) + diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/README.md b/script/docker-compose/hertzbeat-mysql-iotdb/README.md index 9461296afd4..e96f7bda2a9 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/README.md +++ b/script/docker-compose/hertzbeat-mysql-iotdb/README.md @@ -17,8 +17,12 @@ 1. Download the hertzbeat-docker-compose installation deployment script file The script file is located in `script/docker-compose/hertzbeat-mysql-iotdb` link [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/ hertzbeat-mysql-iotdb) +2. Add MYSQL jdbc driver jar -2. Enter the deployment script docker-compose directory, execute + Download the MYSQL jdbc driver jar package, such as mysql-connector-java-8.0.26.jar. https://mvnrepository.com/artifact/com.mysql/mysql-connector-j/8.1.0 + Copy the jar package to the ext-lib directory. + +3. Enter the deployment script docker-compose directory, execute `docker compose up -d` diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/README_CN.md b/script/docker-compose/hertzbeat-mysql-iotdb/README_CN.md index 624c61866b5..498c92a1597 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/README_CN.md +++ b/script/docker-compose/hertzbeat-mysql-iotdb/README_CN.md @@ -17,10 +17,13 @@ ##### docker compose部署hertzbeat及其依赖服务 1. 下载hertzbeat-docker-compose安装部署脚本文件 - 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-mysql-iotdb` 链接 [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-iotdb) + 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-mysql-iotdb` 链接 [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-iotdb) +2. 添加 MYSQL jdbc 驱动 jar + 下载 MYSQL jdbc driver jar, 例如 mysql-connector-java-8.0.26.jar. https://mvnrepository.com/artifact/com.mysql/mysql-connector-j/8.1.0 + 将此 jar 包拷贝放入 ext-lib 目录下. -2. 进入部署脚本 docker-compose 目录, 执行 +3. 进入部署脚本 docker-compose 目录, 执行 `docker compose up -d` diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml index 66c9bb0d935..436f2d99bd7 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml @@ -48,6 +48,7 @@ management: enabled-by-default: on sureness: + container: jakarta_servlet auths: - digest - basic @@ -58,6 +59,7 @@ sureness: 8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5 dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp' + --- spring: config: @@ -72,9 +74,22 @@ spring: hikari: max-lifetime: 120000 jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql - hibernate: - ddl-auto: update + properties: + eclipselink: + logging: + level: SEVERE + + flyway: + enabled: true + clean-disabled: true + baseline-on-migrate: true + baseline-version: 1 + locations: + - classpath:db/migration/{vendor} + # Not Require, Please config if you need email notify # 非必填:不使用邮箱作为警告通知可以去掉spring.mail配置 mail: @@ -107,9 +122,6 @@ warehouse: rpc-port: 6667 username: root password: root - # org.apache.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 - # 如果你使用docker-compose-1.0.yaml, 不要忘记修i该version为V_1_0 - version: V_1_0 query-timeout-in-ms: -1 # 数据存储时间:默认'7776000000'(90天,单位为毫秒,-1代表永不过期) # data expire time, unit:ms, default '7776000000'(90 days, -1:never expire) @@ -129,13 +141,27 @@ common: queue: # memory or kafka type: memory - # properties when queue type is kafka - kafka: - servers: 127.0.0.1:9092 - metrics-data-topic: async-metrics-data - alerts-data-topic: async-alerts-data + +alerter: + # custom console url + console-url: https://console.tancloud.cn + # we work + we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key= + # ding ding talk + ding-talk-webhook-url: https://oapi.dingtalk.com/robot/send?access_token= + # fei shu fly book + fly-book-webhook-url: https://open.feishu.cn/open-apis/bot/v2/hook/ + # telegram + telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage + # discord + discord-webhook-url: https://discord.com/api/v9/channels/%s/messages + # server酱 + server-chan-webhook-url: https://sctapi.ftqq.com/%s.send + # gotify + gotify-webhook-url: http://127.0.0.1/message?token=%s scheduler: server: enabled: true port: 1158 + diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml index 32d14b498a9..aaa783b4367 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml @@ -78,6 +78,7 @@ services: volumes: - ./conf/application.yml:/opt/hertzbeat/config/application.yml - ./conf/sureness.yml:/opt/hertzbeat/config/sureness.yml + - ./ext-lib:/opt/hertzbeat/ext-lib ports: - "1157:1157" - "1158:1158" diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/ext-lib/.gitignore b/script/docker-compose/hertzbeat-mysql-iotdb/ext-lib/.gitignore new file mode 100644 index 00000000000..c087c266df0 --- /dev/null +++ b/script/docker-compose/hertzbeat-mysql-iotdb/ext-lib/.gitignore @@ -0,0 +1,2 @@ +!.gitignore +*.jar diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/ext-lib/README b/script/docker-compose/hertzbeat-mysql-iotdb/ext-lib/README new file mode 100644 index 00000000000..5898fde6b91 --- /dev/null +++ b/script/docker-compose/hertzbeat-mysql-iotdb/ext-lib/README @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Please move external libs to this folder like: + +ojdbc8-21.5.0.0.jar +orai18n-21.5.0.0.jar +mysql-connector-java-8.0.30.jar + diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/README.md b/script/docker-compose/hertzbeat-mysql-tdengine/README.md index dba1bce6f35..14b24c20fb8 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/README.md +++ b/script/docker-compose/hertzbeat-mysql-tdengine/README.md @@ -17,12 +17,16 @@ 1. Download the hertzbeat-docker-compose installation deployment script file The script file is located in `script/docker-compose/hertzbeat-mysql-tdengine` link [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-tdengine) +2. Add MYSQL jdbc driver jar -2. Enter the deployment script docker-compose directory, execute + Download the MYSQL jdbc driver jar package, such as mysql-connector-java-8.0.26.jar. https://mvnrepository.com/artifact/com.mysql/mysql-connector-j/8.1.0 + Copy the jar package to the ext-lib directory. + +3. Enter the deployment script docker-compose directory, execute `docker compose up -d` -3. Enter tdengine to create hertzbeat database +4. Enter tdengine to create hertzbeat database ```shell $ docker exec -it tdengine /bin/bash diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md b/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md index 7530617cca0..4fce7449449 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md +++ b/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md @@ -19,12 +19,15 @@ 1. 下载hertzbeat-docker-compose安装部署脚本文件 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-mysql-tdengine` 链接 [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-tdengine) +2. 添加 MYSQL jdbc 驱动 jar + 下载 MYSQL jdbc driver jar, 例如 mysql-connector-java-8.0.26.jar. https://mvnrepository.com/artifact/com.mysql/mysql-connector-j/8.1.0 + 将此 jar 包拷贝放入 ext-lib 目录下. -2. 进入部署脚本 docker-compose 目录, 执行 +3. 进入部署脚本 docker-compose 目录, 执行 `docker compose up -d` -3. 进入tdengine创建hertzbeat数据库 +4. 进入tdengine创建hertzbeat数据库 ```bash $ docker exec -it tdengine /bin/bash diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml b/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml index c5f4753f313..c3eaece6453 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml @@ -48,6 +48,7 @@ management: enabled-by-default: on sureness: + container: jakarta_servlet auths: - digest - basic @@ -58,6 +59,7 @@ sureness: 8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5 dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp' + --- spring: config: @@ -72,9 +74,22 @@ spring: hikari: max-lifetime: 120000 jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql - hibernate: - ddl-auto: update + properties: + eclipselink: + logging: + level: SEVERE + + flyway: + enabled: true + clean-disabled: true + baseline-on-migrate: true + baseline-version: 1 + locations: + - classpath:db/migration/{vendor} + # Not Require, Please config if you need email notify # 非必填:不使用邮箱作为警告通知可以去掉spring.mail配置 mail: @@ -96,8 +111,8 @@ spring: warehouse: store: -# store history metrics data, enable only one below -# 存储历史数据方式, 下方只能enabled启用一种方式 + # store history metrics data, enable only one below + # 存储历史数据方式, 下方只能enabled启用一种方式 jpa: enabled: false expire-time: 1h @@ -107,8 +122,6 @@ warehouse: url: jdbc:TAOS-RS://tdengine:6041/hertzbeat username: root password: taosdata -# store real-time metrics data, enable only one below -# 存储实时数据方式, 下方只能enabled启用一种方式 memory: enabled: true init-size: 16 @@ -122,13 +135,27 @@ common: queue: # memory or kafka type: memory - # properties when queue type is kafka - kafka: - servers: 127.0.0.1:9092 - metrics-data-topic: async-metrics-data - alerts-data-topic: async-alerts-data + +alerter: + # custom console url + console-url: https://console.tancloud.cn + # we work + we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key= + # ding ding talk + ding-talk-webhook-url: https://oapi.dingtalk.com/robot/send?access_token= + # fei shu fly book + fly-book-webhook-url: https://open.feishu.cn/open-apis/bot/v2/hook/ + # telegram + telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage + # discord + discord-webhook-url: https://discord.com/api/v9/channels/%s/messages + # server酱 + server-chan-webhook-url: https://sctapi.ftqq.com/%s.send + # gotify + gotify-webhook-url: http://127.0.0.1/message?token=%s scheduler: server: enabled: true port: 1158 + diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml index a632bfb0934..a5054f3856c 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml @@ -77,6 +77,7 @@ services: volumes: - ./conf/application.yml:/opt/hertzbeat/config/application.yml - ./conf/sureness.yml:/opt/hertzbeat/config/sureness.yml + - ./ext-lib:/opt/hertzbeat/ext-lib ports: - "1157:1157" - "1158:1158" diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/ext-lib/.gitignore b/script/docker-compose/hertzbeat-mysql-tdengine/ext-lib/.gitignore new file mode 100644 index 00000000000..c087c266df0 --- /dev/null +++ b/script/docker-compose/hertzbeat-mysql-tdengine/ext-lib/.gitignore @@ -0,0 +1,2 @@ +!.gitignore +*.jar diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/ext-lib/README b/script/docker-compose/hertzbeat-mysql-tdengine/ext-lib/README new file mode 100644 index 00000000000..5898fde6b91 --- /dev/null +++ b/script/docker-compose/hertzbeat-mysql-tdengine/ext-lib/README @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Please move external libs to this folder like: + +ojdbc8-21.5.0.0.jar +orai18n-21.5.0.0.jar +mysql-connector-java-8.0.30.jar + diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/README.md b/script/docker-compose/hertzbeat-mysql-victoria-metrics/README.md index 59ee57107b0..8c22307f333 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/README.md +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/README.md @@ -17,8 +17,12 @@ 1. Download the hertzbeat-docker-compose installation deployment script file The script file is located in `script/docker-compose/hertzbeat-mysql-victoria-metrics` link [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-victoria-metrics) +2. Add MYSQL jdbc driver jar -2. Enter the deployment script docker-compose directory, execute + Download the MYSQL jdbc driver jar package, such as mysql-connector-java-8.0.26.jar. https://mvnrepository.com/artifact/com.mysql/mysql-connector-j/8.1.0 + Copy the jar package to the ext-lib directory. + +3. Enter the deployment script docker-compose directory, execute `docker compose up -d` diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/README_CN.md b/script/docker-compose/hertzbeat-mysql-victoria-metrics/README_CN.md index 4c34978f414..2abef233d7f 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/README_CN.md +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/README_CN.md @@ -19,8 +19,11 @@ 1. 下载hertzbeat-docker-compose安装部署脚本文件 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-mysql-victoria-metrics` 链接 [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-mysql-victoria-metrics) +2. 添加 MYSQL jdbc 驱动 jar + 下载 MYSQL jdbc driver jar, 例如 mysql-connector-java-8.0.26.jar. https://mvnrepository.com/artifact/com.mysql/mysql-connector-j/8.1.0 + 将此 jar 包拷贝放入 ext-lib 目录下. -2. 进入部署脚本 docker-compose 目录, 执行 +3. 进入部署脚本 docker-compose 目录, 执行 `docker compose up -d` diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml index ea78aa63956..c48a28dae62 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml @@ -48,6 +48,7 @@ management: enabled-by-default: on sureness: + container: jakarta_servlet auths: - digest - basic @@ -58,6 +59,7 @@ sureness: 8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5 dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp' + --- spring: config: @@ -72,9 +74,22 @@ spring: hikari: max-lifetime: 120000 jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql - hibernate: - ddl-auto: update + properties: + eclipselink: + logging: + level: SEVERE + + flyway: + enabled: true + clean-disabled: true + baseline-on-migrate: true + baseline-version: 1 + locations: + - classpath:db/migration/{vendor} + # Not Require, Please config if you need email notify # 非必填:不使用邮箱作为警告通知可以去掉spring.mail配置 mail: @@ -96,18 +111,18 @@ spring: warehouse: store: -# store history metrics data, enable only one below -# 存储历史数据方式, 下方只能enabled启用一种方式 + # store history metrics data, enable only one below + # 存储历史数据方式, 下方只能enabled启用一种方式 jpa: enabled: false expire-time: 1h victoria-metrics: enabled: true - url: http://victoria-metrics:8428 + url: http://victoria-metrics:8428 username: root password: root -# store real-time metrics data, enable only one below -# 存储实时数据方式, 下方只能enabled启用一种方式 + # store real-time metrics data, enable only one below + # 存储实时数据方式, 下方只能enabled启用一种方式 memory: enabled: true init-size: 16 @@ -121,11 +136,24 @@ common: queue: # memory or kafka type: memory - # properties when queue type is kafka - kafka: - servers: 127.0.0.1:9092 - metrics-data-topic: async-metrics-data - alerts-data-topic: async-alerts-data + +alerter: + # custom console url + console-url: https://console.tancloud.cn + # we work + we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key= + # ding ding talk + ding-talk-webhook-url: https://oapi.dingtalk.com/robot/send?access_token= + # fei shu fly book + fly-book-webhook-url: https://open.feishu.cn/open-apis/bot/v2/hook/ + # telegram + telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage + # discord + discord-webhook-url: https://discord.com/api/v9/channels/%s/messages + # server酱 + server-chan-webhook-url: https://sctapi.ftqq.com/%s.send + # gotify + gotify-webhook-url: http://127.0.0.1/message?token=%s scheduler: server: diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/dbdata/mysqldata/.gitignore b/script/docker-compose/hertzbeat-mysql-victoria-metrics/dbdata/mysqldata/.gitignore new file mode 100644 index 00000000000..951452536a6 --- /dev/null +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/dbdata/mysqldata/.gitignore @@ -0,0 +1,3 @@ +!.gitignore +**.** +** diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/dbdata/tsdbdata/.gitignore b/script/docker-compose/hertzbeat-mysql-victoria-metrics/dbdata/tsdbdata/.gitignore new file mode 100644 index 00000000000..951452536a6 --- /dev/null +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/dbdata/tsdbdata/.gitignore @@ -0,0 +1,3 @@ +!.gitignore +**.** +** diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml index 1e2018b1a43..5a59d8c4390 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml @@ -77,6 +77,7 @@ services: volumes: - ./conf/application.yml:/opt/hertzbeat/config/application.yml - ./conf/sureness.yml:/opt/hertzbeat/config/sureness.yml + - ./ext-lib:/opt/hertzbeat/ext-lib ports: - "1157:1157" - "1158:1158" diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/ext-lib/.gitignore b/script/docker-compose/hertzbeat-mysql-victoria-metrics/ext-lib/.gitignore new file mode 100644 index 00000000000..c087c266df0 --- /dev/null +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/ext-lib/.gitignore @@ -0,0 +1,2 @@ +!.gitignore +*.jar diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/ext-lib/README b/script/docker-compose/hertzbeat-mysql-victoria-metrics/ext-lib/README new file mode 100644 index 00000000000..5898fde6b91 --- /dev/null +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/ext-lib/README @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Please move external libs to this folder like: + +ojdbc8-21.5.0.0.jar +orai18n-21.5.0.0.jar +mysql-connector-java-8.0.30.jar + diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/README.md b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/README.md similarity index 74% rename from script/docker-compose/hertzbeat-postgresql-iotdb/README.md rename to script/docker-compose/hertzbeat-postgresql-victoria-metrics/README.md index 7588870b46f..ff4edb7525e 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/README.md +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/README.md @@ -1,7 +1,7 @@ ## docker-compose deployment HertzBeat+PostgreSQL+IoTDB solution -> The docker-compose deployment scheme uses PostgreSQL + IoTDB as the dependent storage service of Hertzbeat. -> This solution will start three container services PostgreSQL, IoTDB, HertzBeat +> The docker-compose deployment scheme uses PostgreSQL + VictoriaMetrics as the dependent storage service of Hertzbeat. +> This solution will start three container services PostgreSQL, VictoriaMetrics, HertzBeat ##### Install Docker & Docker-compose @@ -15,7 +15,7 @@ ##### docker compose deploys hertzbeat and its dependent services 1. Download the hertzbeat-docker-compose installation deployment script file - The script file is located in `script/docker-compose/hertzbeat-postgresql-iotdb` link [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-postgresql-iotdb) + The script file is located in `script/docker-compose/hertzbeat-postgresql-victoria-metrics` link [script/docker-compose](https://github.com/apache/hertzbeat/tree/master/script/docker-compose/hertzbeat-postgresql-victoria-metrics) 2. Enter the deployment script docker-compose directory, execute diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/README_CN.md b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/README_CN.md similarity index 71% rename from script/docker-compose/hertzbeat-postgresql-iotdb/README_CN.md rename to script/docker-compose/hertzbeat-postgresql-victoria-metrics/README_CN.md index 653aa4cf10c..88d6ae2f6f6 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/README_CN.md +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/README_CN.md @@ -2,8 +2,8 @@ - 如果想自己本地快速部署的话,可以参考下面进行操作。 -> docker-compose 部署方案使用了 PostgreSQL + IoTDB 作为 Hertzbeat 依赖存储服务。 -> 此方案会启动三个容器服务 PostgreSQL, IoTDB, HertzBeat +> docker-compose 部署方案使用了 PostgreSQL + victoria-metrics 作为 Hertzbeat 依赖存储服务。 +> 此方案会启动三个容器服务 PostgreSQL, victoria-metrics, HertzBeat ##### 安装Docker & Docker-compose @@ -17,7 +17,7 @@ ##### docker compose部署hertzbeat及其依赖服务 1. 下载hertzbeat-docker-compose安装部署脚本文件 - 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-postgre-iotdb` 链接 [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-postgre-iotdb) + 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-postgre-victoria-metrics` 链接 [script/docker-compose](https://github.com/apache/hertzbeat/tree/master/script/docker-compose/hertzbeat-postgre-victoria-metrics) 2. 进入部署脚本 docker-compose 目录, 执行 diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml similarity index 70% rename from script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml rename to script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml index 34dccf3538f..4a084aa5c46 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml @@ -48,6 +48,7 @@ management: enabled-by-default: on sureness: + container: jakarta_servlet auths: - digest - basic @@ -58,6 +59,7 @@ sureness: 8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5 dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp' + --- spring: config: @@ -70,15 +72,23 @@ spring: url: jdbc:postgresql://postgresql:5432/hertzbeat hikari: max-lifetime: 120000 - jpa: + show-sql: false + database-platform: org.eclipse.persistence.platform.database.PostgreSQLPlatform database: postgresql - hibernate: - ddl-auto: update properties: - hibernate: - dialect: org.hibernate.dialect.PostgreSQLDialect - + eclipselink: + logging: + level: SEVERE + + flyway: + enabled: true + clean-disabled: true + baseline-on-migrate: true + baseline-version: 1 + locations: + - classpath:db/migration/{vendor} + # Not Require, Please config if you need email notify # 非必填:不使用邮箱作为警告通知可以去掉spring.mail配置 mail: @@ -100,26 +110,18 @@ spring: warehouse: store: -# store history metrics data, enable only one below -# 存储历史数据方式, 下方只能enabled启用一种方式 + # store history metrics data, enable only one below + # 存储历史数据方式, 下方只能enabled启用一种方式 jpa: enabled: false expire-time: 1h - iot-db: + victoria-metrics: enabled: true - host: iotdb - rpc-port: 6667 + url: http://victoria-metrics:8428 username: root password: root - # org.apache.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 - # 如果你使用docker-compose-1.0.yaml, 不要忘记修i该version为V_1_0 - version: V_1_0 - query-timeout-in-ms: -1 - # 数据存储时间:默认'7776000000'(90天,单位为毫秒,-1代表永不过期) - # data expire time, unit:ms, default '7776000000'(90 days, -1:never expire) - expire-time: '7776000000' -# store real-time metrics data, enable only one below -# 存储实时数据方式, 下方只能enabled启用一种方式 + # store real-time metrics data, enable only one below + # 存储实时数据方式, 下方只能enabled启用一种方式 memory: enabled: true init-size: 16 @@ -133,11 +135,24 @@ common: queue: # memory or kafka type: memory - # properties when queue type is kafka - kafka: - servers: 127.0.0.1:9092 - metrics-data-topic: async-metrics-data - alerts-data-topic: async-alerts-data + +alerter: + # custom console url + console-url: https://console.tancloud.cn + # we work + we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key= + # ding ding talk + ding-talk-webhook-url: https://oapi.dingtalk.com/robot/send?access_token= + # fei shu fly book + fly-book-webhook-url: https://open.feishu.cn/open-apis/bot/v2/hook/ + # telegram + telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage + # discord + discord-webhook-url: https://discord.com/api/v9/channels/%s/messages + # server酱 + server-chan-webhook-url: https://sctapi.ftqq.com/%s.send + # gotify + gotify-webhook-url: http://127.0.0.1/message?token=%s scheduler: server: diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sql/schema.sql b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/sql/schema.sql similarity index 100% rename from script/docker-compose/hertzbeat-postgresql-iotdb/conf/sql/schema.sql rename to script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/sql/schema.sql diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/sureness.yml similarity index 100% rename from script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml rename to script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/sureness.yml diff --git a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/dbdata/pgdata/.gitignore b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/dbdata/pgdata/.gitignore new file mode 100644 index 00000000000..951452536a6 --- /dev/null +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/dbdata/pgdata/.gitignore @@ -0,0 +1,3 @@ +!.gitignore +**.** +** diff --git a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/dbdata/tsdbdata/.gitignore b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/dbdata/tsdbdata/.gitignore new file mode 100644 index 00000000000..951452536a6 --- /dev/null +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/dbdata/tsdbdata/.gitignore @@ -0,0 +1,3 @@ +!.gitignore +**.** +** diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/docker-compose.yaml similarity index 84% rename from script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml rename to script/docker-compose/hertzbeat-postgresql-victoria-metrics/docker-compose.yaml index 9910f34eaeb..18438a51bcc 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/docker-compose.yaml @@ -38,28 +38,28 @@ services: - POSTGRES_PASSWORD=123456 - TZ=Asia/Shanghai volumes: + - ./dbdata/pgdata/data:/var/lib/postgresql/data - ./conf/sql:/docker-entrypoint-initdb.d/ networks: - hertzbeat - iotdb: - image: apache/iotdb:1.2.2-standalone - container_name: compose-iotdb - hostname: iotdb + victoria-metrics: + image: victoriametrics/victoria-metrics:v1.95.1 + container_name: compose-victoria-metrics + hostname: victoria-metrics restart: always healthcheck: - test: ["CMD", "ls", "/iotdb/data"] + test: ["CMD", "wget", "-q", "-O", "-", "http://victoria-metrics:8428/-/healthy"] interval: 10s - timeout: 5s retries: 5 + timeout: 5s start_period: 30s environment: TZ: Asia/Shanghai ports: - - "8181" - - "6667" + - "8428" volumes: - - ./dbdata/iotdbdata:/iotdb/data + - ./dbdata/tsdbdata:/victoria-metrics-data networks: - hertzbeat @@ -74,7 +74,7 @@ services: depends_on: postgres: condition: service_healthy - iotdb: + victoria-metrics: condition: service_healthy volumes: - ./conf/application.yml:/opt/hertzbeat/config/application.yml diff --git a/script/helm/hertzbeat/Chart.yaml b/script/helm/hertzbeat/Chart.yaml index 00978ec25d4..224c75a5570 100644 --- a/script/helm/hertzbeat/Chart.yaml +++ b/script/helm/hertzbeat/Chart.yaml @@ -16,7 +16,7 @@ # under the License. apiVersion: v2 -name: HertzBeat +name: hertzbeat description: An open-source, real-time monitoring system with custom monitoring, high performance cluster and agentless capabilities. type: application home: https://hertzbeat.apache.org/ @@ -24,8 +24,8 @@ sources: - https://github.com/apache/hertzbeat - https://charts.hertzbeat.com maintainers: - - name: tom - email: tomsun28@outlook.com + - name: hertzbeat-dev + email: dev@hertzbeat.apache.org icon: https://raw.githubusercontent.com/apache/hertzbeat/master/home/static/img/hertzbeat-logo.png # 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. diff --git a/script/helm/hertzbeat/templates/database/configmap.yaml b/script/helm/hertzbeat/templates/database/configmap.yaml index 2f80a8915de..4c9c3e91c43 100644 --- a/script/helm/hertzbeat/templates/database/configmap.yaml +++ b/script/helm/hertzbeat/templates/database/configmap.yaml @@ -23,8 +23,14 @@ metadata: {{- include "hertzbeat.labels" . | nindent 4 }} data: TZ: "{{ .Values.database.timezone }}" - MYSQL_ROOT_PASSWORD: "{{ .Values.database.rootPassword }}" + POSTGRES_PASSWORD: "{{ .Values.database.rootPassword }}" + POSTGRES_USER: "root" schema.sql: |+ - set names utf8mb4; - create database if not exists hertzbeat default charset utf8mb4 collate utf8mb4_general_ci; - commit; + CREATE EXTENSION IF NOT EXISTS dblink; + + DO $$ + BEGIN + PERFORM dblink_exec('', 'CREATE DATABASE hertzbeat'); + EXCEPTION WHEN duplicate_database THEN RAISE NOTICE '%, skipping', SQLERRM USING ERRCODE = SQLSTATE; + END + $$; diff --git a/script/helm/hertzbeat/templates/database/service.yaml b/script/helm/hertzbeat/templates/database/service.yaml index 589fd218afa..e95d860d24d 100644 --- a/script/helm/hertzbeat/templates/database/service.yaml +++ b/script/helm/hertzbeat/templates/database/service.yaml @@ -24,8 +24,8 @@ metadata: spec: type: ClusterIP ports: - - port: 3306 - targetPort: 3306 + - port: 5432 + targetPort: 5432 protocol: TCP selector: {{- include "hertzbeat.selectorLabels" . | nindent 4 }} diff --git a/script/helm/hertzbeat/templates/database/statefulset.yaml b/script/helm/hertzbeat/templates/database/statefulset.yaml index 181af838ebe..85d4e9f608c 100644 --- a/script/helm/hertzbeat/templates/database/statefulset.yaml +++ b/script/helm/hertzbeat/templates/database/statefulset.yaml @@ -47,12 +47,12 @@ spec: imagePullPolicy: {{ .Values.database.image.pullPolicy }} livenessProbe: tcpSocket: - port: 3306 + port: 5432 initialDelaySeconds: 300 periodSeconds: 10 readinessProbe: tcpSocket: - port: 3306 + port: 5432 initialDelaySeconds: 1 periodSeconds: 10 resources: @@ -62,7 +62,7 @@ spec: name: "{{ include "hertzbeat.database" . }}" volumeMounts: - name: data - mountPath: /var/lib/mysql + mountPath: /var/lib/postgresql/data subPath: "" - mountPath: /docker-entrypoint-initdb.d/schema.sql subPath: schema.sql diff --git a/script/helm/hertzbeat/templates/manager/configmap.yaml b/script/helm/hertzbeat/templates/manager/configmap.yaml index 3efb85f671f..b7f1fa7be67 100644 --- a/script/helm/hertzbeat/templates/manager/configmap.yaml +++ b/script/helm/hertzbeat/templates/manager/configmap.yaml @@ -58,6 +58,7 @@ data: enabled-by-default: on sureness: + container: jakarta_servlet auths: - digest - basic @@ -72,17 +73,27 @@ data: on-profile: prod datasource: - driver-class-name: com.mysql.cj.jdbc.Driver + driver-class-name: org.postgresql.Driver username: root password: {{ .Values.database.rootPassword }} - url: jdbc:mysql://{{ include "hertzbeat.database" . }}:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:postgresql://{{ include "hertzbeat.database" . }}:5432/hertzbeat hikari: max-lifetime: 120000 - jpa: - hibernate: - ddl-auto: update - + show-sql: false + database-platform: org.eclipse.persistence.platform.database.PostgreSQLPlatform + database: postgresql + properties: + eclipselink: + logging: + level: SEVERE + flyway: + enabled: true + clean-disabled: true + baseline-on-migrate: true + baseline-version: 1 + locations: + - classpath:db/migration/{vendor} mail: # Attention: this is mail server address. # 请注意此为邮件服务器地址:qq邮箱为 smtp.qq.com qq 企业邮箱为 smtp.exmail.qq.com @@ -166,13 +177,27 @@ data: alerter: # custom console url console-url: https://console.tancloud.cn + # we work + we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key= + # ding ding talk + ding-talk-webhook-url: https://oapi.dingtalk.com/robot/send?access_token= + # fei shu fly book + fly-book-webhook-url: https://open.feishu.cn/open-apis/bot/v2/hook/ + # telegram + telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage + # discord + discord-webhook-url: https://discord.com/api/v9/channels/%s/messages + # server酱 + server-chan-webhook-url: https://sctapi.ftqq.com/%s.send + # gotify + gotify-webhook-url: http://127.0.0.1/message?token=%s scheduler: server: enabled: true port: 1158 - + sureness.yml: |+ resourceRole: - /api/account/auth/refresh===post===[admin,user,guest] @@ -213,7 +238,10 @@ data: - /api/status/page/**===post===[admin,user] - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] - + + # config the resource restful api that need bypass auth protection + # rule: api===method + # eg: /api/v1/source3===get means /api/v1/source3===get can be access by anyone, no need auth. excludedResource: - /api/alerts/report/**===* - /api/account/auth/**===* @@ -221,6 +249,7 @@ data: - /api/apps/hierarchy===get - /api/push/**===* - /api/status/page/public/**===* + # web ui resource - /===get - /dashboard/**===get - /monitors/**===get @@ -241,9 +270,11 @@ data: - /**/*.json===get - /**/*.woff===get - /**/*.eot===get + # swagger ui resource - /swagger-resources/**===get - /v2/api-docs===get - /v3/api-docs===get + # h2 database - /h2-console/**===* # account info config diff --git a/script/helm/hertzbeat/values.yaml b/script/helm/hertzbeat/values.yaml index 844b4da98d2..49ff4443988 100644 --- a/script/helm/hertzbeat/values.yaml +++ b/script/helm/hertzbeat/values.yaml @@ -26,7 +26,7 @@ manager: account: username: "admin" password: "hertzbeat" - jwtSecretKey: "CyaFv0bwq2Eik0jdrKUtsA6bx3sDJeFV143R + jwtSecretKey: "CyaFv0bwq2Eik0jdrKUtsA6dx3sDJeFV143R LnfKefTjsIfJLBa2YkhEqEGtcHDTNe4CU6+9 8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5 dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp" @@ -62,10 +62,10 @@ collector: database: image: - repository: mysql + repository: postgres pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "8" + tag: "15" timezone: "Asia/Shanghai" rootPassword: "123456" persistence: