This is an automated email from the ASF dual-hosted git repository. gongchao pushed a commit to branch update-doc-docker in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit e6cad71abec98f401062de1a2f0637244d61c6ea Author: tomsun28 <[email protected]> AuthorDate: Thu May 2 12:38:40 2024 +0800 update doc Signed-off-by: tomsun28 <[email protected]> --- README.md | 4 ---- README_CN.md | 4 ---- home/docs/advanced/extend-http-example-hertzbeat.md | 2 -- home/docs/advanced/extend-http-example-token.md | 2 -- home/docs/advanced/extend-tutorial.md | 2 -- home/docs/introduce.md | 3 +-- home/docs/start/account-modify.md | 2 +- home/docs/start/docker-deploy.md | 4 ++-- home/docs/start/package-deploy.md | 5 ++--- home/docs/start/quickstart.md | 4 ++-- home/docs/start/sslcert-practice.md | 2 -- home/docs/start/upgrade.md | 1 - .../current/advanced/extend-http-example-hertzbeat.md | 2 -- .../current/advanced/extend-http-example-token.md | 2 -- .../docusaurus-plugin-content-docs/current/introduce.md | 3 +-- .../current/start/docker-deploy.md | 4 ++-- .../current/start/mysql-change.md | 2 +- .../current/start/package-deploy.md | 3 +-- .../current/start/postgresql-change.md | 2 +- .../current/start/quickstart.md | 4 ++-- .../current/start/sslcert-practice.md | 5 +---- .../current/start/upgrade.md | 1 - script/docker/collector/README.md | 13 +++++-------- script/docker/collector/build.sh | 12 ++++++------ script/docker/server/README.md | 15 ++++++--------- script/docker/server/build.sh | 12 ++++++------ .../app/routes/setting/collector/collector.component.html | 3 --- 27 files changed, 40 insertions(+), 78 deletions(-) diff --git a/README.md b/README.md index 4594929f8..cdc2beed8 100644 --- a/README.md +++ b/README.md @@ -113,10 +113,6 @@ ```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` -```or use quay.io (if dockerhub network connect timeout)``` - -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat quay.io/tancloud/hertzbeat``` - 2. Access `http://localhost:1157` to start, default account: `admin/hertzbeat` 3. Deploy collector clusters (Optional) diff --git a/README_CN.md b/README_CN.md index 98d3f76fd..4335a9e1a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -112,10 +112,6 @@ ```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` -```或者使用 quay.io (若 dockerhub 网络链接超时)``` - -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat quay.io/tancloud/hertzbeat``` - 2. 浏览器访问 `http://localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` 3. 部署采集器集群(可选) diff --git a/home/docs/advanced/extend-http-example-hertzbeat.md b/home/docs/advanced/extend-http-example-hertzbeat.md index d2107ffba..5ca5f633e 100644 --- a/home/docs/advanced/extend-http-example-hertzbeat.md +++ b/home/docs/advanced/extend-http-example-hertzbeat.md @@ -235,5 +235,3 @@ This is the end of the practice of custom monitoring of the HTTP protocol. The H If you think hertzbeat is a good open source project, please star us on GitHub Gitee, thank you very much. **github: https://github.com/apache/hertzbeat** - -**gitee: https://gitee.com/hertzbeat/hertzbeat** diff --git a/home/docs/advanced/extend-http-example-token.md b/home/docs/advanced/extend-http-example-token.md index 37d3386f3..b9bbb61e7 100644 --- a/home/docs/advanced/extend-http-example-token.md +++ b/home/docs/advanced/extend-http-example-token.md @@ -394,5 +394,3 @@ This is the end of the practice of custom monitoring of the HTTP protocol. The H If you think hertzbeat is a good open source project, please star us on GitHub Gitee, thank you very much. **github: https://github.com/apache/hertzbeat** - -**gitee: https://gitee.com/hertzbeat/hertzbeat** diff --git a/home/docs/advanced/extend-tutorial.md b/home/docs/advanced/extend-tutorial.md index 629eb9212..43d048ea1 100644 --- a/home/docs/advanced/extend-tutorial.md +++ b/home/docs/advanced/extend-tutorial.md @@ -234,5 +234,3 @@ This is the end of the practice of custom monitoring of the HTTP protocol. The H If you think hertzbeat is a good open source project, please star us on GitHub Gitee, thank you very much. Thanks for the old iron support. Refill! **github: https://github.com/apache/hertzbeat** - -**gitee: https://gitee.com/hertzbeat/hertzbeat** diff --git a/home/docs/introduce.md b/home/docs/introduce.md index ba1e9c7d5..537046697 100644 --- a/home/docs/introduce.md +++ b/home/docs/introduce.md @@ -310,5 +310,4 @@ Built-in support for monitoring types include: ----- -**Github: https://github.com/apache/hertzbeat** -**Gitee: https://gitee.com/hertzbeat/hertzbeat** +**Github: https://github.com/apache/hertzbeat** diff --git a/home/docs/start/account-modify.md b/home/docs/start/account-modify.md index 261016df6..0bdf8d17b 100644 --- a/home/docs/start/account-modify.md +++ b/home/docs/start/account-modify.md @@ -8,7 +8,7 @@ sidebar_label: Update Account Secret Apache HertzBeat(Incubating) default built-in three user accounts, respectively admin/hertzbeat tom/hertzbeat guest/hertzbeat If you need add, delete or modify account or password, configure `sureness.yml`. Ignore this step without this demand. -The configuration file content refer to project repository[/script/sureness.yml](https://gitee.com/hertzbeat/hertzbeat/blob/master/script/sureness.yml) +The configuration file content refer to project repository[/script/sureness.yml](https://github.com/hertzbeat/hertzbeat/blob/master/script/sureness.yml) Modify the following **part parameters** in sureness.yml：**[Note⚠️Other default sureness configuration parameters should be retained]** ```yaml diff --git a/home/docs/start/docker-deploy.md b/home/docs/start/docker-deploy.md index 8c189322d..ca0bcfcd7 100644 --- a/home/docs/start/docker-deploy.md +++ b/home/docs/start/docker-deploy.md @@ -30,7 +30,7 @@ sidebar_label: Install via Docker 3. Mounted HertzBeat configuration file (optional) Download and config `application.yml` in the host directory, eg:`$(pwd)/application.yml` - Download from [github/script/application.yml](https://github.com/apache/hertzbeat/raw/master/script/application.yml) or [gitee/script/application.yml](https://gitee.com/hertzbeat/hertzbeat/raw/master/script/application.yml). + Download from [github/script/application.yml](https://github.com/apache/hertzbeat/raw/master/script/application.yml) You can modify the configuration yml file according to your needs. - If you need to use email to send alarms, you need to replace the email server parameters `spring.mail` in `application.yml` - **Recommended** If you need to use an external Mysql database to replace the built-in H2 database, you need to replace the `spring.datasource` parameter in `application.yml` For specific steps, see [Using Mysql to replace H2 database](mysql-change) @@ -41,7 +41,7 @@ sidebar_label: Install via Docker HertzBeat default built-in three user accounts, respectively `admin/hertzbeat tom/hertzbeat guest/hertzbeat` If you need update account or password, configure `sureness.yml`. Ignore this step without this demand. Download and config `sureness.yml` in the host directory，eg:`$(pwd)/sureness.yml` - Download from [github/script/sureness.yml](https://github.com/apache/hertzbeat/raw/master/script/sureness.yml) or [gitee/script/sureness.yml](https://gitee.com/hertzbeat/hertzbeat/raw/master/script/sureness.yml) + Download from [github/script/sureness.yml](https://github.com/apache/hertzbeat/raw/master/script/sureness.yml) For detail steps, please refer to [Configure Account Password](account-modify) 5. Start the HertzBeat Docker container diff --git a/home/docs/start/package-deploy.md b/home/docs/start/package-deploy.md index f05c42d51..978b4b28d 100644 --- a/home/docs/start/package-deploy.md +++ b/home/docs/start/package-deploy.md @@ -7,8 +7,7 @@ sidebar_label: Install via Package > You can install and run Apache HertzBeat(Incubating) on Linux Windows Mac > system, and CPU supports X86/ARM64. 1. Download HertzBeat installation package - Download installation package `hertzbeat-xx.tar.gz` `hertzbeat-collector-xx.tar.gz` corresponding to your system environment - - download from [GITEE Release](https://gitee.com/hertzbeat/hertzbeat/releases) repository + Download installation package `hertzbeat-xx.tar.gz` `hertzbeat-collector-xx.tar.gz` corresponding to your system environment - download from [GITHUB Release](https://github.com/apache/hertzbeat/releases) repository 2. Configure HertzBeat's configuration file(optional) @@ -42,7 +41,7 @@ sidebar_label: Install via Package 6. Deploy collector clusters (Optional) - - Download and unzip the collector release package `hertzbeat-collector-xx.tar.gz` to new machine [GITEE Release](https://gitee.com/hertzbeat/hertzbeat/releases) [GITHUB Release](https://github.com/apache/hertzbeat/releases) + - Download and unzip the collector release package `hertzbeat-collector-xx.tar.gz` to new machine [GITHUB Release](https://github.com/apache/hertzbeat/releases) - Configure the collector configuration yml file `hertzbeat-collector/config/application.yml`: unique `identity` name, running `mode` (public or private), hertzbeat `manager-host`, hertzbeat `manager-port` ```yaml collector: diff --git a/home/docs/start/quickstart.md b/home/docs/start/quickstart.md index 0b8cdab0c..01cb5b807 100644 --- a/home/docs/start/quickstart.md +++ b/home/docs/start/quickstart.md @@ -38,12 +38,12 @@ Detailed config refer to [Install HertzBeat via Docker](https://hertzbeat.apache ##### 2：Install via package -1. Download the release package `hertzbeat-xx.tar.gz` [GITEE Release](https://gitee.com/hertzbeat/hertzbeat/releases) [GITHUB Release](https://github.com/apache/hertzbeat/releases) +1. Download the release package `hertzbeat-xx.tar.gz` [GITHUB Release](https://github.com/apache/hertzbeat/releases) 2. Configure the HertzBeat configuration yml file `hertzbeat/config/application.yml` (optional) 3. Run command `$ ./bin/startup.sh ` or `bin/startup.bat` 4. Access `http://localhost:1157` to start, default account: `admin/hertzbeat` 5. Deploy collector clusters(Optional) - - Download the release package `hertzbeat-collector-xx.tar.gz` to new machine [GITEE Release](https://gitee.com/hertzbeat/hertzbeat/releases) [GITHUB Release](https://github.com/apache/hertzbeat/releases) + - Download the release package `hertzbeat-collector-xx.tar.gz` to new machine [GITHUB Release](https://github.com/apache/hertzbeat/releases) - Configure the collector configuration yml file `hertzbeat-collector/config/application.yml`: unique `identity` name, running `mode` (public or private), hertzbeat `manager-host`, hertzbeat `manager-port` ```yaml collector: diff --git a/home/docs/start/sslcert-practice.md b/home/docs/start/sslcert-practice.md index 6fd0bbdbf..d018ba51f 100644 --- a/home/docs/start/sslcert-practice.md +++ b/home/docs/start/sslcert-practice.md @@ -105,5 +105,3 @@ https://hertzbeat.apache.org/docs/help/alert_dingtalk The practice of monitoring SSL certificates is here. Of course, for hertzbeat, this function is just the tip of the iceberg. If you think hertzbeat is a good open source project, please give us a Gitee star on GitHub, thank you very much. Thank you for your support. Refill! **github: https://github.com/apache/hertzbeat** - -**gitee: https://gitee.com/hertzbeat/hertzbeat** diff --git a/home/docs/start/upgrade.md b/home/docs/start/upgrade.md index 427f7b38a..7ca0c79a8 100644 --- a/home/docs/start/upgrade.md +++ b/home/docs/start/upgrade.md @@ -7,7 +7,6 @@ sidebar_label: Version Upgrade Guide **HertzBeat Release Version List** - [Github Release](https://github.com/apache/hertzbeat/releases) -- [Gitee Release](https://gitee.com/hertzbeat/hertzbeat/releases) - [DockerHub Release](https://hub.docker.com/r/apache/hertzbeat/tags) - [Docker quay.io Release](https://quay.io/repository/apache/hertzbeat?tab=tags) diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-example-hertzbeat.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-example-hertzbeat.md index 1daf7a6db..7a891e34c 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-example-hertzbeat.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-example-hertzbeat.md @@ -223,5 +223,3 @@ HTTP协议的自定义监控的实践就到这里，HTTP协议还带其他参数 如果您觉得hertzbeat这个开源项目不错的话欢迎给我们在GitHub Gitee star哦，灰常感谢。感谢老铁们的支持。笔芯！ **github: https://github.com/apache/hertzbeat** - -**gitee: https://gitee.com/hertzbeat/hertzbeat** diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-example-token.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-example-token.md index 5bbfe58cf..94f49c01f 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-example-token.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-example-token.md @@ -387,5 +387,3 @@ HTTP协议的自定义监控的实践就到这里，HTTP协议还带其他参数 如果您觉得hertzbeat这个开源项目不错的话欢迎给我们在GitHub Gitee star哦，灰常感谢。感谢老铁们的支持。笔芯！ **github: https://github.com/apache/hertzbeat** - -**gitee: https://gitee.com/hertzbeat/hertzbeat** diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/introduce.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/introduce.md index 4bd756713..4faa43123 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/introduce.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/introduce.md @@ -308,5 +308,4 @@ Docker 环境下运行一条命令即可：`docker run -d -p 1157:1157 -p 1158:1 ----- -**Github: https://github.com/apache/hertzbeat** -**Gitee: https://gitee.com/hertzbeat/hertzbeat** +**Github: https://github.com/apache/hertzbeat** diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/docker-deploy.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/docker-deploy.md index ee3411c49..73a41432a 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/docker-deploy.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/docker-deploy.md @@ -49,7 +49,7 @@ sidebar_label: Docker方式部署 4. 挂载并配置HertzBeat的配置文件(可选) 下载 `application.yml` 文件到主机目录下，例如: $(pwd)/application.yml - 下载源 [github/script/application.yml](https://github.com/apache/hertzbeat/raw/master/script/application.yml) 或 [gitee/script/application.yml](https://gitee.com/hertzbeat/hertzbeat/raw/master/script/application.yml) + 下载源 [github/script/application.yml](https://github.com/apache/hertzbeat/raw/master/script/application.yml) - 若需使用邮件发送告警，需替换 `application.yml` 里面的邮件服务器参数 - **推荐**若需使用外置Mysql数据库替换内置H2数据库，需替换`application.yml`里面的`spring.datasource`参数 具体步骤参见 [H2数据库切换为MYSQL](mysql-change)） - **推荐**若需使用时序数据库TDengine来存储指标数据，需替换`application.yml`里面的`warehouse.store.td-engine`参数 具体步骤参见 [使用TDengine存储指标数据](tdengine-init) @@ -59,7 +59,7 @@ sidebar_label: Docker方式部署 HertzBeat默认内置三个用户账户,分别为 admin/hertzbeat tom/hertzbeat guest/hertzbeat 若需要新增删除修改账户或密码，可以通过配置 `sureness.yml` 实现，若无此需求可忽略此步骤 下载 `sureness.yml` 文件到主机目录下，例如: $(pwd)/sureness.yml - 下载源 [github/script/sureness.yml](https://github.com/apache/hertzbeat/raw/master/script/sureness.yml) 或 [gitee/script/sureness.yml](https://gitee.com/hertzbeat/hertzbeat/raw/master/script/sureness.yml) + 下载源 [github/script/sureness.yml](https://github.com/apache/hertzbeat/raw/master/script/sureness.yml) 具体修改步骤参考 [配置修改账户密码](account-modify) 6. 启动HertzBeat Docker容器 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 e007677c9..7fcbc2b07 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 @@ -43,7 +43,7 @@ MYSQL是一款值得信赖的关系型数据库，Apache HertzBeat(Incubating) 修改位于 `hertzbeat/config/application.yml` 的配置文件 注意⚠️docker容器方式需要将application.yml文件挂载到主机本地,安装包方式解压修改位于 `hertzbeat/config/application.yml` 即可 替换里面的`spring.database`数据源参数，IP端口账户密码驱动 - ⚠️注意`application.yml`文件内容需完整，除下方修改内容外其他参数需保留，完整内容见[/script/application.yml](https://gitee.com/hertzbeat/hertzbeat/raw/master/script/application.yml) + ⚠️注意`application.yml`文件内容需完整，除下方修改内容外其他参数需保留，完整内容见[/script/application.yml](https://github.com/hertzbeat/hertzbeat/raw/master/script/application.yml) 需修改部分原参数: ```yaml diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md index a0f66a9ca..f3e6b6614 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md @@ -7,7 +7,6 @@ sidebar_label: 安装包方式部署 1. 下载HertzBeat安装包 下载您系统环境对应的安装包 `hertzbeat-xx.tar.gz` `hertzbeat-collector-xx.tar.gz` - - 从[GITEE Release](https://gitee.com/hertzbeat/hertzbeat/releases) 仓库下载 - 从[GITHUB Release](https://github.com/apache/hertzbeat/releases) 仓库下载 2. 配置HertzBeat的配置文件(可选) @@ -39,7 +38,7 @@ sidebar_label: 安装包方式部署 浏览器访问 http://ip:1157/ 即刻开始探索使用HertzBeat，默认账户密码 admin/hertzbeat。 6. 部署采集器集群(可选) - - 下载解压您系统环境对应采集器安装包`hertzbeat-collector-xx.tar.gz`到规划的另一台部署主机上 [GITEE Release](https://gitee.com/hertzbeat/hertzbeat/releases) [GITHUB Release](https://github.com/apache/hertzbeat/releases) + - 下载解压您系统环境对应采集器安装包`hertzbeat-collector-xx.tar.gz`到规划的另一台部署主机上 [GITHUB Release](https://github.com/apache/hertzbeat/releases) - 配置采集器的配置文件 `hertzbeat-collector/config/application.yml` 里面的连接主HertzBeat服务的对外IP，端口，当前采集器名称(需保证唯一性)等参数 `identity` `mode` (public or private) `manager-host` `manager-port` ```yaml collector: 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 10b497266..163978f98 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 @@ -48,7 +48,7 @@ PostgreSQL是一个功能强大，开源的关系型数据库管理系统（RDBM 修改位于 `hertzbeat/config/application.yml` 的配置文件 注意⚠️docker容器方式需要将application.yml文件挂载到主机本地,安装包方式解压修改位于 `hertzbeat/config/application.yml` 即可 替换里面的`spring.database`数据源参数，IP端口账户密码驱动 - ⚠️注意`application.yml`文件内容需完整，除下方修改内容外其他参数需保留，完整内容见[/script/application.yml](https://gitee.com/hertzbeat/hertzbeat/raw/master/script/application.yml) + ⚠️注意`application.yml`文件内容需完整，除下方修改内容外其他参数需保留，完整内容见[/script/application.yml](https://github.com/hertzbeat/hertzbeat/raw/master/script/application.yml) ```yaml spring: 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 7ea697990..21fa515b4 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 @@ -38,12 +38,12 @@ docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MAN #### 方式二：通过安装包安装 -1. 下载您系统环境对应的安装包`hertzbeat-xx.tar.gz` [GITEE Release](https://gitee.com/hertzbeat/hertzbeat/releases) [GITHUB Release](https://github.com/apache/hertzbeat/releases) +1. 下载您系统环境对应的安装包`hertzbeat-xx.tar.gz` [GITHUB Release](https://github.com/apache/hertzbeat/releases) 2. 配置 HertzBeat 的配置文件 `hertzbeat/config/application.yml`(可选) 3. 部署启动 `$ ./bin/startup.sh ` 或 `bin/startup.bat` 4. 浏览器访问 `http://localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` 5. 部署采集器集群(可选) - - 下载您系统环境对应采集器安装包`hertzbeat-collector-xx.tar.gz`到规划的另一台部署主机上 [GITEE Release](https://gitee.com/hertzbeat/hertzbeat/releases) [GITHUB Release](https://github.com/apache/hertzbeat/releases) + - 下载您系统环境对应采集器安装包`hertzbeat-collector-xx.tar.gz`到规划的另一台部署主机上 [GITHUB Release](https://github.com/apache/hertzbeat/releases) - 配置采集器的配置文件 `hertzbeat-collector/config/application.yml` 里面的连接主HertzBeat服务的对外IP，端口，当前采集器名称(需保证唯一性)等参数 `identity` `mode` (public or private) `manager-host` `manager-port` ```yaml collector: diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/sslcert-practice.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/sslcert-practice.md index 12eefb434..4b820944d 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/sslcert-practice.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/sslcert-practice.md @@ -14,8 +14,7 @@ sidebar_label: 使用案例 Apache HertzBeat(Incubating) 一个拥有强大自定义监控能力，无需Agent的实时监控工具。网站监测，PING连通性，端口可用性，数据库，操作系统，中间件，API监控，阈值告警，告警通知(邮件微信钉钉飞书)。 -github: https://github.com/apache/hertzbeat -gitee: https://gitee.com/hertzbeat/hertzbeat +github: https://github.com/apache/hertzbeat #### 安装 HertzBeat @@ -100,5 +99,3 @@ https://tancloud.cn/docs/help/alert_dingtalk 监控SSL证书的实践就到这里，当然对hertzbeat来说这个功能只是冰山一角，如果您觉得hertzbeat这个开源项目不错的话欢迎给我们在GitHub Gitee star哦，灰常感谢。感谢老铁们的支持。笔芯！ **github: https://github.com/apache/hertzbeat** - -**gitee: https://gitee.com/hertzbeat/hertzbeat** diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/upgrade.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/upgrade.md index 1bf458cb8..048eb5b85 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/upgrade.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/upgrade.md @@ -7,7 +7,6 @@ sidebar_label: 版本更新指引 **Apache HertzBeat(Incubating) 的发布版本列表** - [Github Release](https://github.com/apache/hertzbeat/releases) -- [Gitee Release](https://gitee.com/hertzbeat/hertzbeat/releases) - [DockerHub Release](https://hub.docker.com/r/apache/hertzbeat/tags) - [Docker quay.io Release](https://quay.io/repository/apache/hertzbeat?tab=tags) diff --git a/script/docker/collector/README.md b/script/docker/collector/README.md index 28b41831e..b1d6f1593 100644 --- a/script/docker/collector/README.md +++ b/script/docker/collector/README.md @@ -1,32 +1,29 @@ -## 使用 buildx 构建多种系统架构支持的 Docker 镜像 +## Use the buildx to build Docker images that support multiple system architectures > https://vuepress.mirror.docker-practice.com/buildx/multi-arch-images/ -#### 新建 builder 实例 ```shell -# 适用于国内环境 $ docker buildx create --use --name=mybuilder-cn --driver docker-container --driver-opt image=dockerpracticesig/buildkit:master -# 适用于腾讯云环境(腾讯云主机、coding.net 持续集成) +# for tencent environment $ docker buildx create --use --name=mybuilder-cn --driver docker-container --driver-opt image=dockerpracticesig/buildkit:master-tencent -# 原始 $ docker buildx create --use --name mybuilder --driver docker-container $ docker buildx use mybuilder ``` -#### 构建镜像 +#### Build the image ```shell -# 使用 $ docker buildx build 命令构建镜像, --push 参数表示将构建好的镜像推送到 Docker 仓库 +# Use the --platform flag to specify the target platforms for the build --push flag to push the image to a registry $ docker buildx build --platform linux/arm64,linux/amd64 -t apache/hertzbeat-collector:v1.0.0 . --push $ docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat-collector:latest . --push -# 查看镜像信息 +# Inspect the image info $ docker buildx imagetools inspect apache/hertzbeat-collector:v1.0.0 ``` diff --git a/script/docker/collector/build.sh b/script/docker/collector/build.sh index 210dd34ba..bcc5ad955 100644 --- a/script/docker/collector/build.sh +++ b/script/docker/collector/build.sh @@ -15,20 +15,20 @@ # 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. -# 调整脚本目录 +# cd `dirname $0` -# 当前脚本目录 +# current dir CURRENT_DIR=`pwd` -# 跳转制品目录 +# cd dist dir cd ../../../collector/target -# 自动捕获hertzbeat版本 +# auto detect hertzbeat version VERSION=`ls *.tar| awk -F"-" '{print $3}' | awk -F".tar" '{print $1}'` -# 强制使用版本参数 +# use the version param if [ -n "$1" ]; then VERSION="$1"; fi -# 编译上下文目录 +# docker compile context CONTEXT_DIR=`pwd` COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t apache/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" diff --git a/script/docker/server/README.md b/script/docker/server/README.md index d16f5a51c..4cfc50fcd 100644 --- a/script/docker/server/README.md +++ b/script/docker/server/README.md @@ -1,32 +1,29 @@ -## 使用 buildx 构建多种系统架构支持的 Docker 镜像 +## Use the buildx to build Docker images that support multiple system architectures -> https://vuepress.mirror.docker-practice.com/buildx/multi-arch-images/ +> https://vuepress.mirror.docker-practice.com/buildx/multi-arch-images/ -#### 新建 builder 实例 ```shell -# 适用于国内环境 $ docker buildx create --use --name=mybuilder-cn --driver docker-container --driver-opt image=dockerpracticesig/buildkit:master -# 适用于腾讯云环境(腾讯云主机、coding.net 持续集成) +# for tencent environment $ docker buildx create --use --name=mybuilder-cn --driver docker-container --driver-opt image=dockerpracticesig/buildkit:master-tencent -# 原始 $ docker buildx create --use --name mybuilder --driver docker-container $ docker buildx use mybuilder ``` -#### 构建镜像 +#### Build the image ```shell -# 使用 $ docker buildx build 命令构建镜像, --push 参数表示将构建好的镜像推送到 Docker 仓库 +# Use the --platform flag to specify the target platforms for the build --push flag to push the image to a registry $ docker buildx build --platform linux/arm64,linux/amd64 -t apache/hertzbeat:v1.0.0 . --push $ docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat:latest . --push -# 查看镜像信息 +# Inspect the image info $ docker buildx imagetools inspect apache/hertzbeat:v1.0.0 ``` diff --git a/script/docker/server/build.sh b/script/docker/server/build.sh index b2a469049..9ae76fdec 100755 --- a/script/docker/server/build.sh +++ b/script/docker/server/build.sh @@ -15,20 +15,20 @@ # 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. -# 调整脚本目录 +# cd `dirname $0` -# 当前脚本目录 +# current dir CURRENT_DIR=`pwd` -# 跳转制品目录 +# cd dist dir cd ../../../manager/target -# 自动捕获hertzbeat版本 +# auto detect hertzbeat version VERSION=`ls *.tar| awk -F"-" '{print $2}' | awk -F".tar" '{print $1}'` -# 强制使用版本参数 +# use the version param if [ -n "$1" ]; then VERSION="$1"; fi -# 编译上下文目录 +# compile context dir CONTEXT_DIR=`pwd` COMMAND="docker buildx build --platform ${IMAGE_PLATFORM:-linux/arm64,linux/amd64} -t apache/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push=${IMAGE_PUSH:-true} --load=${IMAGE_LOAD:-false}" diff --git a/web-app/src/app/routes/setting/collector/collector.component.html b/web-app/src/app/routes/setting/collector/collector.component.html index 2fbae1ca5..2a824afc7 100644 --- a/web-app/src/app/routes/setting/collector/collector.component.html +++ b/web-app/src/app/routes/setting/collector/collector.component.html @@ -252,9 +252,6 @@ <a style="margin-left: 20px" href="https://github.com/apache/hertzbeat/releases"; target="_blank"> <span>{{ 'collector.deploy.package.github' | i18n }}</span> </a> - <a style="margin-left: 10px" href="https://gitee.com/hertzbeat/hertzbeat/releases"; target="_blank"> - <span>{{ 'collector.deploy.package.gitee' | i18n }}</span> - </a> <div style="margin: 4px 10px 4px 4px; height: 260px; width: 100%; border-radius: 10px"> <nz-code-editor [ngModel]="packageShell" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
