diff --git a/README.md b/README.md index d90973490cb..ed45f3bd3db 100644 --- a/README.md +++ b/README.md @@ -14,18 +14,17 @@ [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/) [![Twitter](https://img.shields.io/twitter/follow/hertzbeat1024?logo=twitter)](https://twitter.com/hertzbeat1024) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139) -[![Docker Pulls](https://img.shields.io/docker/pulls/tancloud/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/tancloud/hertzbeat/general) +[![Docker Pulls](https://img.shields.io/docker/pulls/apache/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/apache/hertzbeat/general) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hertzbeat)](https://artifacthub.io/packages/search?repo=hertzbeat) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow) -[![QQ](https://img.shields.io/badge/QQ-630061200-orange)](https://qm.qq.com/q/FltGGGIX2m) **Home: [hertzbeat.apache.org](https://hertzbeat.apache.org)** -**Email: Mail to `dev-subscribe@hertzbeat.apache.org` to subscribe [mailing lists](https://lists.apache.org/list.html?dev@hertzbeat.apache.org)** +**Email: Mail to `dev-subscribe@hertzbeat.apache.org` to subscribe mailing lists** ## 🎡 Introduction -[Apache HertzBeat](https://github.com/apache/hertzbeat)(Incubating) is an easy-to-use, open source, real-time monitoring system with agentless, high performance cluster, prometheus-compatible, offers powerful custom monitoring and status page building capabilities. +[Apache HertzBeat](https://github.com/apache/hertzbeat) (incubating) is an easy-to-use, open source, real-time monitoring system with agentless, high performance cluster, prometheus-compatible, offers powerful custom monitoring and status page building capabilities. ### Features @@ -111,18 +110,14 @@ 1. Just one command to get started: -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/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``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` 2. Access `http://localhost:1157` to start, default account: `admin/hertzbeat` 3. Deploy collector clusters (Optional) ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : set the collector unique identity name. - `-e MODE=public` : set the running mode(public or private), public cluster or private cloud-edge. diff --git a/README_CN.md b/README_CN.md index 7b0daed3e2f..e499c6791b1 100644 --- a/README_CN.md +++ b/README_CN.md @@ -14,19 +14,18 @@ [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/) [![Twitter](https://img.shields.io/twitter/follow/hertzbeat1024?logo=twitter)](https://twitter.com/hertzbeat1024) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139) -[![Docker Pulls](https://img.shields.io/docker/pulls/tancloud/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/tancloud/hertzbeat/general) +[![Docker Pulls](https://img.shields.io/docker/pulls/apache/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/apache/hertzbeat/general) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hertzbeat)](https://artifacthub.io/packages/search?repo=hertzbeat) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow) -[![QQ](https://img.shields.io/badge/qq-630061200-orange)](https://qm.qq.com/q/FltGGGIX2m) **官网: [hertzbeat.apache.org](https://hertzbeat.apache.org)** -**邮件: 发送至 ```dev-subscribe@hertzbeat.apache.org```** 订阅[邮件列表](https://lists.apache.org/list.html?dev@hertzbeat.apache.org) +**邮件: 发送至 ```dev-subscribe@hertzbeat.apache.org```** 订阅邮件列表 ## 🎡 介绍 -[Apache HertzBeat](https://github.com/apache/hertzbeat)(Incubating) 是一个易用友好的开源实时监控告警系统，无需 Agent，高性能集群，兼容 Prometheus，提供强大的自定义监控和状态页构建能力。 +[Apache HertzBeat](https://github.com/apache/hertzbeat) (incubating) 是一个易用友好的开源实时监控告警系统，无需 Agent，高性能集群，兼容 Prometheus，提供强大的自定义监控和状态页构建能力。 ### 特点 @@ -110,18 +109,14 @@ 1. `docker` 环境仅需一条命令即可开始 -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` - -```或者使用 quay.io (若 dockerhub 网络链接超时)``` - -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat quay.io/tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` 2. 浏览器访问 `http://localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` 3. 部署采集器集群(可选) ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。 - `-e MODE=public` : 配置运行模式(public or private), 公共集群模式或私有云边模式。 diff --git a/e2e/compose.yaml b/e2e/compose.yaml index 47fdabefdf3..ec3ab8cf8fb 100644 --- a/e2e/compose.yaml +++ b/e2e/compose.yaml @@ -28,7 +28,7 @@ services: links: - hertzbeat hertzbeat: - image: tancloud/hertzbeat + image: apache/hertzbeat ports: - 1157:1157 environment: diff --git a/home/blog/2022-06-19-hertzbeat-v1.1.0.md b/home/blog/2022-06-19-hertzbeat-v1.1.0.md index 648194c036f..669cd8fc1a0 100644 --- a/home/blog/2022-06-19-hertzbeat-v1.1.0.md +++ b/home/blog/2022-06-19-hertzbeat-v1.1.0.md @@ -12,7 +12,7 @@ tags: [opensource] **Official Website: [hertzbeat.com](https://hertzbeat.com) | [tancloud.cn](https://tancloud.cn)** Hello everyone, HertzBeat v1.1.0 is released! In this version, we've added support for the SNMP protocol and implemented application monitoring for Windows operating systems using SNMP. -Another significant change is our default switch to using the H2 database instead of MYSQL for storage, making it easier for users to install and deploy. Now, you can install and experience HertzBeat with just a single Docker command: `docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +Another significant change is our default switch to using the H2 database instead of MYSQL for storage, making it easier for users to install and deploy. Now, you can install and experience HertzBeat with just a single Docker command: `docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Let's Try It! Thanks to all HertzBeat contributors! 👍👍 @@ -64,7 +64,7 @@ Have Fun! Home: hertzbeat.com | tancloud.cn Hi guys! HertzBeat v1.1.0 is coming. This version we support snmp protocol and use snmp to collect windows metrics. -Another major change is that we use the H2 database by default to replace the MYSQL database as storage to facilitate the installation and deployment of users. Now only one docker command is needed to install and experience hertzbeat： `docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +Another major change is that we use the H2 database by default to replace the MYSQL database as storage to facilitate the installation and deployment of users. Now only one docker command is needed to install and experience hertzbeat： `docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Let's Try It! Thanks to the contributors! 👍👍 diff --git a/home/blog/2022-06-22-one-step-up.md b/home/blog/2022-06-22-one-step-up.md index bde93631312..1c287803bda 100644 --- a/home/blog/2022-06-22-one-step-up.md +++ b/home/blog/2022-06-22-one-step-up.md @@ -12,7 +12,7 @@ tags: [opensource] **Official Website: [hertzbeat.com](https://hertzbeat.com) | [tancloud.cn](https://tancloud.cn)** Hello everyone, HertzBeat v1.1.0 is here! In this version, we've added support for the SNMP protocol and enabled application monitoring for Windows operating systems using SNMP. -Another major change is that we've switched from using MYSQL to H2 database by default for storage, making it easier for users to install and deploy. Now, you can get started with HertzBeat using just a single docker command: `docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +Another major change is that we've switched from using MYSQL to H2 database by default for storage, making it easier for users to install and deploy. Now, you can get started with HertzBeat using just a single docker command: `docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Let's Try It! Thanks to all contributors of HertzBeat! 👍👍 @@ -64,7 +64,7 @@ Have Fun! Home: hertzbeat.com | tancloud.cn Hi guys! HertzBeat v1.1.0 is coming. This version we support snmp protocol and use snmp to collect windows metrics. -Another major change is that we use the H2 database by default to replace the MYSQL database as storage to facilitate the installation and deployment of users. Now only one docker command is needed to install and experience hertzbeat： `docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +Another major change is that we use the H2 database by default to replace the MYSQL database as storage to facilitate the installation and deployment of users. Now only one docker command is needed to install and experience hertzbeat： `docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Let's Try It! Thanks to the contributors! 👍👍 diff --git a/home/blog/2022-07-10-hertzbeat-v1.1.1.md b/home/blog/2022-07-10-hertzbeat-v1.1.1.md index 0c1864fa78f..0982fed4047 100644 --- a/home/blog/2022-07-10-hertzbeat-v1.1.1.md +++ b/home/blog/2022-07-10-hertzbeat-v1.1.1.md @@ -14,7 +14,7 @@ tags: [opensource] Hi guys! HertzBeat v1.1.1 is coming. This version brings custom monitoring enhancements, and the collected metric data can be assigned as a variable to the next collection. Fixed several bugs and improved the overall stable usability. Only one docker command is needed to install and experience hertzbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the contributors! 👍👍 diff --git a/home/blog/2022-09-04-hertzbeat-v1.1.3.md b/home/blog/2022-09-04-hertzbeat-v1.1.3.md index 6d49a543b5d..b4076083e8b 100644 --- a/home/blog/2022-09-04-hertzbeat-v1.1.3.md +++ b/home/blog/2022-09-04-hertzbeat-v1.1.3.md @@ -12,7 +12,7 @@ Home: hertzbeat.com | tancloud.cn Hi guys! HertzBeat v1.1.3 is coming. This version supports kafka monitor, ssl certificate expired monitor and more. Fixed several bugs and improved the overall stable usability. Only one docker command is needed to install and experience hertzbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the contributors! 👍👍 diff --git a/home/blog/2022-09-10-ssl-practice.md b/home/blog/2022-09-10-ssl-practice.md index 3b55d0d5525..0963a088c41 100644 --- a/home/blog/2022-09-10-ssl-practice.md +++ b/home/blog/2022-09-10-ssl-practice.md @@ -28,7 +28,7 @@ gitee: https://gitee.com/hertzbeat/hertzbeat 2. The `docker` environment can be installed with a single command -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 3. Installation success browser visit `localhost:1157` to start, the default account password `admin/hertzbeat diff --git a/home/blog/2022-10-08-hertzbeat-v1.2.0.md b/home/blog/2022-10-08-hertzbeat-v1.2.0.md index 6fd11fc0d8c..90e88793232 100644 --- a/home/blog/2022-10-08-hertzbeat-v1.2.0.md +++ b/home/blog/2022-10-08-hertzbeat-v1.2.0.md @@ -14,7 +14,7 @@ Home: hertzbeat.com | tancloud.cn Hi guys! HertzBeat v1.2.0 is coming. This version supports more powerful metrics collect jsonpath, upgrade springboot version to 2.7.4, support This version supports more powerful metrics collect jsonpath, upgrade springboot version to 2.7.4, support metrics unit convert display, and more. Fixed several bugs and improved the overall stable usability. Only one docker command is needed to install and experience heartbeat: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the contributors! 👍👍 @Ceilzcx @Privauto @VampireAchao @DreamGirl524 @CharlieXCL @emrys-he @SxLiuYu @tomsun28 diff --git a/home/blog/2022-11-28-hertzbeat-v1.2.2.md b/home/blog/2022-11-28-hertzbeat-v1.2.2.md index 6df59ed0213..8f3fd6c3316 100644 --- a/home/blog/2022-11-28-hertzbeat-v1.2.2.md +++ b/home/blog/2022-11-28-hertzbeat-v1.2.2.md @@ -14,7 +14,7 @@ Hi guys! HertzBeat v1.2.2 is coming. This release brings significant features. T Let's Try It Now! Only one docker command is needed to install and experience heartbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the contributors! 👍👍 @@ -63,7 +63,7 @@ Have Fun! 大家好，HertzBeat v1.2.2发布啦！这个版本带来个超多重大更新，我们支持了对云原生kubernets, docker的监控，支持了对springboot应用, nacos注册发现中心，达梦数据库，opengauss数据库等的指标监控。我们也引入了一个实验性特性，用户可以使用promethues promql 从promethues server拿取指标数据作为hertzbeat自定义监控指标数据。当然我们也新增了多个测试用户覆盖，修复了多个BUG。还有个很多用户想要的更新，我们新增了对linux监控的top10 cpu 内存利用率的进程监控指标。有个这个指标，我们就可以干很多事情。比如监控某个进程CPU异常，内存爆满啥的。快来试试吧！ 只需要一条docker命令即可安装体验heartbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 感谢hertzbeat贡献者们的贡献！👍👍 diff --git a/home/blog/2022-12-28-hertzbeat-v1.2.3.md b/home/blog/2022-12-28-hertzbeat-v1.2.3.md index 888a6beba75..675020eb61e 100644 --- a/home/blog/2022-12-28-hertzbeat-v1.2.3.md +++ b/home/blog/2022-12-28-hertzbeat-v1.2.3.md @@ -16,7 +16,7 @@ Hi guys! HertzBeat v1.2.3 is coming. This release we support prometheus exporter Let's Try It Now! Only one docker command is needed to install and experience heartbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the contributors! 👍👍 @@ -62,7 +62,7 @@ Have Fun! 大家好，HertzBeat v1.2.3发布啦！这个版本带来了重大更新，我们支持了对prometheus exporter协议监控，用户可以很方便的使用hertzbeat来适配监控prometheus exporter. 基于这个能力，这个版本我们也支持了对apache shenyu, apache iotdb的指标监控。我们更新了UI布局，修复了多个BUG，也支持了短信通知。快来体验下吧! 只需要一条docker命令即可安装体验heartbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 感谢hertzbeat贡献者们的贡献！👍👍 diff --git a/home/blog/2023-01-05-monitor-iotdb.md b/home/blog/2023-01-05-monitor-iotdb.md index c6542b65b8c..b89a7441719 100644 --- a/home/blog/2023-01-05-monitor-iotdb.md +++ b/home/blog/2023-01-05-monitor-iotdb.md @@ -130,6 +130,6 @@ HertzBeat Github: https://github.com/apache/hertzbeat **Welcome to learn about using Star Support! ** Only one docker command is needed to install and experience heartbeat: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Note ⚠️HertzBeat v1.2.3 version supports IoTDB v0.12 v0.13. Since its v1.0 has just been released, all metrics of this version are not yet compatible. diff --git a/home/blog/2023-01-08-monitor-shenyu.md b/home/blog/2023-01-08-monitor-shenyu.md index 5e0005715e9..6ae3e99f83c 100644 --- a/home/blog/2023-01-08-monitor-shenyu.md +++ b/home/blog/2023-01-08-monitor-shenyu.md @@ -165,4 +165,4 @@ HertzBeat Github: https://github.com/apache/hertzbeat **Welcome to learn about using Star Support Oh! ** Experience heartbeat with a single docker command: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` diff --git a/home/blog/2023-02-02-monitor-dynamic-tp.md b/home/blog/2023-02-02-monitor-dynamic-tp.md index 568b93afcba..126c14044e4 100644 --- a/home/blog/2023-02-02-monitor-dynamic-tp.md +++ b/home/blog/2023-02-02-monitor-dynamic-tp.md @@ -177,4 +177,4 @@ HertzBeat Github: https://github.com/apache/hertzbeat **Welcome to learn how to use Star Support!** Experience heartbeat with a single docker command: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` diff --git a/home/blog/2023-02-11-monitor-mysql.md b/home/blog/2023-02-11-monitor-mysql.md index a871822a1a5..cdcaeb427e1 100644 --- a/home/blog/2023-02-11-monitor-mysql.md +++ b/home/blog/2023-02-11-monitor-mysql.md @@ -128,4 +128,4 @@ HertzBeat Github: https://github.com/apache/hertzbeat > Only one docker command is needed to install and experience heartbeat: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` diff --git a/home/blog/2023-02-15-monitor-linux.md b/home/blog/2023-02-15-monitor-linux.md index 53fea07fd2d..243a6608e1e 100644 --- a/home/blog/2023-02-15-monitor-linux.md +++ b/home/blog/2023-02-15-monitor-linux.md @@ -124,7 +124,7 @@ This practical article took us to experience how to use the open source real-tim > Only one docker command is needed to install and experience heartbeat: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` ## What is Hertz Beat? diff --git a/home/blog/2023-03-15-hertzbeat-v1.3.0.md b/home/blog/2023-03-15-hertzbeat-v1.3.0.md index 8c16e63acbc..bc7a5631bfc 100644 --- a/home/blog/2023-03-15-hertzbeat-v1.3.0.md +++ b/home/blog/2023-03-15-hertzbeat-v1.3.0.md @@ -56,7 +56,7 @@ and more new features welcome to explore Only one docker command is needed to install and experience heartbeat -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the hertzbeat contributors for their contributions! 👍👍👍 diff --git a/home/blog/2023-03-22-monitor-springboot2.md b/home/blog/2023-03-22-monitor-springboot2.md index 67565f7771f..2d0cbc17cfc 100644 --- a/home/blog/2023-03-22-monitor-springboot2.md +++ b/home/blog/2023-03-22-monitor-springboot2.md @@ -178,7 +178,7 @@ This practical article took us to experience how to use the open source real-tim > Only one docker command is needed to install and experience heartbeat: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` ## More powerful diff --git a/home/blog/2023-05-09-hertzbeat-v1.3.1.md b/home/blog/2023-05-09-hertzbeat-v1.3.1.md index fccab465e3d..9ed7afbe17d 100644 --- a/home/blog/2023-05-09-hertzbeat-v1.3.1.md +++ b/home/blog/2023-05-09-hertzbeat-v1.3.1.md @@ -46,7 +46,7 @@ Support monitoring EulerOS metrics and SpringBoot3 metrics. Fixed several bugs, Let's Try Now! Only one docker command is needed to install and experience hertzbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` ## Upgrade Note⚠️. diff --git a/home/blog/2023-05-11-greptimedb-store.md b/home/blog/2023-05-11-greptimedb-store.md index 2487aa69ecf..ec06dea561a 100644 --- a/home/blog/2023-05-11-greptimedb-store.md +++ b/home/blog/2023-05-11-greptimedb-store.md @@ -70,7 +70,7 @@ $ docker run -d -p 1157:1157 \ -v /opt/data:/opt/hertzbeat/data \ -v /opt/application.yml:/opt/hertzbeat/config/application.yml \ --restart=always \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` diff --git a/home/blog/2023-07-05-hertzbeat-v1.3.2.md b/home/blog/2023-07-05-hertzbeat-v1.3.2.md index 4e4e6f7bd96..ab232296099 100644 --- a/home/blog/2023-07-05-hertzbeat-v1.3.2.md +++ b/home/blog/2023-07-05-hertzbeat-v1.3.2.md @@ -57,7 +57,7 @@ Let's Try Now! Only one docker command is needed to install and experience hertzbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` ```or use quay.io (if dockerhub network connect timeout)``` diff --git a/home/blog/2023-08-14-hertzbeat-v1.4.0.md b/home/blog/2023-08-14-hertzbeat-v1.4.0.md index 63255f34109..142105674ca 100644 --- a/home/blog/2023-08-14-hertzbeat-v1.4.0.md +++ b/home/blog/2023-08-14-hertzbeat-v1.4.0.md @@ -75,7 +75,7 @@ As for open source commercialization, the premise of open source commercializati 1. Just one command to get started: -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```or use quay.io (if dockerhub network connect timeout)``` @@ -86,7 +86,7 @@ As for open source commercialization, the premise of open source commercializati 3. Deploy collector clusters ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_IP=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_IP=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : set the collector unique identity name. - `-e MANAGER_IP=127.0.0.1` : set the main hertzbeat server ip. diff --git a/home/blog/2023-09-26-hertzbeat-v1.4.1.md b/home/blog/2023-09-26-hertzbeat-v1.4.1.md index 4c584975905..cac836db123 100644 --- a/home/blog/2023-09-26-hertzbeat-v1.4.1.md +++ b/home/blog/2023-09-26-hertzbeat-v1.4.1.md @@ -60,7 +60,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 1. Just one command to get started: -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```or use quay.io (if dockerhub network connect timeout)``` @@ -71,7 +71,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 3. Deploy collector clusters ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : set the collector unique identity name. - `-e MANAGER_HOST=127.0.0.1` : set the main hertzbeat server ip. diff --git a/home/blog/2023-11-12-hertzbeat-v1.4.2.md b/home/blog/2023-11-12-hertzbeat-v1.4.2.md index 2c03fe27d94..d349d02a170 100644 --- a/home/blog/2023-11-12-hertzbeat-v1.4.2.md +++ b/home/blog/2023-11-12-hertzbeat-v1.4.2.md @@ -43,7 +43,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 1. Just one command to get started: -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```or use quay.io (if dockerhub network connect timeout)``` @@ -54,7 +54,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 3. Deploy collector clusters ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : set the collector unique identity name. - `-e MANAGER_HOST=127.0.0.1` : set the main hertzbeat server ip. diff --git a/home/blog/2023-12-11-hertzbeat-v1.4.3.md b/home/blog/2023-12-11-hertzbeat-v1.4.3.md index 59fccb4e1d4..2bc4957626d 100644 --- a/home/blog/2023-12-11-hertzbeat-v1.4.3.md +++ b/home/blog/2023-12-11-hertzbeat-v1.4.3.md @@ -48,7 +48,7 @@ Compatible with the Prometheus ecosystem, now we can monitor what Prometheus can 1. Just one command to get started: -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```or use quay.io (if dockerhub network connect timeout)``` @@ -59,7 +59,7 @@ Compatible with the Prometheus ecosystem, now we can monitor what Prometheus can 3. Deploy collector clusters ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : set the collector unique identity name. - `-e MANAGER_HOST=127.0.0.1` : set the main hertzbeat server ip. diff --git a/home/blog/2024-01-18-hertzbeat-v1.4.4.md b/home/blog/2024-01-18-hertzbeat-v1.4.4.md index 48ce6766aa8..e6e49efce56 100644 --- a/home/blog/2024-01-18-hertzbeat-v1.4.4.md +++ b/home/blog/2024-01-18-hertzbeat-v1.4.4.md @@ -49,7 +49,7 @@ keywords: [open source monitoring system, alerting system] 1. Just one command to get started: -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```or use quay.io (if dockerhub network connect timeout)``` @@ -60,7 +60,7 @@ keywords: [open source monitoring system, alerting system] 3. Deploy collector clusters ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : set the collector unique identity name. - `-e MANAGER_HOST=127.0.0.1` : set the main hertzbeat server ip. diff --git a/home/blog/2024-04-17-to-apache.md b/home/blog/2024-04-17-to-apache.md index 2d1ce9388d9..84f25fb10d1 100644 --- a/home/blog/2024-04-17-to-apache.md +++ b/home/blog/2024-04-17-to-apache.md @@ -25,7 +25,7 @@ We warmly welcome everyone to join the HertzBeat community. The community accept ## What is HertzBeat -[Apache HertzBeat](https://github.com/apache/hertzbeat)(Incubating) is an easy-to-use, open source, real-time monitoring system with agentless, high performance cluster, prometheus-compatible, offers powerful custom monitoring and status page building capabilities. +[Apache HertzBeat](https://github.com/apache/hertzbeat) (incubating) is an easy-to-use, open source, real-time monitoring system with agentless, high performance cluster, prometheus-compatible, offers powerful custom monitoring and status page building capabilities. ### Features diff --git a/home/docs/advanced/extend-http-example-hertzbeat.md b/home/docs/advanced/extend-http-example-hertzbeat.md index d2107ffba96..5ca5f633e6f 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 37d3386f3ce..b9bbb61e72d 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 629eb921270..8d9c9db2b3d 100644 --- a/home/docs/advanced/extend-tutorial.md +++ b/home/docs/advanced/extend-tutorial.md @@ -4,7 +4,7 @@ title: Quick Tutorial Customize and adapt a monitoring based on HTTP protocol sidebar_label: Tutorial Case --- -Through this tutorial, we describe step by step how to customize and adapt a monitoring type based on the http protocol under the Apache HertzBeat(Incubating). +Through this tutorial, we describe step by step how to customize and adapt a monitoring type based on the http protocol under the Apache HertzBeat (incubating). Before reading this tutorial, we hope that you are familiar with how to customize types, metrics, protocols, etc. from [Custom Monitoring](extend-point) and [Http Protocol Customization](extend-http). @@ -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/community/how-to-release.md b/home/docs/community/how-to-release.md index 337161bf549..aa9f7ef279a 100644 --- a/home/docs/community/how-to-release.md +++ b/home/docs/community/how-to-release.md @@ -438,13 +438,13 @@ svn commit -m "release for HertzBeat 2.1.0" Send a voting email in the community requires at least three `+1` and no `-1`. > `Send to`: dev@hertzbeat.apache.org
-> `Title`: [VOTE] Release Apache HertzBeat (Incubating) 2.1.0 rc1
+> `Title`: [VOTE] Release Apache HertzBeat (incubating) 2.1.0 rc1
> `Body`: ``` Hello HertzBeat Community: -This is a call for vote to release Apache HertzBeat(Incubating) version release-2.1.0-RC1. +This is a call for vote to release Apache HertzBeat (incubating) version release-2.1.0-RC1. Apache Streamark - Make stream processing easier! Easy-to-use streaming application development framework and operation platform. @@ -499,13 +499,13 @@ Thanks! After 72 hours, the voting results will be counted, and the voting result email will be sent, as follows. > `Send to`: dev@hertzbeat.apache.org
-> `Title`: [RESULT][VOTE] Release Apache HertzBeat (Incubating) 2.1.0-rc1
+> `Title`: [RESULT][VOTE] Release Apache HertzBeat (incubating) 2.1.0-rc1
> `Body`: ``` Dear HertzBeat community, -Thanks for your review and vote for "Release Apache HertzBeat (Incubating) 2.1.0-rc1" +Thanks for your review and vote for "Release Apache HertzBeat (incubating) 2.1.0-rc1" I'm happy to announce the vote has passed: @@ -547,14 +547,14 @@ Send a voting email in the incubator community requires at least three `+1` and > `Send to`: general@incubator.apache.org
> `cc`: dev@hertzbeat.apache.org、tison@apache.org、willem.jiang@gmail.com
-> `Title`: [VOTE] Release Apache HertzBeat(Incubating) 2.1.0-rc1
+> `Title`: [VOTE] Release Apache HertzBeat (incubating) 2.1.0-rc1
> `Body`: ``` Hello Incubator Community: -This is a call for a vote to release Apache HertzBeat(Incubating) version 2.1.0-RC1. -The Apache HertzBeat community has voted on and approved a proposal to release Apache HertzBeat(Incubating) version 2.1.0-RC1. +This is a call for a vote to release Apache HertzBeat (incubating) version 2.1.0-RC1. +The Apache HertzBeat community has voted on and approved a proposal to release Apache HertzBeat (incubating) version 2.1.0-RC1. We now kindly request the Incubator PMC members review and vote on this incubator release. Apache HertzBeat, Make stream processing easier! Easy-to-use streaming application development framework and operation platform. @@ -602,7 +602,7 @@ How to Build: Thanks, -On behalf of Apache HertzBeat(Incubating) community +On behalf of Apache HertzBeat (incubating) community Best, @@ -626,13 +626,13 @@ Then the voting results will be counted, and the voting result email will be sen > `Send to`: general@incubator.apache.org
> `cc`: dev@hertzbeat.apache.org、tison@apache.org、willem.jiang@gmail.com
-> `Title`: [RESULT][VOTE] Release Apache HertzBeat(Incubating) 2.1.0-rc1
+> `Title`: [RESULT][VOTE] Release Apache HertzBeat (incubating) 2.1.0-rc1
> `Body`: ``` Hi all, -Thanks for your review and vote for "Release Apache HertzBeat (Incubating) 2.1.0-rc1" +Thanks for your review and vote for "Release Apache HertzBeat (incubating) 2.1.0-rc1" I'm happy to announce the vote has passed: 3 binding votes, no +0 or -1 votes. @@ -734,13 +734,13 @@ The rename the release-2.1.0-rc1 branch to release-2.1.0. > `Send to`: general@incubator.apache.org
> `cc`: dev@hertzbeat.apache.org
-> `Title`: [ANNOUNCE] Release Apache HertzBeat (Incubating) 2.1.0
+> `Title`: [ANNOUNCE] Release Apache HertzBeat (incubating) 2.1.0
> `Body`: ``` Hi all, -We are glad to announce the release of Apache HertzBeat(incubating) 2.1.0. +We are glad to announce the release of Apache HertzBeat (incubating) 2.1.0. Once again I would like to express my thanks to your help. Apache HertzBeat(https://hertzbeat.apache.org/) - Make stream processing easier! Easy-to-use streaming application development framework and operation platform. diff --git a/home/docs/community/new_pmc_member_process.md b/home/docs/community/new_pmc_member_process.md index 8fc44d53aa4..ebc84b92d67 100644 --- a/home/docs/community/new_pmc_member_process.md +++ b/home/docs/community/new_pmc_member_process.md @@ -281,5 +281,5 @@ submission process. This should enable better productivity. A PPMC member helps manage and guide the direction of the project. Thanks, -On behalf of the Apache HertzBeat (Incubating) PPMC +On behalf of the Apache HertzBeat (incubating) PPMC ``` diff --git a/home/docs/download.md b/home/docs/download.md new file mode 100644 index 00000000000..fd781e7f0a1 --- /dev/null +++ b/home/docs/download.md @@ -0,0 +1,33 @@ +--- +id: download +title: Download Apache HertzBeat (incubating) +sidebar_label: Download +--- + +> **Here is the Apache HertzBeat (incubating) official download page.** +> **Please choose version to download from the following tables. It is recommended use the latest.** + +:::tip +- Please verify the release with corresponding hashes(sha512), signatures and [project release KEYS](https://downloads.apache.org/incubator/hertzbeat/KEYS). +- Refer to [How to Verify](https://www.apache.org/dyn/closer.cgi#verify) for how to check the hashes and signatures. +::: + +## The Latest Release + +:::tip +The Apache release coming soon! +::: + +---- + +## Non-Apache Release + +:::tip +These releases were made before the HertzBeat project joined the ASF Incubator. +These have not followed the usual ASF release process. +::: + +| Version | Date | Source | Binary | Release Notes | +|---------|------------|----------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------| +| v1.5.0 | 2024.03.08 | [source](https://github.com/apache/hertzbeat/archive/refs/tags/v1.5.0.zip) | [hertzbeat-1.5.0.tar.gz](https://github.com/dromara/hertzbeat/releases/download/v1.5.0/hertzbeat-1.5.0.tar.gz)
[hertzbeat-collector-1.5.0.tar.gz](https://github.com/dromara/hertzbeat/releases/download/v1.5.0/hertzbeat-collector-1.5.0.tar.gz) | [release note](https://github.com/apache/hertzbeat/releases/tag/v1.5.0) | +| v1.4.4 | 2024.01.11 | [source](https://github.com/apache/hertzbeat/archive/refs/tags/v1.4.4.zip) | [hertzbeat-1.4.4.tar.gz](https://github.com/dromara/hertzbeat/releases/download/v1.4.4/hertzbeat-1.4.4.tar.gz)
[hertzbeat-collector-1.4.4.tar.gz](https://github.com/dromara/hertzbeat/releases/download/v1.4.4/hertzbeat-collector-1.4.4.tar.gz) | [release note](https://github.com/apache/hertzbeat/releases/tag/v1.4.4) | diff --git a/home/docs/introduce.md b/home/docs/introduce.md index 7a3aba55958..53704669771 100644 --- a/home/docs/introduce.md +++ b/home/docs/introduce.md @@ -11,7 +11,7 @@ slug: / [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/) [![Twitter](https://img.shields.io/twitter/follow/hertzbeat1024?logo=twitter)](https://twitter.com/hertzbeat1024) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139) -[![Docker Pulls](https://img.shields.io/docker/pulls/tancloud/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/tancloud/hertzbeat/general) +[![Docker Pulls](https://img.shields.io/docker/pulls/apache/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/apache/hertzbeat/general) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hertzbeat)](https://artifacthub.io/packages/search?repo=hertzbeat) [![QQ](https://img.shields.io/badge/QQ-630061200-orange)](https://qm.qq.com/q/FltGGGIX2m) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow) @@ -161,7 +161,7 @@ In an isolated network where multiple networks are not connected, we need to dep ## Quickly Start -Just run a single command in a Docker environment: `docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat` +Just run a single command in a Docker environment: `docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat` Browser access `http://localhost:1157` default account password `admin/hertzbeat` ### Landing Page @@ -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 261016df676..64bba7d72df 100644 --- a/home/docs/start/account-modify.md +++ b/home/docs/start/account-modify.md @@ -6,9 +6,9 @@ sidebar_label: Update Account Secret ## Update Account -Apache HertzBeat(Incubating) default built-in three user accounts, respectively admin/hertzbeat tom/hertzbeat guest/hertzbeat +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 103dde9377f..7671366e9ad 100644 --- a/home/docs/start/docker-deploy.md +++ b/home/docs/start/docker-deploy.md @@ -4,7 +4,7 @@ title: Install HertzBeat via Docker sidebar_label: Install via Docker --- -> Recommend to use docker deploy Apache HertzBeat(Incubating) +> Recommend to use docker deploy Apache HertzBeat (incubating) 1. Download and install the Docker environment @@ -16,11 +16,11 @@ sidebar_label: Install via Docker ``` 2. pull HertzBeat Docker mirror - you can look up the mirror version TAG in [dockerhub mirror repository](https://hub.docker.com/r/tancloud/hertzbeat/tags) - or in [quay.io mirror repository](https://quay.io/repository/tancloud/hertzbeat) + you can look up the mirror version TAG in [dockerhub mirror repository](https://hub.docker.com/r/apache/hertzbeat/tags) + or in [quay.io mirror repository](https://quay.io/repository/apache/hertzbeat) ```shell - $ docker pull tancloud/hertzbeat - $ docker pull tancloud/hertzbeat-collector + $ docker pull apache/hertzbeat + $ docker pull apache/hertzbeat-collector ``` or ```shell @@ -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 @@ -54,7 +54,7 @@ $ docker run -d -p 1157:1157 -p 1158:1158 \ -v $(pwd)/logs:/opt/hertzbeat/logs \ -v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml \ -v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` This command starts a running HertzBeat Docker container with mapping port 1157-1158. If existing processes on the host use the port, please modify host mapped port. @@ -67,7 +67,7 @@ $ docker run -d -p 1157:1157 -p 1158:1158 \ - `-v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml` : (optional, if you don't have a need, just delete it) Mount the local configuration file into the container which has been modified in the previous step, namely using the local configuration file to cover container configuration file. - `-v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml` : (optional, if you don't have a need, just delete it) Mount account configuration file modified in the previous step into the container. Delete this command parameters if no needs. - `--name hertzbeat` : Naming container name hertzbeat - - `tancloud/hertzbeat` : Use the pulled latest HertzBeat official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat` instead if you pull `quay.io` docker image.** + - `apache/hertzbeat` : Use the pulled latest HertzBeat official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat` instead if you pull `quay.io` docker image.** 6. Begin to explore HertzBeat @@ -81,7 +81,7 @@ $ docker run -d \ -e MODE=public \ -e MANAGER_HOST=127.0.0.1 \ -e MANAGER_PORT=1158 \ - --name hertzbeat-collector tancloud/hertzbeat-collector + --name hertzbeat-collector apache/hertzbeat-collector ``` This command starts a running HertzBeat-Collector container. @@ -92,7 +92,7 @@ $ docker run -d \ - `-e MANAGER_PORT=1158` : (optional) Set the main hertzbeat server port, default 1158. - `-v $(pwd)/logs:/opt/hertzbeat-collector/logs` : (optional) Mount the log file to the local host, to ensure the log will not be lost due creating or deleting container. - `--name hertzbeat-collector` : Naming container name hertzbeat-collector - - `tancloud/hertzbeat-collector` : Use the pulled latest HertzBeat-Collector official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat-collector` instead if you pull `quay.io` docker image.** + - `apache/hertzbeat-collector` : Use the pulled latest HertzBeat-Collector official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat-collector` instead if you pull `quay.io` docker image.** 8. Access `http://localhost:1157` and you will see the registered new collector in dashboard. diff --git a/home/docs/start/greptime-init.md b/home/docs/start/greptime-init.md index 29270ff43e7..cfb148ecea7 100644 --- a/home/docs/start/greptime-init.md +++ b/home/docs/start/greptime-init.md @@ -4,7 +4,7 @@ title: Use Time Series Database GreptimeDB to Store Metrics Data (Optional) sidebar_label: Use GreptimeDB Store Metrics --- -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) +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) > It is recommended to use VictoriaMetrics as metrics storage. diff --git a/home/docs/start/influxdb-init.md b/home/docs/start/influxdb-init.md index 12e1acc9391..b752fc82a21 100644 --- a/home/docs/start/influxdb-init.md +++ b/home/docs/start/influxdb-init.md @@ -4,7 +4,7 @@ title: Use Time Series Database InfluxDB to Store Metrics Data (Optional) sidebar_label: Use InfluxDB Store Metrics --- -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) +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) > It is recommended to use VictoriaMetrics as metrics storage. diff --git a/home/docs/start/iotdb-init.md b/home/docs/start/iotdb-init.md index 6b41fd07810..f7796bd350a 100644 --- a/home/docs/start/iotdb-init.md +++ b/home/docs/start/iotdb-init.md @@ -4,7 +4,7 @@ title: Use Time Series Database IoTDB to Store Metrics Data (Optional) sidebar_label: Use IoTDB Store Metrics --- -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) +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) > It is recommended to use VictoriaMetrics as metrics storage. diff --git a/home/docs/start/mysql-change.md b/home/docs/start/mysql-change.md index 9f8d89febd3..0985228a0ee 100644 --- a/home/docs/start/mysql-change.md +++ b/home/docs/start/mysql-change.md @@ -3,7 +3,7 @@ id: mysql-change title: Use MYSQL Replace H2 Database to Store Metadata(Optional) sidebar_label: Use MYSQL Instead of H2 --- -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. +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. > If you have the MYSQL environment, can be directly to database creation step. diff --git a/home/docs/start/package-deploy.md b/home/docs/start/package-deploy.md index f05c42d51fc..050121f5c55 100644 --- a/home/docs/start/package-deploy.md +++ b/home/docs/start/package-deploy.md @@ -4,12 +4,11 @@ title: Install HertzBeat via Package sidebar_label: Install via Package --- -> You can install and run Apache HertzBeat(Incubating) on Linux Windows Mac system, and CPU supports X86/ARM64. +> 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 from [GITHUB Release](https://github.com/apache/hertzbeat/releases) repository + Download installation package `hertzbeat-xx.tar.gz` `hertzbeat-collector-xx.tar.gz` corresponding to your system environment + - [Download Page](/docs/download) 2. Configure HertzBeat's configuration file(optional) Unzip the installation package to the host eg: /opt/hertzbeat @@ -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 [Download Page](/docs/download) - 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/postgresql-change.md b/home/docs/start/postgresql-change.md index 8004815d5e7..c78a24a1ca7 100644 --- a/home/docs/start/postgresql-change.md +++ b/home/docs/start/postgresql-change.md @@ -3,7 +3,7 @@ id: postgresql-change title: Use PostgreSQL Replace H2 Database to Store Metadata(Optional) sidebar_label: Use PostgreSQL Instead of H2 --- -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. +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. > If you have the PostgreSQL environment, can be directly to database creation step. diff --git a/home/docs/start/quickstart.md b/home/docs/start/quickstart.md index 38e0a99e669..2195239e78c 100644 --- a/home/docs/start/quickstart.md +++ b/home/docs/start/quickstart.md @@ -6,17 +6,17 @@ sidebar_label: Quick Start ### 🐕 Quick Start -- If you wish to deploy Apache HertzBeat(Incubating) locally, please refer to the following Deployment Documentation for instructions. +- If you wish to deploy Apache HertzBeat (incubating) locally, please refer to the following Deployment Documentation for instructions. ### 🍞 Install HertzBeat -> Apache HertzBeat(Incubating) supports installation through source code, docker or package, cpu support X86/ARM64. +> Apache HertzBeat (incubating) supports installation through source code, docker or package, cpu support X86/ARM64. ##### 1：Install quickly via docker 1. Just one command to get started: -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```or use quay.io (if dockerhub network connect timeout)``` @@ -27,7 +27,7 @@ sidebar_label: Quick Start 3. Deploy collector clusters(Optional) ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : set the collector unique identity name. - `-e MODE=public` : set the running mode(public or private), public cluster or private cloud-edge. @@ -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/rainbond-deploy.md b/home/docs/start/rainbond-deploy.md index 48791e79b62..57f537aa4ac 100644 --- a/home/docs/start/rainbond-deploy.md +++ b/home/docs/start/rainbond-deploy.md @@ -4,7 +4,7 @@ title: Use Rainbond Deploy HertzBeat sidebar_label: Install via Rainbond --- -If you are unfamiliar with Kubernetes, and want to install Apache HertzBeat(Incubating) in Kubernetes, you can use Rainbond to deploy. Rainbond is a cloud-native application management platform built on Kubernetes and simplifies the application deployment to Kubernetes. +If you are unfamiliar with Kubernetes, and want to install Apache HertzBeat (incubating) in Kubernetes, you can use Rainbond to deploy. Rainbond is a cloud-native application management platform built on Kubernetes and simplifies the application deployment to Kubernetes. ## Prerequisites diff --git a/home/docs/start/sslcert-practice.md b/home/docs/start/sslcert-practice.md index 6499854e975..d8c06a8beba 100644 --- a/home/docs/start/sslcert-practice.md +++ b/home/docs/start/sslcert-practice.md @@ -10,7 +10,7 @@ This article introduces how to use the hertzbeat monitoring tool to detect the v #### What is HertzBeat -Apache HertzBeat(Incubating) is a real-time monitoring tool with powerful custom monitoring capabilities without Agent. Website monitoring, PING connectivity, port availability, database, operating system, middleware, API monitoring, threshold alarms, alarm notification (email, WeChat, Ding Ding Feishu). +Apache HertzBeat (incubating) is a real-time monitoring tool with powerful custom monitoring capabilities without Agent. Website monitoring, PING connectivity, port availability, database, operating system, middleware, API monitoring, threshold alarms, alarm notification (email, WeChat, Ding Ding Feishu). github: https://github.com/apache/hertzbeat @@ -19,7 +19,7 @@ github: https://github.com/apache/hertzbeat 1. The `docker` environment can be installed with just one command -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 2. After the installation is successful, the browser can access `localhost:1157` to start, the default account password is `admin/hertzbeat` @@ -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/tdengine-init.md b/home/docs/start/tdengine-init.md index dafec291a24..1f73a4151eb 100644 --- a/home/docs/start/tdengine-init.md +++ b/home/docs/start/tdengine-init.md @@ -4,7 +4,7 @@ title: Use Time Series Database TDengine to Store Metrics Data (Optional) sidebar_label: Use TDengine Store Metrics --- -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) +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) > It is recommended to use VictoriaMetrics as metrics storage. diff --git a/home/docs/start/upgrade.md b/home/docs/start/upgrade.md index e240739a07e..0437d14e435 100644 --- a/home/docs/start/upgrade.md +++ b/home/docs/start/upgrade.md @@ -6,12 +6,11 @@ sidebar_label: Version Upgrade Guide **HertzBeat Release Version List** +- [Download Page](/docs/download) - [Github Release](https://github.com/apache/hertzbeat/releases) -- [Gitee Release](https://gitee.com/hertzbeat/hertzbeat/releases) -- [DockerHub Release](https://hub.docker.com/r/tancloud/hertzbeat/tags) -- [Docker quay.io Release](https://quay.io/repository/tancloud/hertzbeat?tab=tags) +- [DockerHub Release](https://hub.docker.com/r/apache/hertzbeat/tags) -Apache HertzBeat(Incubating)'s metadata information is stored in H2 or Mysql, PostgreSQL relational databases, and the collected metric data is stored in time series databases such as TDengine and IotDB. +Apache HertzBeat (incubating)'s metadata information is stored in H2 or Mysql, PostgreSQL relational databases, and the collected metric data is stored in time series databases such as TDengine and IotDB. **You need to save and back up the data files of the database and monitoring templates yml files before upgrading** diff --git a/home/docs/start/victoria-metrics-init.md b/home/docs/start/victoria-metrics-init.md index b0a592f7cdc..327bc4999af 100644 --- a/home/docs/start/victoria-metrics-init.md +++ b/home/docs/start/victoria-metrics-init.md @@ -4,7 +4,7 @@ title: Use Time Series Database VictoriaMetrics to Store Metrics Data (Recommend sidebar_label: Use VictoriaMetrics Store Metrics(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) +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) > It is recommended to use VictoriaMetrics as metrics storage. diff --git a/home/docs/template.md b/home/docs/template.md index 00cf89b2a8e..4bdf785e588 100644 --- a/home/docs/template.md +++ b/home/docs/template.md @@ -4,7 +4,7 @@ title: Monitoring Template Here sidebar_label: Monitoring Template --- -> Apache HertzBeat(Incubating) is an open source, real-time monitoring tool with custom-monitor and agentLess. +> Apache HertzBeat (incubating) is an open source, real-time monitoring tool with custom-monitor and agentLess. > We make protocols such as `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` configurable, and you only need to configure `YML` online to collect any metrics you want. > Do you believe that you can immediately adapt a new monitoring type such as K8s or Docker just by configuring online? diff --git a/home/docusaurus.config.js b/home/docusaurus.config.js index 321d94c1093..f5fef68597c 100644 --- a/home/docusaurus.config.js +++ b/home/docusaurus.config.js @@ -70,6 +70,11 @@ module.exports = { position: 'left', to: '/blog/', }, + { + label: 'download', + position: 'left', + to: '/docs/download', + }, { label: 'Community', position: 'left', diff --git a/home/i18n/en/code.json b/home/i18n/en/code.json index 976def7bda1..bdc5f8f778a 100644 --- a/home/i18n/en/code.json +++ b/home/i18n/en/code.json @@ -263,13 +263,13 @@ "message": "Makes protocols such as Http, Jmx, Ssh, Snmp, Jdbc configurable, you can collect any metrics by simply configuring the yml online. {br} High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration. {br} Flexible threshold rules and timely notifications delivered via discord slack email webhook more." }, "opensource-content": { - "message": "Apache HertzBeat(Incubating)'s stand-alone and cluster version code are all open source, unlimited and anyone who are interested in it are very welcome to contribute. No matter how small the contribution is, whether it is a document code or a typo, we respect everyone and learn and grow together. {br} Hope that the code we participate in can be deployed to thousands of machines in this world.{github}" + "message": "Apache HertzBeat (incubating)'s stand-alone and cluster version code are all open source, unlimited and anyone who are interested in it are very welcome to contribute. No matter how small the contribution is, whether it is a document code or a typo, we respect everyone and learn and grow together. {br} Hope that the code we participate in can be deployed to thousands of machines in this world.{github}" }, "slogan": { "message": "Open Source Real-time Monitoring System" }, "Who uses HertzBeat?": { - "message": "Who uses Apache HertzBeat (Incubating)?" + "message": "Who uses Apache HertzBeat (incubating)?" }, "theme.admonition.note": { "message": "note", @@ -490,7 +490,7 @@ "description": "The title of the tag list page" }, "team.name": { - "message": "Apache HertzBeat(Incubating) Team" + "message": "Apache HertzBeat (incubating) Team" }, "team.desc": { "message": "The HertzBeat team is composed of contributors from various fields around the world. We embrace the community philosophy of openness and collaboration, welcoming👏 more people to join us and grow together with the community." diff --git a/home/i18n/en/docusaurus-plugin-content-docs/current.json b/home/i18n/en/docusaurus-plugin-content-docs/current.json index 0fa2c1212e7..1e604345451 100644 --- a/home/i18n/en/docusaurus-plugin-content-docs/current.json +++ b/home/i18n/en/docusaurus-plugin-content-docs/current.json @@ -106,5 +106,9 @@ "sidebar.docs.category.Community": { "message": "Community", "description": "The label for category Community in sidebar docs" + }, + "sidebar.docs.category.Network": { + "message": "Network", + "description": "The label for category Network in sidebar docs" } } diff --git a/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/docker-deploy.md b/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/docker-deploy.md index 4ba776601d5..71beb5fb87f 100644 --- a/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/docker-deploy.md +++ b/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/docker-deploy.md @@ -15,9 +15,9 @@ sidebar_label: Install via Docker ``` 2. pull HertzBeat Docker mirror - you can look up the mirror version TAG in [official mirror repository](https://hub.docker.com/r/tancloud/hertzbeat/tags) + you can look up the mirror version TAG in [official mirror repository](https://hub.docker.com/r/apache/hertzbeat/tags) ``` - $ docker pull tancloud/hertzbeat + $ docker pull apache/hertzbeat ``` 3. Configure HertzBeat's configuration file(optional) Create application.yml in the host directory，eg:/opt/application.yml @@ -173,7 +173,7 @@ $ docker run -d -p 1157:1157 \ -v /opt/logs:/opt/hertzbeat/logs \ -v /opt/application.yml:/opt/hertzbeat/config/application.yml \ -v /opt/sureness.yml:/opt/hertzbeat/config/sureness.yml \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` This command starts a running HertzBeat Docker container, and the container port 1157 is mapped to the host machine 1157. If existing processes on the host use the port, please modify host mapped port. @@ -186,7 +186,7 @@ $ docker run -d -p 1157:1157 \ - `-v /opt/application.yml:/opt/hertzbeat/config/application.yml` : (optional，if you don't have a need,just delete it) Mount the local configuration file into the container which has been modified in the previous step, namely using the local configuration file to cover container configuration file. We need to modify MYSQL, TDengine configuration information in the configuration file to connect to an external service. - `-v /opt/sureness.yml:/opt/hertzbeat/config/sureness.yml` : (optional，if you don't have a need,just delete it) Mount account configuration file modified in the previous step into the container. Delete this command parameters if have no modify account needs. - `--name hertzbeat` : Naming container name hertzbeat - - `tancloud/hertzbeat` : Use the pulled latest HertzBeat official application mirror to start the container. version can be looked up in [official mirror repository](https://hub.docker.com/r/tancloud/hertzbeat/tags) + - `apache/hertzbeat` : Use the pulled latest HertzBeat official application mirror to start the container. version can be looked up in [official mirror repository](https://hub.docker.com/r/apache/hertzbeat/tags) 7. Begin to explore 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/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/quickstart.md b/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/quickstart.md index 508bdcb4202..43115358593 100644 --- a/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/quickstart.md +++ b/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/quickstart.md @@ -14,7 +14,7 @@ sidebar_label: Quick Start ##### 1：Install quickly via docker -1. Just one command to get started: `docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +1. Just one command to get started: `docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 2. Access `localhost:1157` to start, default account: `admin/hertzbeat` diff --git a/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/sslcert-practice.md b/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/sslcert-practice.md index da899ed3afe..6fe9427aed3 100644 --- a/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/sslcert-practice.md +++ b/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/start/sslcert-practice.md @@ -23,7 +23,7 @@ gitee: https://gitee.com/hertzbeat/hertzbeat 2. The `docker` environment can be installed with just one command -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 3. After the installation is successful, the browser can access `localhost:1157` to start, the default account password is `admin/hertzbeat` diff --git a/home/i18n/en/docusaurus-theme-classic/navbar.json b/home/i18n/en/docusaurus-theme-classic/navbar.json index cf2d929206b..9ecc69e3e4a 100644 --- a/home/i18n/en/docusaurus-theme-classic/navbar.json +++ b/home/i18n/en/docusaurus-theme-classic/navbar.json @@ -146,5 +146,9 @@ "item.label.Thanks": { "message": "Thanks", "description": "Navbar item with label Thanks" + }, + "item.label.download": { + "message": "Download", + "description": "Navbar item with label download" } } diff --git a/home/i18n/zh-cn/code.json b/home/i18n/zh-cn/code.json index 85a4cd1eadf..93594945004 100644 --- a/home/i18n/zh-cn/code.json +++ b/home/i18n/zh-cn/code.json @@ -437,7 +437,7 @@ "message": "将 Http,Jmx,Ssh,Snmp,Jdbc 等协议规范可配置模版化，只需在线配置YML就可自定义监控指标。{br} 高性能，支持多采集器集群横向扩展，支持多隔离网络监控，云边协同。{br}自由的告警阈值规则，邮箱，短信，钉钉，企业微信，飞书，Webhook等消息及时送达。{br} 您相信只需配置下就能适配新K8s监控类型吗？" }, "opensource-content": { - "message": "Apache HertzBeat(Incubating) 的单机集群版全开源，基于 Apache2.0 License。{br}欢迎任何对此有兴趣的同学参与其中，贡献不分大小，无论是文档代码或者错别字，我们尊重每一位同学，一起学习进步成长。{br}希望我们参与的代码能被部署到全球成千上万机器上。{github}" + "message": "Apache HertzBeat (incubating) 的单机集群版全开源，基于 Apache2.0 License。{br}欢迎任何对此有兴趣的同学参与其中，贡献不分大小，无论是文档代码或者错别字，我们尊重每一位同学，一起学习进步成长。{br}希望我们参与的代码能被部署到全球成千上万机器上。{github}" }, "slogan": { "message": "易用友好的开源实时监控系统" @@ -464,7 +464,7 @@ "message": "快速开始" }, "Who uses HertzBeat?": { - "message": "谁在使用 Apache HertzBeat (Incubating)" + "message": "谁在使用 Apache HertzBeat (incubating)" }, "Support HertzBeat": { "message": "Support HertzBeat" @@ -493,7 +493,7 @@ "description": "The title of the tag list page" }, "team.name": { - "message": "Apache HertzBeat(Incubating) 团队" + "message": "Apache HertzBeat (incubating) 团队" }, "team.desc": { "message": "HertzBeat 团队由来自全球各个领域的贡献者组成。践行 开放，协作 的社区理念，欢迎👏更多的人加入我们，和社区一同成长。" diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-06-19-hertzbeat-v1.1.0.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-06-19-hertzbeat-v1.1.0.md index 40c15055ed4..89209a08958 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-06-19-hertzbeat-v1.1.0.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-06-19-hertzbeat-v1.1.0.md @@ -12,7 +12,7 @@ tags: [opensource] **官网: [hertzbeat.com](https://hertzbeat.com) | [tancloud.cn](https://tancloud.cn)** 大家好，HertzBeat v1.1.0 发布啦！这个版本我们支持了SNMP协议，并使用SNMP协议监控支持了windwos操作系统的应用监控。 -另一个重大变更是我们默认使用了H2数据库来替换MYSQL数据库作为存储，来方便使用者们的安装部署，现在只需要一条docker命令即可安装体验hertzbeat ： `docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +另一个重大变更是我们默认使用了H2数据库来替换MYSQL数据库作为存储，来方便使用者们的安装部署，现在只需要一条docker命令即可安装体验hertzbeat ： `docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Let's Try It! 感谢hertzbeat贡献者们的贡献！👍👍 @@ -65,7 +65,7 @@ Have Fun! Home: hertzbeat.com | tancloud.cn Hi guys! HertzBeat v1.1.0 is coming. This version we support snmp protocol and use snmp to collect windows metrics. -Another major change is that we use the H2 database by default to replace the MYSQL database as storage to facilitate the installation and deployment of users. Now only one docker command is needed to install and experience hertzbeat： `docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +Another major change is that we use the H2 database by default to replace the MYSQL database as storage to facilitate the installation and deployment of users. Now only one docker command is needed to install and experience hertzbeat： `docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Let's Try It! Thanks to the contributors! 👍👍 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-06-22-one-step-up.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-06-22-one-step-up.md index e89e7274c8a..8cc1ad48fe9 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-06-22-one-step-up.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-06-22-one-step-up.md @@ -12,7 +12,7 @@ tags: [opensource] **官网: [hertzbeat.com](https://hertzbeat.com) | [tancloud.cn](https://tancloud.cn)** 大家好，HertzBeat v1.1.0 发布啦！这个版本我们支持了SNMP协议，并使用SNMP协议监控支持了windwos操作系统的应用监控。 -另一个重大变更是我们默认使用了H2数据库来替换MYSQL数据库作为存储，来方便使用者们的安装部署，现在只需要一条docker命令即可安装体验hertzbeat ： `docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +另一个重大变更是我们默认使用了H2数据库来替换MYSQL数据库作为存储，来方便使用者们的安装部署，现在只需要一条docker命令即可安装体验hertzbeat ： `docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Let's Try It! 感谢hertzbeat贡献者们的贡献！👍👍 @@ -65,7 +65,7 @@ Have Fun! Home: hertzbeat.com | tancloud.cn Hi guys! HertzBeat v1.1.0 is coming. This version we support snmp protocol and use snmp to collect windows metrics. -Another major change is that we use the H2 database by default to replace the MYSQL database as storage to facilitate the installation and deployment of users. Now only one docker command is needed to install and experience hertzbeat： `docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +Another major change is that we use the H2 database by default to replace the MYSQL database as storage to facilitate the installation and deployment of users. Now only one docker command is needed to install and experience hertzbeat： `docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Let's Try It! Thanks to the contributors! 👍👍 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-07-10-hertzbeat-v1.1.1.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-07-10-hertzbeat-v1.1.1.md index 3674cacaa66..3768024c848 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-07-10-hertzbeat-v1.1.1.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-07-10-hertzbeat-v1.1.1.md @@ -14,7 +14,7 @@ tags: [opensource] 大家好，HertzBeat v1.1.1 发布啦！这个版本带来了自定义监控增强，采集指标数据可以作为变量赋值给下一个采集。修复了若干bug，提升整体稳定性。 只需要一条docker命令即可安装体验hertzbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 感谢hertzbeat贡献者们的贡献！👍👍 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-04-hertzbeat-v1.1.3.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-04-hertzbeat-v1.1.3.md index 8948486a43d..affc90b5c34 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-04-hertzbeat-v1.1.3.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-04-hertzbeat-v1.1.3.md @@ -12,7 +12,7 @@ Home: hertzbeat.com | tancloud.cn Hi guys! HertzBeat v1.1.3 is coming. This version supports kafka monitor, ssl certificate expired monitor and more. Fixed several bugs and improved the overall stable usability. Only one docker command is needed to install and experience hertzbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the contributors! 👍👍 @@ -45,7 +45,7 @@ Have Fun! 大家好，HertzBeat v1.1.3 发布啦！这个版本支持了apache kafka监控，SSL证书过期监控等。修复了若干bug，提升整体稳定性。 只需要一条docker命令即可安装体验hertzbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 感谢hertzbeat贡献者们的贡献！👍👍 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-10-ssl-practice.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-10-ssl-practice.md index cc994b5e58f..d7f06703c97 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-10-ssl-practice.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-10-ssl-practice.md @@ -28,7 +28,7 @@ gitee: https://gitee.com/hertzbeat/hertzbeat 2. `docker` 环境仅需一条命令即可安装 -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 3. 安装成功浏览器访问 `localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-10-08-hertzbeat-v1.2.0.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-10-08-hertzbeat-v1.2.0.md index 750328a6c4e..38541e27286 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-10-08-hertzbeat-v1.2.0.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-10-08-hertzbeat-v1.2.0.md @@ -14,7 +14,7 @@ Home: hertzbeat.com | tancloud.cn Hi guys! HertzBeat v1.2.0 is coming. This version supports more powerful mertics collect jsonpath, upgrade springboot version to 2.7.4 , support metrics unit convert display, and more. Fixed several bugs and improved the overall stable usability. Only one docker command is needed to install and experience heartbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the contributors! 👍👍 @Ceilzcx @Privauto @VampireAchao @DreamGirl524 @CharlieXCL @emrys-he @SxLiuYu @tomsun28 @@ -83,7 +83,7 @@ spring: 大家好，HertzBeat v1.2.0 发布啦！这个版本支持了更强大的jsonpath去采集自定义监控指标，将springboot版本升级到2.7，支持指标单位的提取转换展示等。修复了若干bug，提升整体稳定性。 只需要一条docker命令即可安装体验heartbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 感谢hertzbeat贡献者们的贡献！👍👍 @Ceilzcx @Privauto @VampireAchao @DreamGirl524 @CharlieXCL @emrys-he @SxLiuYu @tomsun28 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-11-28-hertzbeat-v1.2.2.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-11-28-hertzbeat-v1.2.2.md index 19544174dd8..050f6e344ca 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-11-28-hertzbeat-v1.2.2.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-11-28-hertzbeat-v1.2.2.md @@ -14,7 +14,7 @@ Hi guys! HertzBeat v1.2.2 is coming. This release brings significant features. T Let's Try It Now! Only one docker command is needed to install and experience heartbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the contributors! 👍👍 @@ -63,7 +63,7 @@ Have Fun! 大家好，HertzBeat v1.2.2发布啦！这个版本带来个超多重大更新，我们支持了对云原生kubernets, docker的监控，支持了对springboot应用, nacos注册发现中心，达梦数据库，opengauss数据库等的指标监控。我们也引入了一个实验性特性，用户可以使用promethues promql 从promethues server拿取指标数据作为hertzbeat自定义监控指标数据。当然我们也新增了多个测试用户覆盖，修复了多个BUG。还有个很多用户想要的更新，我们新增了对linux监控的top10 cpu 内存利用率的进程监控指标。有个这个指标，我们就可以干很多事情。比如监控某个进程CPU异常，内存爆满啥的。快来试试吧！ 只需要一条docker命令即可安装体验heartbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 感谢hertzbeat贡献者们的贡献！👍👍 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-12-28-hertzbeat-v1.2.3.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-12-28-hertzbeat-v1.2.3.md index 484115c01c0..2adb7f3362f 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-12-28-hertzbeat-v1.2.3.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-12-28-hertzbeat-v1.2.3.md @@ -16,7 +16,7 @@ Hi guys! HertzBeat v1.2.3 is coming. This release we support prometheus exporter Let's Try It Now! Only one docker command is needed to install and experience heartbeat： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` Thanks to the contributors! 👍👍 @@ -62,7 +62,7 @@ Have Fun! 大家好，HertzBeat v1.2.3发布啦！这个版本带来了重大更新，我们支持了对prometheus exporter协议监控，用户可以很方便的使用hertzbeat来适配监控prometheus exporter. 基于这个能力，这个版本我们也支持了对apache shenyu, apache iotdb的指标监控。我们更新了UI布局，修复了多个BUG，也支持了短信通知。快来体验下吧! 只需要一条docker命令即可安装体验heartbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 感谢hertzbeat贡献者们的贡献！👍👍 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-01-05-monitor-iotdb.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-01-05-monitor-iotdb.md index fb8ccb3841d..95283ff6ada 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-01-05-monitor-iotdb.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-01-05-monitor-iotdb.md @@ -131,6 +131,6 @@ HertzBeat Github: https://github.com/apache/hertzbeat **欢迎了解使用Star支持哦！** 只需要一条docker命令即可安装体验heartbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 注意⚠️HertzBeat v1.2.3 版本支持 IoTDB v0.12 v0.13, 由于其v1.0刚发布, 暂未对此版本全部指标兼容。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-01-08-monitor-shenyu.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-01-08-monitor-shenyu.md index dd534c881c3..d8a2b6ca37b 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-01-08-monitor-shenyu.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-01-08-monitor-shenyu.md @@ -165,4 +165,4 @@ HertzBeat Github: https://github.com/apache/hertzbeat **欢迎了解使用Star支持哦！** 只需要一条docker命令即可安装体验heartbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-02-monitor-dynamic-tp.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-02-monitor-dynamic-tp.md index de3291d6338..16c8464fb36 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-02-monitor-dynamic-tp.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-02-monitor-dynamic-tp.md @@ -177,4 +177,4 @@ HertzBeat Github: https://github.com/apache/hertzbeat **欢迎了解使用Star支持哦！** 只需要一条docker命令即可安装体验heartbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-11-monitor-mysql.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-11-monitor-mysql.md index 8068636d32a..df5b379f995 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-11-monitor-mysql.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-11-monitor-mysql.md @@ -128,4 +128,4 @@ HertzBeat Github: https://github.com/apache/hertzbeat > 只需要一条docker命令即可安装体验heartbeat: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-15-monitor-linux.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-15-monitor-linux.md index 9c7c2cb8dcf..3b491e6fe48 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-15-monitor-linux.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-02-15-monitor-linux.md @@ -185,7 +185,7 @@ Github: https://github.com/apache/hertzbeat > 只需要一条docker命令即可安装体验heartbeat: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` ## What is HertzBeat? diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-03-15-hertzbeat-v1.3.0.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-03-15-hertzbeat-v1.3.0.md index bb62e0d5fd2..a7843b11337 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-03-15-hertzbeat-v1.3.0.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-03-15-hertzbeat-v1.3.0.md @@ -53,7 +53,7 @@ keywords: [开源监控系统, 告警系统, Linux监控] 只需要一条docker命令即可安装体验heartbeat -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 感谢hertzbeat贡献者们的贡献！👍👍 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-03-22-monitor-springboot2.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-03-22-monitor-springboot2.md index 99db76c75c1..3c05f91b58f 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-03-22-monitor-springboot2.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-03-22-monitor-springboot2.md @@ -174,7 +174,7 @@ management: > 只需要一条docker命令即可安装体验heartbeat: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` ## 更强大 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-05-09-hertzbeat-v1.3.1.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-05-09-hertzbeat-v1.3.1.md index f1e4b0095f6..8cf642bc3a4 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-05-09-hertzbeat-v1.3.1.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-05-09-hertzbeat-v1.3.1.md @@ -41,7 +41,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 支持监控EulerOS指标和SpringBoot3指标。修复若干BUG，完善了文档，重构了代码，提高了整体的稳定可用性还有更多新功能欢迎探索！快来体验下吧! 只需要一条docker命令即可安装体验hertzbeat ： -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` ## 升级注意⚠️. diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-05-11-greptimedb-store.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-05-11-greptimedb-store.md index ef04cdf481d..6035efe29ed 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-05-11-greptimedb-store.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-05-11-greptimedb-store.md @@ -70,7 +70,7 @@ $ docker run -d -p 1157:1157 \ -v /opt/data:/opt/hertzbeat/data \ -v /opt/application.yml:/opt/hertzbeat/config/application.yml \ --restart=always \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` - `-v /opt/data:/opt/hertzbeat/data` : (可选，数据持久化)重要⚠️ 挂载H2数据库文件到本地主机，保证数据不会因为容器的创建删除而丢失 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-07-05-hertzbeat-v1.3.2.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-07-05-hertzbeat-v1.3.2.md index 2427dbdcb26..81d063c94af 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-07-05-hertzbeat-v1.3.2.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-07-05-hertzbeat-v1.3.2.md @@ -49,7 +49,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 只需要一条docker命令即可安装体验hertzbeat: -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 若dockerhub网络超时，可以使用下面命令: `docker run -d -p 1157:1157 --name hertzbeat quay.io/tancloud/hertzbeat` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-08-14-hertzbeat-v1.4.0.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-08-14-hertzbeat-v1.4.0.md index c227893af07..97126e42bd4 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-08-14-hertzbeat-v1.4.0.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-08-14-hertzbeat-v1.4.0.md @@ -81,7 +81,7 @@ HertzBeat 提供云边协同能力，可以在多个隔离网络部署边缘采 1. `docker` 环境仅需一条命令即可开始 -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```或者使用 quay.io (若 dockerhub 网络链接超时)``` @@ -92,7 +92,7 @@ HertzBeat 提供云边协同能力，可以在多个隔离网络部署边缘采 3. 部署采集器集群 ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_IP=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_IP=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。 - `-e MANAGER_IP=127.0.0.1` : 配置连接主HertzBeat服务的对外IP。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-09-26-hertzbeat-v1.4.1.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-09-26-hertzbeat-v1.4.1.md index d6743a89d90..25ae9bb91f3 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-09-26-hertzbeat-v1.4.1.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-09-26-hertzbeat-v1.4.1.md @@ -74,7 +74,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 1. `docker` 环境仅需一条命令即可开始 -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```或者使用 quay.io (若 dockerhub 网络链接超时)``` @@ -85,7 +85,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 3. 部署采集器集群 ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。 - `-e MANAGER_HOST=127.0.0.1` : 配置连接主HertzBeat服务的对外IP。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-11-12-hertzbeat-v1.4.2.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-11-12-hertzbeat-v1.4.2.md index 9da4c0fa8de..7aec4a52016 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-11-12-hertzbeat-v1.4.2.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-11-12-hertzbeat-v1.4.2.md @@ -50,7 +50,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 1. `docker` 环境仅需一条命令即可开始 -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```或者使用 quay.io (若 dockerhub 网络链接超时)``` @@ -61,7 +61,7 @@ keywords: [open source monitoring system, alerting system, Linux monitoring] 3. 部署采集器集群 ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。 - `-e MANAGER_HOST=127.0.0.1` : 配置连接主HertzBeat服务的对外IP。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-12-11-hertzbeat-v1.4.3.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-12-11-hertzbeat-v1.4.3.md index 7ad6103d0c5..285097da988 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-12-11-hertzbeat-v1.4.3.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2023-12-11-hertzbeat-v1.4.3.md @@ -43,7 +43,7 @@ keywords: [open source monitoring system, alerting system] 1. `docker` 环境仅需一条命令即可开始 -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```或者使用 quay.io (若 dockerhub 网络链接超时)``` @@ -54,7 +54,7 @@ keywords: [open source monitoring system, alerting system] 3. 部署采集器集群 ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。 - `-e MANAGER_HOST=127.0.0.1` : 配置连接主HertzBeat服务的对外IP。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-01-18-hertzbeat-v1.4.4.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-01-18-hertzbeat-v1.4.4.md index 4fc00296e1d..6d60f9bb1ee 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-01-18-hertzbeat-v1.4.4.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-01-18-hertzbeat-v1.4.4.md @@ -45,7 +45,7 @@ keywords: [open source monitoring system, alerting system] 1. `docker` 环境仅需一条命令即可开始 -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```或者使用 quay.io (若 dockerhub 网络链接超时)``` @@ -56,7 +56,7 @@ keywords: [open source monitoring system, alerting system] 3. 部署采集器集群 ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。 - `-e MANAGER_HOST=127.0.0.1` : 配置连接主HertzBeat服务的对外IP。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-04-17-to-apache.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-04-17-to-apache.md index 68a113eb958..d34f4b4097d 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-04-17-to-apache.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-04-17-to-apache.md @@ -26,7 +26,7 @@ HertzBeat 于 2022 年 1 月在 Dromara 开源社区正式开源，经过两年 ## 什么是 HertzBeat -[Apache HertzBeat](https://github.com/apache/hertzbeat)(Incubating) 是一个易用友好的开源实时监控告警系统，无需 Agent，高性能集群，兼容 Prometheus，提供强大的自定义监控和状态页构建能力。 +[Apache HertzBeat](https://github.com/apache/hertzbeat) (incubating) 是一个易用友好的开源实时监控告警系统，无需 Agent，高性能集群，兼容 Prometheus，提供强大的自定义监控和状态页构建能力。 ### 特点 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current.json b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current.json index fb4f58e5bd1..3f7336805a1 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current.json +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current.json @@ -110,5 +110,9 @@ "sidebar.docs.category.release": { "message": "发布指南", "description": "The label for category release in sidebar docs" + }, + "sidebar.docs.category.Network": { + "message": "网络", + "description": "The label for category Network in sidebar docs" } } diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-default.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-default.md index 0fbf626bab5..31fe0ac98f7 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-default.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-default.md @@ -3,7 +3,7 @@ id: extend-http-default title: HTTP协议系统默认解析方式 sidebar_label: 系统默认解析方式 --- -> HTTP接口调用获取响应数据后，用 Apache HertzBeat(Incubating) 默认的解析方式去解析响应数据。 +> HTTP接口调用获取响应数据后，用 Apache HertzBeat (incubating) 默认的解析方式去解析响应数据。 **此需接口响应数据结构符合HertzBeat指定的数据结构规则** 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 1daf7a6db8f..769b8d99293 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 @@ -4,7 +4,7 @@ title: 教程一:适配一款基于HTTP协议的监控类型 sidebar_label: 教程一:适配一款HTTP协议监控 --- -通过此教程我们一步一步描述如何在 Apache HertzBeat(Incubating) 监控系统下新增适配一款基于http协议的监控类型。 +通过此教程我们一步一步描述如何在 Apache HertzBeat (incubating) 监控系统下新增适配一款基于http协议的监控类型。 阅读此教程前我们希望您已经从[自定义监控](extend-point)和[http协议自定义](extend-http)了解熟悉了怎么自定义类型，指标，协议等。 @@ -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 5bbfe58cf32..94f49c01f61 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/advanced/extend-http-jsonpath.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-jsonpath.md index 9fd84baa5aa..ae29f265574 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-jsonpath.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-http-jsonpath.md @@ -7,7 +7,7 @@ sidebar_label: JsonPath解析方式 注意⚠️ 响应数据为JSON格式 -**使用JsonPath脚本将响应数据解析成符合 Apache HertzBeat(Incubating) 指定的数据结构规则的数据** +**使用JsonPath脚本将响应数据解析成符合 Apache HertzBeat (incubating) 指定的数据结构规则的数据** #### JsonPath操作符 [JSONPath在线验证](https://www.jsonpath.cn) diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-tutorial.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-tutorial.md index 5b78c61c9bc..6f0292529a0 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-tutorial.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/advanced/extend-tutorial.md @@ -4,7 +4,7 @@ title: 自定义适配一款基于HTTP协议的新监控类型 sidebar_label: 教程案例 --- -通过此教程我们一步一步描述如何在 Apache HertzBeat(Incubating) 系统下自定义新增适配一款基于 http 协议的监控类型。 +通过此教程我们一步一步描述如何在 Apache HertzBeat (incubating) 系统下自定义新增适配一款基于 http 协议的监控类型。 阅读此教程前我们希望您已经从[自定义监控](extend-point)和[http协议自定义](extend-http)了解熟悉了怎么自定义类型，指标，协议等。 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 6601a1b6de6..496d0a7004f 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 @@ -438,13 +438,13 @@ svn commit -m "release for HertzBeat 2.1.0" 发送社区投票邮件需要至少三个`+1`，且无`-1`。 > `Send to`: dev@hertzbeat.apache.org
-> `Title`: [VOTE] Release Apache HertzBeat (Incubating) 2.1.0 rc1
+> `Title`: [VOTE] Release Apache HertzBeat (incubating) 2.1.0 rc1
> `Body`: ``` Hello HertzBeat Community: -This is a call for vote to release Apache HertzBeat(Incubating) version release-2.1.0-RC1. +This is a call for vote to release Apache HertzBeat (incubating) version release-2.1.0-RC1. Apache Streamark - Make stream processing easier! Easy-to-use streaming application development framework and operation platform. @@ -499,13 +499,13 @@ Thanks! 在72小时后，将统计投票结果，并发送投票结果邮件，如下所示。 > `Send to`: dev@hertzbeat.apache.org
-> `Title`: [RESULT][VOTE] Release Apache HertzBeat (Incubating) 2.1.0-rc1
+> `Title`: [RESULT][VOTE] Release Apache HertzBeat (incubating) 2.1.0-rc1
> `Body`: ``` Dear HertzBeat community, -Thanks for your review and vote for "Release Apache HertzBeat (Incubating) 2.1.0-rc1" +Thanks for your review and vote for "Release Apache HertzBeat (incubating) 2.1.0-rc1" I'm happy to announce the vote has passed: @@ -549,14 +549,14 @@ ChunJin Mu > `Send to`: general@incubator.apache.org
> `cc`: dev@hertzbeat.apache.org、tison@apache.org、willem.jiang@gmail.com
-> `Title`: [VOTE] Release Apache HertzBeat(Incubating) 2.1.0-rc1
+> `Title`: [VOTE] Release Apache HertzBeat (incubating) 2.1.0-rc1
> `Body`: ``` Hello Incubator Community: -This is a call for a vote to release Apache HertzBeat(Incubating) version 2.1.0-RC1. -The Apache HertzBeat community has voted on and approved a proposal to release Apache HertzBeat(Incubating) version 2.1.0-RC1. +This is a call for a vote to release Apache HertzBeat (incubating) version 2.1.0-RC1. +The Apache HertzBeat community has voted on and approved a proposal to release Apache HertzBeat (incubating) version 2.1.0-RC1. We now kindly request the Incubator PMC members review and vote on this incubator release. Apache HertzBeat, Make stream processing easier! Easy-to-use streaming application development framework and operation platform. @@ -604,7 +604,7 @@ How to Build: Thanks, -On behalf of Apache HertzBeat(Incubating) community +On behalf of Apache HertzBeat (incubating) community Best, @@ -628,13 +628,13 @@ Chunjin Mu > `Send to`: general@incubator.apache.org
> `cc`: dev@hertzbeat.apache.org、tison@apache.org、willem.jiang@gmail.com
-> `Title`: [RESULT][VOTE] Release Apache HertzBeat(Incubating) 2.1.0-rc1
+> `Title`: [RESULT][VOTE] Release Apache HertzBeat (incubating) 2.1.0-rc1
> `Body`: ``` Hi all, -Thanks for your review and vote for "Release Apache HertzBeat (Incubating) 2.1.0-rc1" +Thanks for your review and vote for "Release Apache HertzBeat (incubating) 2.1.0-rc1" I'm happy to announce the vote has passed: 3 binding votes, no +0 or -1 votes. @@ -740,13 +740,13 @@ release note: https://hertzbeat.apache.org/download/release-note/2.1.0 > `Send to`: general@incubator.apache.org
> `cc`: dev@hertzbeat.apache.org
-> `Title`: [ANNOUNCE] Release Apache HertzBeat (Incubating) 2.1.0
+> `Title`: [ANNOUNCE] Release Apache HertzBeat (incubating) 2.1.0
> `Body`: ``` Hi all, -We are glad to announce the release of Apache HertzBeat(incubating) 2.1.0. +We are glad to announce the release of Apache HertzBeat (incubating) 2.1.0. Once again I would like to express my thanks to your help. Apache HertzBeat(https://hertzbeat.apache.org/) - Make stream processing easier! Easy-to-use streaming application development framework and operation platform. diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/new_pmc_member_process.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/new_pmc_member_process.md index cb7c1089998..4488f1fcfea 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/new_pmc_member_process.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/new_pmc_member_process.md @@ -282,5 +282,5 @@ submission process. This should enable better productivity. A PPMC member helps manage and guide the direction of the project. Thanks, -On behalf of the Apache HertzBeat (Incubating) PPMC +On behalf of the Apache HertzBeat (incubating) PPMC ``` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/download.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/download.md new file mode 100644 index 00000000000..412dd72bec9 --- /dev/null +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/download.md @@ -0,0 +1,33 @@ +--- +id: download +title: 下载 Apache HertzBeat (incubating) +sidebar_label: Download +--- + +> **这里是 Apache HertzBeat (incubating) 官方下载页面。** +> **请再下方表中选择版本下载，推荐使用最新版本。** + +:::tip +- 验证下载版本，请使用相应的哈希（sha512）、签名和[项目发布KEYS](https://downloads.apache.org/incubator/hertzbeat/KEYS)。 +- 检查哈希和签名的方法参考 [如何验证](https://www.apache.org/dyn/closer.cgi#verify)。 +::: + +## 最新版本 + +:::tip +Apache 版本即将到来! +::: + +---- + +## 非 Apache 版本 + +:::tip +这些版本是在 HertzBeat 项目加入 ASF 孵化器之前发布的。 +这些版本没有遵循 ASF 发布流程。 +::: + +| Version | Date | Source | Binary | Release Notes | +|---------|------------|----------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------| +| v1.5.0 | 2024.03.08 | [source](https://github.com/apache/hertzbeat/archive/refs/tags/v1.5.0.zip) | [hertzbeat-1.5.0.tar.gz](https://github.com/dromara/hertzbeat/releases/download/v1.5.0/hertzbeat-1.5.0.tar.gz)
[hertzbeat-collector-1.5.0.tar.gz](https://github.com/dromara/hertzbeat/releases/download/v1.5.0/hertzbeat-collector-1.5.0.tar.gz) | [release note](https://github.com/apache/hertzbeat/releases/tag/v1.5.0) | +| v1.4.4 | 2024.01.11 | [source](https://github.com/apache/hertzbeat/archive/refs/tags/v1.4.4.zip) | [hertzbeat-1.4.4.tar.gz](https://github.com/dromara/hertzbeat/releases/download/v1.4.4/hertzbeat-1.4.4.tar.gz)
[hertzbeat-collector-1.4.4.tar.gz](https://github.com/dromara/hertzbeat/releases/download/v1.4.4/hertzbeat-collector-1.4.4.tar.gz) | [release note](https://github.com/apache/hertzbeat/releases/tag/v1.4.4) | 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 a8b8f74ce24..4faa4312308 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 @@ -11,7 +11,7 @@ slug: / [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/) [![Twitter](https://img.shields.io/twitter/follow/hertzbeat1024?logo=twitter)](https://twitter.com/hertzbeat1024) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139) -[![Docker Pulls](https://img.shields.io/docker/pulls/tancloud/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/tancloud/hertzbeat/general) +[![Docker Pulls](https://img.shields.io/docker/pulls/apache/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/apache/hertzbeat/general) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hertzbeat)](https://artifacthub.io/packages/search?repo=hertzbeat) [![QQ](https://img.shields.io/badge/QQ-630061200-orange)](https://qm.qq.com/q/FltGGGIX2m) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow) @@ -159,7 +159,7 @@ HertzBeat 使用这些已有的标准协议或规范，将他们抽象规范可 ## 即刻体验一波 -Docker 环境下运行一条命令即可：`docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat` +Docker 环境下运行一条命令即可：`docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat` 浏览器访问 `http://localhost:1157` 默认账户密码 `admin/hertzbeat` ### 登陆页面 @@ -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/account-modify.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/account-modify.md index 755061e0259..710ae8cbee5 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/account-modify.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/account-modify.md @@ -6,7 +6,7 @@ sidebar_label: 更新账户和密钥 ## 更新账户 -Apache HertzBeat(Incubating) 默认内置三个用户账户,分别为 admin/hertzbeat tom/hertzbeat guest/hertzbeat +Apache HertzBeat (incubating) 默认内置三个用户账户,分别为 admin/hertzbeat tom/hertzbeat guest/hertzbeat 若需要新增删除修改账户或密码，可以通过配置 `sureness.yml` 实现，若无此需求可忽略此步骤 修改位于安装目录下的 `/hertzbeat/config/sureness.yml` 的配置文件，docker环境目录为`opt/hertzbeat/config/sureness.yml`，建议提前挂载映射 配置文件内容参考 项目仓库[/script/sureness.yml](https://github.com/apache/hertzbeat/blob/master/script/sureness.yml) 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 516ce4bf5ab..89cb46ef951 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 @@ -4,7 +4,7 @@ title: 通过 Docker 方式安装 HertzBeat sidebar_label: Docker方式部署 --- -> 推荐使用 Docker 部署 Apache HertzBeat(Incubating) +> 推荐使用 Docker 部署 Apache HertzBeat (incubating) 1. 下载安装Docker环境 Docker 工具自身的下载请参考以下资料： @@ -18,12 +18,12 @@ sidebar_label: Docker方式部署 ``` 2. 拉取HertzBeat Docker镜像 - 镜像版本TAG可查看 [dockerhub 官方镜像仓库](https://hub.docker.com/r/tancloud/hertzbeat/tags) - 或者使用 [quay.io 镜像仓库](https://quay.io/repository/tancloud/hertzbeat) + 镜像版本TAG可查看 [dockerhub 官方镜像仓库](https://hub.docker.com/r/apache/hertzbeat/tags) + 或者使用 [quay.io 镜像仓库](https://quay.io/repository/apache/hertzbeat) ```shell - $ docker pull tancloud/hertzbeat - $ docker pull tancloud/hertzbeat-collector + $ docker pull apache/hertzbeat + $ docker pull apache/hertzbeat-collector ``` 若网络超时或者使用 ```shell @@ -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容器 @@ -73,7 +73,7 @@ $ docker run -d -p 1157:1157 -p 1158:1158 \ -v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml \ -v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml \ --restart=always \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` 这条命令启动一个运行HertzBeat的Docker容器，并且将容器的1157端口映射到宿主机的1157端口上。若宿主机已有进程占用该端口，则需要修改主机映射端口。 @@ -96,7 +96,7 @@ $ docker run -d -p 1157:1157 -p 1158:1158 \ $ docker update --restart=always hertzbeat ``` - - `tancloud/hertzbeat` : 使用拉取最新的的HertzBeat官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat`代替。** + - `apache/hertzbeat` : 使用拉取最新的的HertzBeat官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat`代替。** 7. 开始探索HertzBeat 浏览器访问 http://ip:1157/ 即可开始探索使用HertzBeat，默认账户密码 admin/hertzbeat。 @@ -109,7 +109,7 @@ $ docker run -d \ -e MODE=public \ -e MANAGER_HOST=127.0.0.1 \ -e MANAGER_PORT=1158 \ - --name hertzbeat-collector tancloud/hertzbeat-collector + --name hertzbeat-collector apache/hertzbeat-collector ``` 这条命令启动一个运行HertzBeat采集器的Docker容器，并直连上了HertzBeat主服务节点。 @@ -120,7 +120,7 @@ $ docker run -d \ - `-e MANAGER_PORT=1158` : (可选) 设置连接的主HertzBeat服务地址端口，默认 1158. - `-v $(pwd)/logs:/opt/hertzbeat-collector/logs` : (可选，不需要可删除)挂载日志文件到本地主机，保证日志不会因为容器的创建删除而丢失，方便查看 - `--name hertzbeat-collector` : 命名容器名称 hertzbeat-collector - - `tancloud/hertzbeat-collector` : 使用拉取最新的的HertzBeat采集器官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat-collector`代替。** + - `apache/hertzbeat-collector` : 使用拉取最新的的HertzBeat采集器官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat-collector`代替。** 8. 浏览器访问主HertzBeat服务 `http://localhost:1157` 查看概览页面即可看到注册上来的新采集器 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 532cf718817..c83f0638605 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 @@ -4,7 +4,7 @@ title: 依赖时序数据库服务GreptimeDB安装初始化 sidebar_label: 使用GreptimeDB存储指标数据(可选) --- -Apache HertzBeat(Incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) +Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) > 我们推荐使用并长期支持 VictoriaMetrics 作为存储。 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 ef9f34b6dff..427f07af423 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 @@ -4,7 +4,7 @@ title: 依赖时序数据库服务InfluxDB安装初始化 sidebar_label: 使用InfluxDB存储指标数据(可选) --- -Apache HertzBeat(Incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) +Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) > 我们推荐使用并长期支持 VictoriaMetrics 作为存储。 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 97f1f84af10..827b54e08c8 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 @@ -4,7 +4,7 @@ title: 依赖时序数据库服务IoTDB安装初始化 sidebar_label: 使用IoTDB存储指标数据(可选) --- -Apache HertzBeat(Incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) +Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) > 我们推荐使用并长期支持 VictoriaMetrics 作为存储。 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 e007677c958..409f8498fc6 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 @@ -3,7 +3,7 @@ id: mysql-change title: 关系型数据库使用 Mysql 替换依赖的 H2 存储系统元数据 sidebar_label: 元数据使用Mysql存储(可选) --- -MYSQL是一款值得信赖的关系型数据库，Apache HertzBeat(Incubating) 除了支持使用默认内置的H2数据库外，还可以切换为使用MYSQL存储监控信息，告警信息，配置信息等结构化关系数据。 +MYSQL是一款值得信赖的关系型数据库，Apache HertzBeat (incubating) 除了支持使用默认内置的H2数据库外，还可以切换为使用MYSQL存储监控信息，告警信息，配置信息等结构化关系数据。 注意⚠️ 使用外置Mysql数据库替换内置H2数据库为可选项，但建议生产环境配置，以提供更好的性能 @@ -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 a0f66a9ca3b..b5f9d7e0456 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 @@ -3,12 +3,11 @@ id: package-deploy title: 通过安装包安装 HertzBeat sidebar_label: 安装包方式部署 --- -> Apache HertzBeat(Incubating) 支持在Linux Windows Mac系统安装运行，CPU支持X86/ARM64。 +> Apache HertzBeat (incubating) 支持在Linux Windows Mac系统安装运行，CPU支持X86/ARM64。 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) 仓库下载 + - [下载页面](/docs/download) 2. 配置HertzBeat的配置文件(可选) 解压安装包到主机 eg: /opt/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`到规划的另一台部署主机上 [下载页面](/docs/download) - 配置采集器的配置文件 `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 10b497266f4..3d554d84f0a 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 @@ -3,7 +3,7 @@ id: postgresql-change title: 关系型数据库使用 PostgreSQL 替换依赖的 H2 存储系统元数据 sidebar_label: 元数据使用PostgreSQL存储(可选) --- -PostgreSQL是一个功能强大，开源的关系型数据库管理系统（RDBMS）。Apache HertzBeat(Incubating) 除了支持使用默认内置的H2数据库外，还可以切换为使用PostgreSQL存储监控信息，告警信息，配置信息等结构化关系数据。 +PostgreSQL是一个功能强大，开源的关系型数据库管理系统（RDBMS）。Apache HertzBeat (incubating) 除了支持使用默认内置的H2数据库外，还可以切换为使用PostgreSQL存储监控信息，告警信息，配置信息等结构化关系数据。 注意⚠️ 使用外置PostgreSQL数据库替换内置H2数据库为可选项，但建议生产环境配置，以提供更好的性能 @@ -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 0a6c1861454..c0b79c8a071 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 @@ -6,7 +6,7 @@ sidebar_label: 快速开始 ### 🐕 开始使用 -- 如果您是想将 Apache HertzBeat(Incubating) 部署到本地搭建监控系统，请参考下面的部署文档进行操作。 +- 如果您是想将 Apache HertzBeat (incubating) 部署到本地搭建监控系统，请参考下面的部署文档进行操作。 ### 🍞 HertzBeat安装 @@ -16,7 +16,7 @@ sidebar_label: 快速开始 1. `docker` 环境仅需一条命令即可开始 -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```或者使用 quay.io (若 dockerhub 网络链接超时)``` @@ -27,7 +27,7 @@ sidebar_label: 快速开始 3. 部署采集器集群(可选) ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。 - `-e MODE=public` : 配置运行模式(public or private), 公共集群模式或私有云边模式。 @@ -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/rainbond-deploy.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/rainbond-deploy.md index b165f030a79..5da0679d327 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/rainbond-deploy.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/rainbond-deploy.md @@ -4,7 +4,7 @@ title: 使用 Rainbond 部署 HertzBeat sidebar_label: Rainbond方式部署 --- -如果你不熟悉 Kubernetes，想在 Kubernetes 中安装 Apache HertzBeat(Incubating)，可以使用 Rainbond 来部署。Rainbond 是一个基于 Kubernetes 构建的云原生应用管理平台，可以很简单的将你的应用部署到 Kubernetes中。 +如果你不熟悉 Kubernetes，想在 Kubernetes 中安装 Apache HertzBeat (incubating)，可以使用 Rainbond 来部署。Rainbond 是一个基于 Kubernetes 构建的云原生应用管理平台，可以很简单的将你的应用部署到 Kubernetes中。 ## 前提 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 631c8c6a7b3..62cd3e157a3 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 @@ -11,21 +11,18 @@ sidebar_label: 使用案例 #### HertzBeat 是什么 -Apache HertzBeat(Incubating) 一个拥有强大自定义监控能力，无需Agent的实时监控工具。网站监测，PING连通性，端口可用性，数据库，操作系统，中间件，API监控，阈值告警，告警通知(邮件微信钉钉飞书)。 +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 -1.如果不想安装可以直接使用云服务 [TanCloud探云 console.tancloud.cn](https://console.tancloud.cn) +1. `docker` 环境仅需一条命令即可安装 -2. `docker` 环境仅需一条命令即可安装 +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` - -3. 安装成功浏览器访问 `localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` +2. 安装成功浏览器访问 `localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` #### 监控SSL证书 @@ -100,5 +97,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/tdengine-init.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/tdengine-init.md index f5c84eeb5c2..7fcd8fd460e 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 @@ -4,7 +4,7 @@ title: 依赖时序数据库服务TDengine安装初始化 sidebar_label: 使用TDengine存储指标数据(可选) --- -Apache HertzBeat(Incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) +Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) > 我们推荐使用并长期支持 VictoriaMetrics 作为存储。 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 e7b22647940..0effd531384 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 @@ -4,12 +4,11 @@ title: HertzBeat 新版本更新指引 sidebar_label: 版本更新指引 --- -**Apache HertzBeat(Incubating) 的发布版本列表** +**Apache HertzBeat (incubating) 的发布版本列表** +- [下载页面](/docs/download) - [Github Release](https://github.com/apache/hertzbeat/releases) -- [Gitee Release](https://gitee.com/hertzbeat/hertzbeat/releases) -- [DockerHub Release](https://hub.docker.com/r/tancloud/hertzbeat/tags) -- [Docker quay.io Release](https://quay.io/repository/tancloud/hertzbeat?tab=tags) +- [DockerHub Release](https://hub.docker.com/r/apache/hertzbeat/tags) HertzBeat 的元数据信息保存在 H2 或 Mysql, PostgreSQL 关系型数据库内, 采集指标数据存储在 TDengine, IotDB 等时序数据库内。 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 5b20fa12a36..7668cefcaf3 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 @@ -4,7 +4,7 @@ title: 依赖时序数据库服务VictoriaMetrics安装初始化 sidebar_label: 使用VictoriaMetrics存储指标数据(推荐) --- -Apache HertzBeat(Incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) +Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置) > 我们推荐使用并长期支持 VictoriaMetrics 作为存储。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/template.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/template.md index 0494ef0fdae..55d89c73cba 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/template.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/template.md @@ -4,7 +4,7 @@ title: 监控模版中心 sidebar_label: 监控模版 --- -> Apache HertzBeat(Incubating) 是一个拥有强大自定义监控能力，无需 Agent 的开源实时监控告警工具。 +> Apache HertzBeat (incubating) 是一个拥有强大自定义监控能力，无需 Agent 的开源实时监控告警工具。 > 我们将`Http, Jmx, Ssh, Snmp, Jdbc, Prometheus`等协议规范可配置化，您只需在浏览器配置`YML`就能使用这些协议去自定义采集任何您想要的指标。 > 您相信只需配置下就能立刻适配一款`K8s`或`Docker`等新的监控类型吗？ diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/docker-deploy.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/docker-deploy.md index e604be7dc6b..1d20eff6ad5 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/docker-deploy.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/docker-deploy.md @@ -18,11 +18,11 @@ sidebar_label: Docker方式部署 ``` 2. 拉取HertzBeat Docker镜像 - 镜像版本TAG可查看 [dockerhub 官方镜像仓库](https://hub.docker.com/r/tancloud/hertzbeat/tags) - 或者使用 [quay.io 镜像仓库](https://quay.io/repository/tancloud/hertzbeat) + 镜像版本TAG可查看 [dockerhub 官方镜像仓库](https://hub.docker.com/r/apache/hertzbeat/tags) + 或者使用 [quay.io 镜像仓库](https://quay.io/repository/apache/hertzbeat) ```shell - $ docker pull tancloud/hertzbeat + $ docker pull apache/hertzbeat ``` 若网络超时或者使用 ```shell @@ -71,7 +71,7 @@ $ docker run -d -p 1157:1157 \ -v /opt/application.yml:/opt/hertzbeat/config/application.yml \ -v /opt/sureness.yml:/opt/hertzbeat/config/sureness.yml \ --restart=always \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` 这条命令启动一个运行HertzBeat的Docker容器，并且将容器的1157端口映射到宿主机的1157端口上。若宿主机已有进程占用该端口，则需要修改主机映射端口。 @@ -101,7 +101,7 @@ $ docker run -d -p 1157:1157 \ $ docker update --restart=always hertzbeat ``` - - `tancloud/hertzbeat` : 使用拉取最新的的HertzBeat官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat`代替。** + - `apache/hertzbeat` : 使用拉取最新的的HertzBeat官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat`代替。** 7. 开始探索HertzBeat 浏览器访问 http://ip:1157/ 即可开始探索使用HertzBeat，默认账户密码 admin/hertzbeat。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/quickstart.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/quickstart.md index f8e2549e368..1dcfc79f7ee 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/quickstart.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/quickstart.md @@ -55,7 +55,7 @@ $ docker run -d -p 6667:6667 -p 31999:31999 -p 8181:8181 \ 1. `docker` 环境仅需一条命令即可开始 -```docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat``` ```或者使用 quay.io (若 dockerhub 网络链接超时)``` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/sslcert-practice.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/sslcert-practice.md index 1a47bb6c7cc..5b9fc3fce41 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/sslcert-practice.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.3.x/start/sslcert-practice.md @@ -24,7 +24,7 @@ gitee: https://gitee.com/hertzbeat/hertzbeat 2. `docker` 环境仅需一条命令即可安装 -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 3. 安装成功浏览器访问 `localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/introduce.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/introduce.md index ee09c715b88..ac4a9dc2e5e 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/introduce.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/introduce.md @@ -11,7 +11,7 @@ slug: / [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/) [![Twitter](https://img.shields.io/twitter/follow/hertzbeat1024?logo=twitter)](https://twitter.com/hertzbeat1024) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139) -[![Docker Pulls](https://img.shields.io/docker/pulls/tancloud/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/tancloud/hertzbeat/general) +[![Docker Pulls](https://img.shields.io/docker/pulls/apache/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/apache/hertzbeat/general) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hertzbeat)](https://artifacthub.io/packages/search?repo=hertzbeat) [![QQ](https://img.shields.io/badge/QQ-630061200-orange)](https://qm.qq.com/q/FltGGGIX2m) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow) @@ -159,7 +159,7 @@ HertzBeat 使用这些已有的标准协议或规范，将他们抽象规范可 ## 即刻体验一波 -Docker 环境下运行一条命令即可：`docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat` +Docker 环境下运行一条命令即可：`docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat` 浏览器访问 `http://localhost:1157` 默认账户密码 `admin/hertzbeat` ### 登陆页面 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/docker-deploy.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/docker-deploy.md index 6cebbf31de2..c0b963c69e7 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/docker-deploy.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/docker-deploy.md @@ -18,12 +18,12 @@ sidebar_label: Docker方式部署 ``` 2. 拉取HertzBeat Docker镜像 - 镜像版本TAG可查看 [dockerhub 官方镜像仓库](https://hub.docker.com/r/tancloud/hertzbeat/tags) - 或者使用 [quay.io 镜像仓库](https://quay.io/repository/tancloud/hertzbeat) + 镜像版本TAG可查看 [dockerhub 官方镜像仓库](https://hub.docker.com/r/apache/hertzbeat/tags) + 或者使用 [quay.io 镜像仓库](https://quay.io/repository/apache/hertzbeat) ```shell - $ docker pull tancloud/hertzbeat - $ docker pull tancloud/hertzbeat-collector + $ docker pull apache/hertzbeat + $ docker pull apache/hertzbeat-collector ``` 若网络超时或者使用 ```shell @@ -73,7 +73,7 @@ $ docker run -d -p 1157:1157 -p 1158:1158 \ -v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml \ -v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml \ --restart=always \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` 这条命令启动一个运行HertzBeat的Docker容器，并且将容器的1157端口映射到宿主机的1157端口上。若宿主机已有进程占用该端口，则需要修改主机映射端口。 @@ -96,7 +96,7 @@ $ docker run -d -p 1157:1157 -p 1158:1158 \ $ docker update --restart=always hertzbeat ``` - - `tancloud/hertzbeat` : 使用拉取最新的的HertzBeat官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat`代替。** + - `apache/hertzbeat` : 使用拉取最新的的HertzBeat官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat`代替。** 7. 开始探索HertzBeat 浏览器访问 http://ip:1157/ 即可开始探索使用HertzBeat，默认账户密码 admin/hertzbeat。 @@ -109,7 +109,7 @@ $ docker run -d \ -e MODE=public \ -e MANAGER_HOST=127.0.0.1 \ -e MANAGER_PORT=1158 \ - --name hertzbeat-collector tancloud/hertzbeat-collector + --name hertzbeat-collector apache/hertzbeat-collector ``` 这条命令启动一个运行HertzBeat采集器的Docker容器，并直连上了HertzBeat主服务节点。 @@ -120,7 +120,7 @@ $ docker run -d \ - `-e MANAGER_PORT=1158` : (可选) 设置连接的主HertzBeat服务地址端口，默认 1158. - `-v $(pwd)/logs:/opt/hertzbeat-collector/logs` : (可选，不需要可删除)挂载日志文件到本地主机，保证日志不会因为容器的创建删除而丢失，方便查看 - `--name hertzbeat-collector` : 命名容器名称 hertzbeat-collector - - `tancloud/hertzbeat-collector` : 使用拉取最新的的HertzBeat采集器官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat-collector`代替。** + - `apache/hertzbeat-collector` : 使用拉取最新的的HertzBeat采集器官方发布的应用镜像来启动容器,**若使用`quay.io`镜像需用参数`quay.io/tancloud/hertzbeat-collector`代替。** 8. 浏览器访问主HertzBeat服务 `http://localhost:1157` 查看概览页面即可看到注册上来的新采集器 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/quickstart.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/quickstart.md index c16a782e1c9..d63248185ad 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/quickstart.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/quickstart.md @@ -16,7 +16,7 @@ sidebar_label: 快速开始 1. `docker` 环境仅需一条命令即可开始 -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```或者使用 quay.io (若 dockerhub 网络链接超时)``` @@ -27,7 +27,7 @@ sidebar_label: 快速开始 3. 部署采集器集群 ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。 - `-e MODE=public` : 配置运行模式(public or private), 公共集群模式或私有云边模式。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/sslcert-practice.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/sslcert-practice.md index eb61dd4fdc9..9731621b4e9 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/sslcert-practice.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/sslcert-practice.md @@ -24,7 +24,7 @@ gitee: https://gitee.com/hertzbeat/hertzbeat 2. `docker` 环境仅需一条命令即可安装 -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 3. 安装成功浏览器访问 `localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/upgrade.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/upgrade.md index 26ed359373b..a5482f21b2d 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/upgrade.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/upgrade.md @@ -8,8 +8,8 @@ sidebar_label: 版本更新指引 - [Github Release](https://github.com/apache/hertzbeat/releases) - [Gitee Release](https://gitee.com/hertzbeat/hertzbeat/releases) -- [DockerHub Release](https://hub.docker.com/r/tancloud/hertzbeat/tags) -- [Docker quay.io Release](https://quay.io/repository/tancloud/hertzbeat?tab=tags) +- [DockerHub Release](https://hub.docker.com/r/apache/hertzbeat/tags) +- [Docker quay.io Release](https://quay.io/repository/apache/hertzbeat?tab=tags) HertzBeat 的元数据信息保存在 H2 或 Mysql, PostgreSQL 关系型数据库内, 采集指标数据存储在 TDengine, IotDB 等时序数据库内。 diff --git a/home/i18n/zh-cn/docusaurus-theme-classic/navbar.json b/home/i18n/zh-cn/docusaurus-theme-classic/navbar.json index 2bbc672beea..3c2d9f1376c 100644 --- a/home/i18n/zh-cn/docusaurus-theme-classic/navbar.json +++ b/home/i18n/zh-cn/docusaurus-theme-classic/navbar.json @@ -146,5 +146,9 @@ "item.label.team": { "message": "团队", "description": "Navbar item with label team" + }, + "item.label.download": { + "message": "下载", + "description": "Navbar item with label download" } } diff --git a/home/src/constants.js b/home/src/constants.js index 4a430eb37a1..99a65fa121e 100644 --- a/home/src/constants.js +++ b/home/src/constants.js @@ -11,7 +11,7 @@ export const features = [ <> {'docker run -d -p 1157:1157 tancloud/hertzbeat'}, + docker: {'docker run -d -p 1157:1157 apache/hertzbeat'}, console: ( Login Now @@ -66,28 +66,8 @@ export const features = [ export const usersLink = [ - { - img: 'skyworth_logo.png', - alt: 'skyworth', - }, - { - img: 'sc_edu_logo.png', - alt: 'sc_edu_logo', - }, - { - img: 'cmge_logo.png', - alt: 'cmge', - }, - { - img: 'cnsodata_logo.svg', - alt: 'cnsodata', - }, { img: 'tancloud_logo.svg', alt: 'tancloud', - }, - { - img: 'hibobi_logo.svg', - alt: 'hibobi', } ] diff --git a/home/src/pages/components/Sponsor.js b/home/src/pages/components/Sponsor.js index dbb1ac38b57..2cdf5fd204e 100644 --- a/home/src/pages/components/Sponsor.js +++ b/home/src/pages/components/Sponsor.js @@ -16,11 +16,11 @@ export default class Sponsor extends React.Component {

{this.props.headerTitle}

- - {''}/ + + {''}/
-

Postcat

-

开源API管理工具、接口文档、接口测试、Mock

+

xxx

+

xxx
diff --git a/home/src/pages/index.js b/home/src/pages/index.js index 10e82b57a9d..862ed54d2ae 100644 --- a/home/src/pages/index.js +++ b/home/src/pages/index.js @@ -123,11 +123,11 @@ function Home() { style={{ top: '880px', right: '50px', color: '#000033' }} /> {/*who is using*/} -
- - -
+ {/*
*/} + {/* */} + {/* */} + {/*
*/} {features && features.length > 0 && (
{features.map((props, idx) => ( diff --git a/home/static/img/home/0.png b/home/static/img/home/0.png index 8cc2d3996e1..44d2770d6c3 100644 Binary files a/home/static/img/home/0.png and b/home/static/img/home/0.png differ diff --git a/home/static/img/home/1.png b/home/static/img/home/1.png index 4eeb7d2ed22..60da22862dc 100644 Binary files a/home/static/img/home/1.png and b/home/static/img/home/1.png differ diff --git a/home/static/img/home/10.png b/home/static/img/home/10.png index 4fef54a6b5c..0177164da67 100644 Binary files a/home/static/img/home/10.png and b/home/static/img/home/10.png differ diff --git a/home/static/img/home/11.png b/home/static/img/home/11.png index 13e40fce5a3..8630682f3f6 100644 Binary files a/home/static/img/home/11.png and b/home/static/img/home/11.png differ diff --git a/home/static/img/home/12.png b/home/static/img/home/12.png index d6dcdb0abbe..8f553467c2c 100644 Binary files a/home/static/img/home/12.png and b/home/static/img/home/12.png differ diff --git a/home/static/img/home/13.png b/home/static/img/home/13.png index 5cf3f4f90c8..deaf00ccdd6 100644 Binary files a/home/static/img/home/13.png and b/home/static/img/home/13.png differ diff --git a/home/static/img/home/14.png b/home/static/img/home/14.png index c61b25f7469..a90f09f9564 100644 Binary files a/home/static/img/home/14.png and b/home/static/img/home/14.png differ diff --git a/home/static/img/home/15.png b/home/static/img/home/15.png index dc9ee5fcd35..58347623d8c 100644 Binary files a/home/static/img/home/15.png and b/home/static/img/home/15.png differ diff --git a/home/static/img/home/16.png b/home/static/img/home/16.png index 72907f8f208..b1ecc67803d 100644 Binary files a/home/static/img/home/16.png and b/home/static/img/home/16.png differ diff --git a/home/static/img/home/17.png b/home/static/img/home/17.png index 5b8ee5b5c71..6f0832cc776 100644 Binary files a/home/static/img/home/17.png and b/home/static/img/home/17.png differ diff --git a/home/static/img/home/2.png b/home/static/img/home/2.png index 85b63702a9e..e121b33fa54 100644 Binary files a/home/static/img/home/2.png and b/home/static/img/home/2.png differ diff --git a/home/static/img/home/3.png b/home/static/img/home/3.png index 7079efcc3be..6e04e4fe57b 100644 Binary files a/home/static/img/home/3.png and b/home/static/img/home/3.png differ diff --git a/home/static/img/home/4.png b/home/static/img/home/4.png index caadbb52ce0..8ead880a084 100644 Binary files a/home/static/img/home/4.png and b/home/static/img/home/4.png differ diff --git a/home/static/img/home/6.png b/home/static/img/home/6.png index fc80accf9d1..202a02c48a4 100644 Binary files a/home/static/img/home/6.png and b/home/static/img/home/6.png differ diff --git a/home/static/img/home/7.png b/home/static/img/home/7.png index e19e3c3fb0d..6673365be89 100644 Binary files a/home/static/img/home/7.png and b/home/static/img/home/7.png differ diff --git a/home/static/img/home/8.png b/home/static/img/home/8.png index 0f2a94fc37d..e0fd13f2b6e 100644 Binary files a/home/static/img/home/8.png and b/home/static/img/home/8.png differ diff --git a/home/static/img/home/9.png b/home/static/img/home/9.png index 2e7b10ef520..d9a8dc033b3 100644 Binary files a/home/static/img/home/9.png and b/home/static/img/home/9.png differ diff --git a/home/static/img/home/status.png b/home/static/img/home/status.png index c7443eb4adb..44b95ddb10e 100644 Binary files a/home/static/img/home/status.png and b/home/static/img/home/status.png differ diff --git a/home/static/img/icons/cmge_logo.png b/home/static/img/icons/cmge_logo.png deleted file mode 100644 index ca6800f6313..00000000000 Binary files a/home/static/img/icons/cmge_logo.png and /dev/null differ diff --git a/home/static/img/icons/cnsodata_logo.svg b/home/static/img/icons/cnsodata_logo.svg deleted file mode 100644 index b203910402e..00000000000 --- a/home/static/img/icons/cnsodata_logo.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/home/static/img/icons/hibobi_logo.svg b/home/static/img/icons/hibobi_logo.svg deleted file mode 100644 index d0a912bf6ab..00000000000 --- a/home/static/img/icons/hibobi_logo.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/home/static/img/icons/sc_edu_logo.png b/home/static/img/icons/sc_edu_logo.png deleted file mode 100644 index 2f91f0c5290..00000000000 Binary files a/home/static/img/icons/sc_edu_logo.png and /dev/null differ diff --git a/home/static/img/icons/skyworth_logo.png b/home/static/img/icons/skyworth_logo.png deleted file mode 100644 index 83360a6b520..00000000000 Binary files a/home/static/img/icons/skyworth_logo.png and /dev/null differ diff --git a/home/versioned_docs/version-v1.1.x/start/docker-deploy.md b/home/versioned_docs/version-v1.1.x/start/docker-deploy.md index 3946116f667..8d42c10d07f 100644 --- a/home/versioned_docs/version-v1.1.x/start/docker-deploy.md +++ b/home/versioned_docs/version-v1.1.x/start/docker-deploy.md @@ -18,10 +18,10 @@ sidebar_label: Docker方式部署 ``` 2. 拉取HertzBeat Docker镜像 - 镜像版本TAG可查看[官方镜像仓库](https://hub.docker.com/r/tancloud/hertzbeat/tags) + 镜像版本TAG可查看[官方镜像仓库](https://hub.docker.com/r/apache/hertzbeat/tags) ``` shell - $ docker pull tancloud/hertzbeat + $ docker pull apache/hertzbeat ``` 3. 部署HertzBeat您可能需要掌握的几条命令 @@ -66,7 +66,7 @@ $ docker run -d -p 1157:1157 \ -v /opt/application.yml:/opt/hertzbeat/config/application.yml \ -v /opt/sureness.yml:/opt/hertzbeat/config/sureness.yml \ --restart=always \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` 这条命令启动一个运行HertzBeat的Docker容器，并且将容器的1157端口映射到宿主机的1157端口上。若宿主机已有进程占用该端口，则需要修改主机映射端口。 @@ -96,7 +96,7 @@ $ docker run -d -p 1157:1157 \ $ docker update --restart=always hertzbeat ``` - - `tancloud/hertzbeat` : 使用拉取最新的的HertzBeat官方发布的应用镜像来启动容器,版本可查看[官方镜像仓库](https://hub.docker.com/r/tancloud/hertzbeat/tags) + - `apache/hertzbeat` : 使用拉取最新的的HertzBeat官方发布的应用镜像来启动容器,版本可查看[官方镜像仓库](https://hub.docker.com/r/apache/hertzbeat/tags) 7. 开始探索HertzBeat 浏览器访问 http://ip:1157/ 即可开始探索使用HertzBeat，默认账户密码 admin/hertzbeat。 diff --git a/home/versioned_docs/version-v1.1.x/start/quickstart.md b/home/versioned_docs/version-v1.1.x/start/quickstart.md index aa6082d3c51..135a762657b 100644 --- a/home/versioned_docs/version-v1.1.x/start/quickstart.md +++ b/home/versioned_docs/version-v1.1.x/start/quickstart.md @@ -55,7 +55,7 @@ $ docker run -d -p 6667:6667 -p 31999:31999 -p 8181:8181 \ 1. `docker` 环境仅需一条命令即可开始 -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 2. 浏览器访问 `localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` diff --git a/home/versioned_docs/version-v1.1.x/start/sslcert-practice.md b/home/versioned_docs/version-v1.1.x/start/sslcert-practice.md index 1a47bb6c7cc..5b9fc3fce41 100644 --- a/home/versioned_docs/version-v1.1.x/start/sslcert-practice.md +++ b/home/versioned_docs/version-v1.1.x/start/sslcert-practice.md @@ -24,7 +24,7 @@ gitee: https://gitee.com/hertzbeat/hertzbeat 2. `docker` 环境仅需一条命令即可安装 -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 3. 安装成功浏览器访问 `localhost:1157` 即可开始，默认账号密码 `admin/hertzbeat` diff --git a/home/versioned_docs/version-v1.3.x/start/docker-deploy.md b/home/versioned_docs/version-v1.3.x/start/docker-deploy.md index 94691e1babb..0aea776afdd 100644 --- a/home/versioned_docs/version-v1.3.x/start/docker-deploy.md +++ b/home/versioned_docs/version-v1.3.x/start/docker-deploy.md @@ -16,10 +16,10 @@ sidebar_label: Install via Docker ``` 2. pull HertzBeat Docker mirror - you can look up the mirror version TAG in [dockerhub mirror repository](https://hub.docker.com/r/tancloud/hertzbeat/tags) - or in [quay.io mirror repository](https://quay.io/repository/tancloud/hertzbeat) + you can look up the mirror version TAG in [dockerhub mirror repository](https://hub.docker.com/r/apache/hertzbeat/tags) + or in [quay.io mirror repository](https://quay.io/repository/apache/hertzbeat) ```shell - $ docker pull tancloud/hertzbeat + $ docker pull apache/hertzbeat ``` or ```shell @@ -52,7 +52,7 @@ $ docker run -d -p 1157:1157 \ -v /opt/logs:/opt/hertzbeat/logs \ -v /opt/application.yml:/opt/hertzbeat/config/application.yml \ -v /opt/sureness.yml:/opt/hertzbeat/config/sureness.yml \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` This command starts a running HertzBeat Docker container with mapping port 1157. If existing processes on the host use the port, please modify host mapped port. @@ -65,7 +65,7 @@ $ docker run -d -p 1157:1157 \ - `-v /opt/application.yml:/opt/hertzbeat/config/application.yml` : (optional, if you don't have a need, just delete it) Mount the local configuration file into the container which has been modified in the previous step, namely using the local configuration file to cover container configuration file. - `-v /opt/sureness.yml:/opt/hertzbeat/config/sureness.yml` : (optional, if you don't have a need, just delete it) Mount account configuration file modified in the previous step into the container. Delete this command parameters if no needs. - `--name hertzbeat` : Naming container name hertzbeat - - `tancloud/hertzbeat` : Use the pulled latest HertzBeat official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat` instead if you pull `quay.io` docker image.** + - `apache/hertzbeat` : Use the pulled latest HertzBeat official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat` instead if you pull `quay.io` docker image.** 6. Begin to explore HertzBeat diff --git a/home/versioned_docs/version-v1.3.x/start/quickstart.md b/home/versioned_docs/version-v1.3.x/start/quickstart.md index 77261f7ba22..6d89d761454 100644 --- a/home/versioned_docs/version-v1.3.x/start/quickstart.md +++ b/home/versioned_docs/version-v1.3.x/start/quickstart.md @@ -16,7 +16,7 @@ sidebar_label: Quick Start 1. Just one command to get started: -```docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat``` ```or use quay.io (if dockerhub network connect timeout)``` diff --git a/home/versioned_docs/version-v1.3.x/start/sslcert-practice.md b/home/versioned_docs/version-v1.3.x/start/sslcert-practice.md index da899ed3afe..6fe9427aed3 100644 --- a/home/versioned_docs/version-v1.3.x/start/sslcert-practice.md +++ b/home/versioned_docs/version-v1.3.x/start/sslcert-practice.md @@ -23,7 +23,7 @@ gitee: https://gitee.com/hertzbeat/hertzbeat 2. The `docker` environment can be installed with just one command -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 3. After the installation is successful, the browser can access `localhost:1157` to start, the default account password is `admin/hertzbeat` diff --git a/home/versioned_docs/version-v1.4.x/introduce.md b/home/versioned_docs/version-v1.4.x/introduce.md index d9a0ec50bf2..c54423d321b 100644 --- a/home/versioned_docs/version-v1.4.x/introduce.md +++ b/home/versioned_docs/version-v1.4.x/introduce.md @@ -11,7 +11,7 @@ slug: / [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/) [![Twitter](https://img.shields.io/twitter/follow/hertzbeat1024?logo=twitter)](https://twitter.com/hertzbeat1024) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139) -[![Docker Pulls](https://img.shields.io/docker/pulls/tancloud/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/tancloud/hertzbeat/general) +[![Docker Pulls](https://img.shields.io/docker/pulls/apache/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/repository/docker/apache/hertzbeat/general) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hertzbeat)](https://artifacthub.io/packages/search?repo=hertzbeat) [![QQ](https://img.shields.io/badge/QQ-630061200-orange)](https://qm.qq.com/q/FltGGGIX2m) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow) @@ -163,7 +163,7 @@ In an isolated network where multiple networks are not connected, we need to dep ## Quickly Start -Just run a single command in a Docker environment: `docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat` +Just run a single command in a Docker environment: `docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat` Browser access `http://localhost:1157` default account password `admin/hertzbeat` ### Landing Page diff --git a/home/versioned_docs/version-v1.4.x/others/hertzbeat.md b/home/versioned_docs/version-v1.4.x/others/hertzbeat.md index d5b259defad..cf6e7484db3 100644 --- a/home/versioned_docs/version-v1.4.x/others/hertzbeat.md +++ b/home/versioned_docs/version-v1.4.x/others/hertzbeat.md @@ -141,7 +141,7 @@ HertzBeat 提供云边协同能力，可以在多个隔离网络部署边缘采 ## 即刻体验一波 -Docker 环境下运行一条命令即可：`docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat` +Docker 环境下运行一条命令即可：`docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat` 浏览器访问 `http://localhost:1157` 默认账户密码 `admin/hertzbeat` ### 登陆页面 diff --git a/home/versioned_docs/version-v1.4.x/start/docker-deploy.md b/home/versioned_docs/version-v1.4.x/start/docker-deploy.md index 3870d582d0d..644079fde82 100644 --- a/home/versioned_docs/version-v1.4.x/start/docker-deploy.md +++ b/home/versioned_docs/version-v1.4.x/start/docker-deploy.md @@ -16,11 +16,11 @@ sidebar_label: Install via Docker ``` 2. pull HertzBeat Docker mirror - you can look up the mirror version TAG in [dockerhub mirror repository](https://hub.docker.com/r/tancloud/hertzbeat/tags) - or in [quay.io mirror repository](https://quay.io/repository/tancloud/hertzbeat) + you can look up the mirror version TAG in [dockerhub mirror repository](https://hub.docker.com/r/apache/hertzbeat/tags) + or in [quay.io mirror repository](https://quay.io/repository/apache/hertzbeat) ```shell - $ docker pull tancloud/hertzbeat - $ docker pull tancloud/hertzbeat-collector + $ docker pull apache/hertzbeat + $ docker pull apache/hertzbeat-collector ``` or ```shell @@ -54,7 +54,7 @@ $ docker run -d -p 1157:1157 -p 1158:1158 \ -v $(pwd)/logs:/opt/hertzbeat/logs \ -v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml \ -v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml \ - --name hertzbeat tancloud/hertzbeat + --name hertzbeat apache/hertzbeat ``` This command starts a running HertzBeat Docker container with mapping port 1157-1158. If existing processes on the host use the port, please modify host mapped port. @@ -67,7 +67,7 @@ $ docker run -d -p 1157:1157 -p 1158:1158 \ - `-v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml` : (optional, if you don't have a need, just delete it) Mount the local configuration file into the container which has been modified in the previous step, namely using the local configuration file to cover container configuration file. - `-v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml` : (optional, if you don't have a need, just delete it) Mount account configuration file modified in the previous step into the container. Delete this command parameters if no needs. - `--name hertzbeat` : Naming container name hertzbeat - - `tancloud/hertzbeat` : Use the pulled latest HertzBeat official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat` instead if you pull `quay.io` docker image.** + - `apache/hertzbeat` : Use the pulled latest HertzBeat official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat` instead if you pull `quay.io` docker image.** 6. Begin to explore HertzBeat @@ -81,7 +81,7 @@ $ docker run -d \ -e MODE=public \ -e MANAGER_HOST=127.0.0.1 \ -e MANAGER_PORT=1158 \ - --name hertzbeat-collector tancloud/hertzbeat-collector + --name hertzbeat-collector apache/hertzbeat-collector ``` This command starts a running HertzBeat-Collector container. @@ -92,7 +92,7 @@ $ docker run -d \ - `-e MANAGER_PORT=1158` : (optional) Set the main hertzbeat server port, default 1158. - `-v $(pwd)/logs:/opt/hertzbeat-collector/logs` : (optional) Mount the log file to the local host, to ensure the log will not be lost due creating or deleting container. - `--name hertzbeat-collector` : Naming container name hertzbeat-collector - - `tancloud/hertzbeat-collector` : Use the pulled latest HertzBeat-Collector official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat-collector` instead if you pull `quay.io` docker image.** + - `apache/hertzbeat-collector` : Use the pulled latest HertzBeat-Collector official application mirror to start the container. **Use `quay.io/tancloud/hertzbeat-collector` instead if you pull `quay.io` docker image.** 8. Access `http://localhost:1157` and you will see the registered new collector in dashboard. diff --git a/home/versioned_docs/version-v1.4.x/start/quickstart.md b/home/versioned_docs/version-v1.4.x/start/quickstart.md index c12d0e4f443..d6ddb6103ad 100644 --- a/home/versioned_docs/version-v1.4.x/start/quickstart.md +++ b/home/versioned_docs/version-v1.4.x/start/quickstart.md @@ -16,7 +16,7 @@ sidebar_label: Quick Start 1. Just one command to get started: -```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat tancloud/hertzbeat``` +```docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat``` ```or use quay.io (if dockerhub network connect timeout)``` @@ -27,7 +27,7 @@ sidebar_label: Quick Start 3. Deploy collector clusters ``` -docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector tancloud/hertzbeat-collector +docker run -d -e IDENTITY=custom-collector-name -e MANAGER_HOST=127.0.0.1 -e MANAGER_PORT=1158 --name hertzbeat-collector apache/hertzbeat-collector ``` - `-e IDENTITY=custom-collector-name` : set the collector unique identity name. - `-e MODE=public` : set the running mode(public or private), public cluster or private cloud-edge. diff --git a/home/versioned_docs/version-v1.4.x/start/sslcert-practice.md b/home/versioned_docs/version-v1.4.x/start/sslcert-practice.md index d4193d2849b..41c9c2ed686 100644 --- a/home/versioned_docs/version-v1.4.x/start/sslcert-practice.md +++ b/home/versioned_docs/version-v1.4.x/start/sslcert-practice.md @@ -23,7 +23,7 @@ gitee: https://gitee.com/hertzbeat/hertzbeat 2. The `docker` environment can be installed with just one command -`docker run -d -p 1157:1157 --name hertzbeat tancloud/hertzbeat` +`docker run -d -p 1157:1157 --name hertzbeat apache/hertzbeat` 3. After the installation is successful, the browser can access `localhost:1157` to start, the default account password is `admin/hertzbeat` diff --git a/home/versioned_docs/version-v1.4.x/start/upgrade.md b/home/versioned_docs/version-v1.4.x/start/upgrade.md index d391df36520..1c602dba444 100644 --- a/home/versioned_docs/version-v1.4.x/start/upgrade.md +++ b/home/versioned_docs/version-v1.4.x/start/upgrade.md @@ -8,8 +8,8 @@ sidebar_label: Version Upgrade Guide - [Github Release](https://github.com/apache/hertzbeat/releases) - [Gitee Release](https://gitee.com/hertzbeat/hertzbeat/releases) -- [DockerHub Release](https://hub.docker.com/r/tancloud/hertzbeat/tags) -- [Docker quay.io Release](https://quay.io/repository/tancloud/hertzbeat?tab=tags) +- [DockerHub Release](https://hub.docker.com/r/apache/hertzbeat/tags) +- [Docker quay.io Release](https://quay.io/repository/apache/hertzbeat?tab=tags) HertzBeat's metadata information is stored in H2 or Mysql, PostgreSQL relational databases, and the collected metric data is stored in time series databases such as TDengine and IotDB. diff --git a/manager/src/main/resources/application.yml b/manager/src/main/resources/application.yml index e390e66bcd1..3e5d9711681 100644 --- a/manager/src/main/resources/application.yml +++ b/manager/src/main/resources/application.yml @@ -91,15 +91,13 @@ spring: - classpath:db/migration/{vendor} mail: - # Attention: this is mail server address. - # 请注意此为邮件服务器地址：qq邮箱为 smtp.qq.com qq 企业邮箱为 smtp.exmail.qq.com + # Mail server address, eg: qq-mailbox is smtp.qq.com, qq-exmail is smtp.exmail.qq.com host: smtp.qq.com username: tancloud@qq.com - # Attention: this is not email account password, this requires an email authorization code + # Attention this is not email account password, this requires an email authorization code # 请注意此非邮箱账户密码 此需填写邮箱授权码 password: your-password - # Attention: qq mailbox default is 465 port, if you use 587 port, please configure port: 587 in application.yml - # 请注意腾讯邮箱默认为465端口，如果使用587端口请在application.yml中配置port: 587 + # Mailbox smtp server port, eg: qq-mailbox is 465, qq-exmail is 587 port: 465 properties: mail: @@ -121,7 +119,7 @@ common: warehouse: store: # store history metrics data, enable only one below - # 存储历史数据方式, 下方只能enabled启用一种方式 + # 存储历史数据方式, 下方只能 enabled 启用一种方式 jpa: enabled: true # The maximum retention time for history records, after which records will be deleted @@ -153,7 +151,6 @@ warehouse: # config.org.apache.hertzbeat.warehouse.IotDbVersion: V_0_13 || 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' influxdb: @@ -165,7 +162,7 @@ warehouse: replication: 1 # store real-time metrics data, enable only one below - # 存储实时数据方式, 下方只能enabled启用一种方式 + # 存储实时数据方式, 下方只能 enabled 启用一种方式 memory: enabled: true init-size: 16 diff --git a/manager/src/main/resources/sureness.yml b/manager/src/main/resources/sureness.yml index f7f24bf6899..0cea278a35b 100644 --- a/manager/src/main/resources/sureness.yml +++ b/manager/src/main/resources/sureness.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -## -- sureness.yml文本数据源 -- ## +## -- sureness.yml account source -- ## -# 加载到匹配字典的资源,也就是需要被保护的,设置了所支持角色访问的资源 -# 没有配置的资源也默认被认证保护,但不鉴权 -# eg: /api/v1/source1===get===[admin] 表示 /api/v2/host===post 这条资源支持 admin 这一种角色访问 -# eg: /api/v1/source2===get===[] 表示 /api/v1/source2===get 这条资源不支持任何角色访问 +# config the resource restful api that need auth protection, base rbac +# rule: api===method===role +# eg: /api/v1/source1===get===[admin] means /api/v2/host===post support role[admin] access. +# eg: /api/v1/source2===get===[] means /api/v1/source2===get can not access by any role. resourceRole: - /api/account/auth/refresh===post===[admin,user,guest] - /api/apps/**===get===[admin,user,guest] @@ -59,8 +59,9 @@ resourceRole: - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] -# 需要被过滤保护的资源,不认证鉴权直接访问 -# /api/v1/source3===get 表示 /api/v1/source3===get 可以被任何人访问 无需登录认证鉴权 +# 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/**===* @@ -68,7 +69,7 @@ excludedResource: - /api/apps/hierarchy===get - /api/push/**===* - /api/status/page/public/**===* - # web ui 前端静态资源 + # web ui resource - /===get - /dashboard/**===get - /monitors/**===get @@ -89,18 +90,17 @@ excludedResource: - /**/*.json===get - /**/*.woff===get - /**/*.eot===get - # swagger ui 资源 + # swagger ui resource - /swagger-resources/**===get - /v2/api-docs===get - /v3/api-docs===get # h2 database - /h2-console/**===* -# 用户账户信息 -# 下面有 admin tom lili 三个账户 -# eg: admin 拥有[admin,user]角色,密码为hertzbeat -# eg: tom 拥有[user],密码为hertzbeat -# eg: lili 拥有[guest],明文密码为lili, 加盐密码为1A676730B0C7F54654B0E09184448289 +# account info config +# eg: admin has role [admin,user], password is hertzbeat +# eg: tom has role [user], password is hertzbeat +# eg: lili has role [guest], plain password is lili, salt is 123, salted password is 1A676730B0C7F54654B0E09184448289 account: - appId: admin credential: hertzbeat @@ -112,9 +112,9 @@ account: credential: hertzbeat role: [guest] - appId: lili - # 注意 Digest认证不支持加盐加密的密码账户 - # 加盐加密的密码，通过 MD5(password+salt)计算 - # 此账户的原始密码为 lili + # credential = MD5(password + salt) + # plain password: lili + # attention: digest authentication does not support salted encrypted password accounts credential: 1A676730B0C7F54654B0E09184448289 salt: 123 role: [guest] diff --git a/script/assembly/collector/bin/entrypoint.sh b/script/assembly/collector/bin/entrypoint.sh index 34208ff9817..0867dc8c489 100644 --- a/script/assembly/collector/bin/entrypoint.sh +++ b/script/assembly/collector/bin/entrypoint.sh @@ -16,31 +16,29 @@ # See the License for the specific language governing permissions and # limitations under the License. -# 项目名称 +# project name SERVER_NAME="${project.build.finalName}" -# jar名称 +# jar name JAR_NAME="${project.build.finalName}.jar" -# 进入bin目录 +# cd bin cd `dirname $0` -# bin目录绝对路径 +# bin dir BIN_DIR=`pwd` -# 返回到上一级项目根目录路径 +# return root cd .. -# 打印项目根目录绝对路径 -# `pwd` 执行系统命令并获得结果 +# root path dir DEPLOY_DIR=`pwd` -# 外部配置文件绝对目录,如果是目录需要/结尾，也可以直接指定文件 -# 如果指定的是目录,spring则会读取目录中的所有配置文件 +# config dir CONF_DIR=$DEPLOY_DIR/config MAIN_CLASS="org.apache.hertzbeat.collector.Collector" EXT_LIB_PATH="$DEPLOY_DIR/ext-lib" CLASSPATH="$DEPLOY_DIR/$JAR_NAME:$EXT_LIB_PATH/*" -# 项目日志输出绝对路径 +# log dir LOGS_DIR=$DEPLOY_DIR/logs -# 如果logs文件夹不存在,则创建文件夹 +# create logs dir when not exist if [ ! -d $LOGS_DIR ]; then mkdir $LOGS_DIR fi @@ -51,7 +49,7 @@ JAVA_OPTS=" -Doracle.jdbc.timezoneAsRegion=false" # JVM Configuration JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOGS_DIR" -# 加载外部log文件的配置 +# load logback config LOG_IMPL_FILE=logback-spring.xml LOGGING_CONFIG="" if [ -f "$CONF_DIR/$LOG_IMPL_FILE" ] diff --git a/script/assembly/collector/bin/restart.sh b/script/assembly/collector/bin/restart.sh index 4cf0bf7bdba..30bd4f6e526 100644 --- a/script/assembly/collector/bin/restart.sh +++ b/script/assembly/collector/bin/restart.sh @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# 重启脚本执行的起始时间 +# restart start time startTime=$(date +%s) echo -e "\033[0;31mCurrent Time is：$(date "+%Y-%m-%d %H:%M:%S") Restart Now!\033[0m" ./shutdown.sh @@ -24,6 +24,6 @@ echo sleep 2 echo ./startup.sh -# 重启脚本执行的结束时间 +# restart end time endTime=$(date +%s) echo -e "\033[0;31mCurrent Time is：$(date "+%Y-%m-%d %H:%M:%S") Restart Success！Spend $((endTime - startTime)) seconds \033[0m"; diff --git a/script/assembly/collector/bin/shutdown.sh b/script/assembly/collector/bin/shutdown.sh index cce4e47b05a..e394ea1541d 100644 --- a/script/assembly/collector/bin/shutdown.sh +++ b/script/assembly/collector/bin/shutdown.sh @@ -15,13 +15,13 @@ # 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. -# 项目名称 +# project name APPLICATION="${project.artifactId}" -# 项目启动jar包名称 +# jar file name APPLICATION_JAR="${project.build.finalName}.jar" -# 通过项目名称查找到PI，然后kill -9 pid +# find the service pid, kill -9 pid PID=$(ps -ef | grep java | grep "${APPLICATION_JAR}" | grep -v grep | awk '{ print $2 }') if [[ -z "$PID" ]] then @@ -30,4 +30,4 @@ else echo kill ${PID} kill -9 ${PID} echo Shutdown HertzBeat ${APPLICATION} Success! -fi \ No newline at end of file +fi diff --git a/script/assembly/collector/bin/startup.sh b/script/assembly/collector/bin/startup.sh index c2203548dd7..c20213b7fd1 100644 --- a/script/assembly/collector/bin/startup.sh +++ b/script/assembly/collector/bin/startup.sh @@ -16,26 +16,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# 项目名称 +# project name SERVER_NAME="${project.artifactId}" -# jar名称 +# jar file name JAR_NAME="${project.build.finalName}.jar" -# 进入bin目录 +# cd bin dir cd `dirname $0` -# bin目录绝对路径 +# bin dir BIN_DIR=`pwd` -# 返回到上一级项目根目录路径 +# return root dir cd .. -# 打印项目根目录绝对路径 -# `pwd` 执行系统命令并获得结果 +# root path dir DEPLOY_DIR=`pwd` -# 外部配置文件绝对目录,如果是目录需要/结尾，也可以直接指定文件 -# 如果指定的是目录,spring则会读取目录中的所有配置文件 +# config dir CONF_DIR=$DEPLOY_DIR/config -# 应用的端口号 +# server port SERVER_PORT=1159 PIDS=`ps -ef | grep java | grep "$CONF_DIR" | awk '{print $2}'` @@ -57,13 +55,13 @@ if [ -n "$PIDS" ]; then fi if [ -n "$SERVER_PORT" ]; then - # linux 下查询端口是否占用 + # linux - find the port whether used SERVER_PORT_COUNT=`netstat -tln | grep :$SERVER_PORT | wc -l` if [ $SERVER_PORT_COUNT -gt 0 ]; then echo "ERROR: netstat the HertzBeat $SERVER_NAME port $SERVER_PORT already used!" exit 1 fi - # mac 下查询端口是否占用 + # mac - find the port whether used LSOF_AVA=`command -v lsof | wc -l` if [ $LSOF_AVA -gt 0 ]; then SERVER_PORT_COUNT=`lsof -i:$SERVER_PORT | grep java | wc -l` @@ -76,9 +74,9 @@ fi MAIN_CLASS="org.apache.hertzbeat.collector.Collector" EXT_LIB_PATH="$DEPLOY_DIR/ext-lib" CLASSPATH="$DEPLOY_DIR/$JAR_NAME:$EXT_LIB_PATH/*" -# 项目日志输出绝对路径 +# log dir LOGS_DIR=$DEPLOY_DIR/logs -# 如果logs文件夹不存在,则创建文件夹 +# create logs dir when not exist if [ ! -d $LOGS_DIR ]; then mkdir $LOGS_DIR fi @@ -88,7 +86,7 @@ JAVA_OPTS=" -Duser.timezone=Asia/Shanghai -Doracle.jdbc.timezoneAsRegion=false" JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOGS_DIR" -# 加载外部log文件的配置 +# load logback config LOG_IMPL_FILE=logback-spring.xml LOGGING_CONFIG="" if [ -f "$CONF_DIR/$LOG_IMPL_FILE" ] diff --git a/script/docker-compose/README.md b/script/docker-compose/README.md index d90161e4b2a..2af823ea563 100644 --- a/script/docker-compose/README.md +++ b/script/docker-compose/README.md @@ -4,11 +4,3 @@ - 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) - - -## Docker-Compose 部署方案 - -- 使用 Mysql + VictoriaMetrics 作为 Hertzbeat 依赖存储服务 -> [HertzBeat+Mysql+VictoriaMetrics 方案](hertzbeat-mysql-victoria-metrics) -- 使用 Mysql + IoTDB 作为 Hertzbeat 依赖存储服务 -> [HertzBeat+Mysql+IoTDB 方案](hertzbeat-mysql-iotdb) -- 使用 Mysql + Tdengine 作为 Hertzbeat 依赖存储服务 -> [HertzBeat+Mysql+Tdengine 方案](hertzbeat-mysql-tdengine) -- 使用 PostgreSQL + IoTDB 作为 Hertzbeat 依赖存储服务 -> [HertzBeat+PostgreSQL+IoTDB 方案](hertzbeat-postgresql-iotdb) diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/README.md b/script/docker-compose/hertzbeat-mysql-iotdb/README.md index fff76a821a4..9461296afd4 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/README.md +++ b/script/docker-compose/hertzbeat-mysql-iotdb/README.md @@ -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-mysql-iotdb` link [script/docker-compose](https://gitee.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/ hertzbeat-mysql-iotdb) + 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. Enter the deployment script docker-compose directory, execute diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/README_CN.md b/script/docker-compose/hertzbeat-mysql-iotdb/README_CN.md index ee9fa8a6f6a..624c61866b5 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/README_CN.md +++ b/script/docker-compose/hertzbeat-mysql-iotdb/README_CN.md @@ -1,6 +1,5 @@ ## docker-compose部署 HertzBeat+Mysql+IoTDB 方案 -- 如果不想部署而是直接使用，我们提供SAAS监控云-[TanCloud探云](https://console.tancloud.cn)，即刻 **[登录注册](https://console.tancloud.cn)** 免费使用。 - 如果想自己本地快速部署的话，可以参考下面进行操作。 > docker-compose 部署方案使用了 Mysql + IoTDB 作为 Hertzbeat 依赖存储服务。 @@ -18,7 +17,7 @@ ##### docker compose部署hertzbeat及其依赖服务 1. 下载hertzbeat-docker-compose安装部署脚本文件 - 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-mysql-iotdb` 链接 [script/docker-compose](https://gitee.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. 进入部署脚本 docker-compose 目录, 执行 diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml index f7f24bf6899..0cea278a35b 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -## -- sureness.yml文本数据源 -- ## +## -- sureness.yml account source -- ## -# 加载到匹配字典的资源,也就是需要被保护的,设置了所支持角色访问的资源 -# 没有配置的资源也默认被认证保护,但不鉴权 -# eg: /api/v1/source1===get===[admin] 表示 /api/v2/host===post 这条资源支持 admin 这一种角色访问 -# eg: /api/v1/source2===get===[] 表示 /api/v1/source2===get 这条资源不支持任何角色访问 +# config the resource restful api that need auth protection, base rbac +# rule: api===method===role +# eg: /api/v1/source1===get===[admin] means /api/v2/host===post support role[admin] access. +# eg: /api/v1/source2===get===[] means /api/v1/source2===get can not access by any role. resourceRole: - /api/account/auth/refresh===post===[admin,user,guest] - /api/apps/**===get===[admin,user,guest] @@ -59,8 +59,9 @@ resourceRole: - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] -# 需要被过滤保护的资源,不认证鉴权直接访问 -# /api/v1/source3===get 表示 /api/v1/source3===get 可以被任何人访问 无需登录认证鉴权 +# 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/**===* @@ -68,7 +69,7 @@ excludedResource: - /api/apps/hierarchy===get - /api/push/**===* - /api/status/page/public/**===* - # web ui 前端静态资源 + # web ui resource - /===get - /dashboard/**===get - /monitors/**===get @@ -89,18 +90,17 @@ excludedResource: - /**/*.json===get - /**/*.woff===get - /**/*.eot===get - # swagger ui 资源 + # swagger ui resource - /swagger-resources/**===get - /v2/api-docs===get - /v3/api-docs===get # h2 database - /h2-console/**===* -# 用户账户信息 -# 下面有 admin tom lili 三个账户 -# eg: admin 拥有[admin,user]角色,密码为hertzbeat -# eg: tom 拥有[user],密码为hertzbeat -# eg: lili 拥有[guest],明文密码为lili, 加盐密码为1A676730B0C7F54654B0E09184448289 +# account info config +# eg: admin has role [admin,user], password is hertzbeat +# eg: tom has role [user], password is hertzbeat +# eg: lili has role [guest], plain password is lili, salt is 123, salted password is 1A676730B0C7F54654B0E09184448289 account: - appId: admin credential: hertzbeat @@ -112,9 +112,9 @@ account: credential: hertzbeat role: [guest] - appId: lili - # 注意 Digest认证不支持加盐加密的密码账户 - # 加盐加密的密码，通过 MD5(password+salt)计算 - # 此账户的原始密码为 lili + # credential = MD5(password + salt) + # plain password: lili + # attention: digest authentication does not support salted encrypted password accounts credential: 1A676730B0C7F54654B0E09184448289 salt: 123 role: [guest] diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml index 73229c3087a..32d14b498a9 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml @@ -63,7 +63,7 @@ services: - hertzbeat hertzbeat: - image: tancloud/hertzbeat + image: apache/hertzbeat container_name: compose-hertzbeat hostname: hertzbeat restart: always diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/README.md b/script/docker-compose/hertzbeat-mysql-tdengine/README.md index b8e6f3079d8..dba1bce6f35 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/README.md +++ b/script/docker-compose/hertzbeat-mysql-tdengine/README.md @@ -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-mysql-tdengine` link [script/docker-compose](https://gitee.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-tdengine) + 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. Enter the deployment script docker-compose directory, execute diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md b/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md index 6d773d4a428..7530617cca0 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md +++ b/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md @@ -1,6 +1,5 @@ ## docker-compose部署 HertzBeat+Mysql+Tdengine 方案 -- 如果不想部署而是直接使用，我们提供SAAS监控云-[TanCloud探云](https://console.tancloud.cn)，即刻 **[登录注册](https://console.tancloud.cn)** 免费使用。 - 如果想自己本地快速部署的话，可以参考下面进行操作。 > docker-compose 部署方案使用了 Mysql + Tdengine 作为 Hertzbeat 依赖存储服务。 @@ -18,7 +17,7 @@ ##### docker compose部署hertzbeat及其依赖服务 1. 下载hertzbeat-docker-compose安装部署脚本文件 - 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-mysql-tdengine` 链接 [script/docker-compose](https://gitee.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-tdengine) + 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-mysql-tdengine` 链接 [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-tdengine) 2. 进入部署脚本 docker-compose 目录, 执行 diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml b/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml index f7f24bf6899..0cea278a35b 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -## -- sureness.yml文本数据源 -- ## +## -- sureness.yml account source -- ## -# 加载到匹配字典的资源,也就是需要被保护的,设置了所支持角色访问的资源 -# 没有配置的资源也默认被认证保护,但不鉴权 -# eg: /api/v1/source1===get===[admin] 表示 /api/v2/host===post 这条资源支持 admin 这一种角色访问 -# eg: /api/v1/source2===get===[] 表示 /api/v1/source2===get 这条资源不支持任何角色访问 +# config the resource restful api that need auth protection, base rbac +# rule: api===method===role +# eg: /api/v1/source1===get===[admin] means /api/v2/host===post support role[admin] access. +# eg: /api/v1/source2===get===[] means /api/v1/source2===get can not access by any role. resourceRole: - /api/account/auth/refresh===post===[admin,user,guest] - /api/apps/**===get===[admin,user,guest] @@ -59,8 +59,9 @@ resourceRole: - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] -# 需要被过滤保护的资源,不认证鉴权直接访问 -# /api/v1/source3===get 表示 /api/v1/source3===get 可以被任何人访问 无需登录认证鉴权 +# 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/**===* @@ -68,7 +69,7 @@ excludedResource: - /api/apps/hierarchy===get - /api/push/**===* - /api/status/page/public/**===* - # web ui 前端静态资源 + # web ui resource - /===get - /dashboard/**===get - /monitors/**===get @@ -89,18 +90,17 @@ excludedResource: - /**/*.json===get - /**/*.woff===get - /**/*.eot===get - # swagger ui 资源 + # swagger ui resource - /swagger-resources/**===get - /v2/api-docs===get - /v3/api-docs===get # h2 database - /h2-console/**===* -# 用户账户信息 -# 下面有 admin tom lili 三个账户 -# eg: admin 拥有[admin,user]角色,密码为hertzbeat -# eg: tom 拥有[user],密码为hertzbeat -# eg: lili 拥有[guest],明文密码为lili, 加盐密码为1A676730B0C7F54654B0E09184448289 +# account info config +# eg: admin has role [admin,user], password is hertzbeat +# eg: tom has role [user], password is hertzbeat +# eg: lili has role [guest], plain password is lili, salt is 123, salted password is 1A676730B0C7F54654B0E09184448289 account: - appId: admin credential: hertzbeat @@ -112,9 +112,9 @@ account: credential: hertzbeat role: [guest] - appId: lili - # 注意 Digest认证不支持加盐加密的密码账户 - # 加盐加密的密码，通过 MD5(password+salt)计算 - # 此账户的原始密码为 lili + # credential = MD5(password + salt) + # plain password: lili + # attention: digest authentication does not support salted encrypted password accounts credential: 1A676730B0C7F54654B0E09184448289 salt: 123 role: [guest] diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml index 30cb3d0d0e5..a632bfb0934 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml @@ -62,7 +62,7 @@ services: - hertzbeat hertzbeat: - image: tancloud/hertzbeat + image: apache/hertzbeat container_name: compose-hertzbeat hostname: hertzbeat restart: always diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/README.md b/script/docker-compose/hertzbeat-mysql-victoria-metrics/README.md index 98f4f63dece..59ee57107b0 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/README.md +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/README.md @@ -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-mysql-victoria-metrics` link [script/docker-compose](https://gitee.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-victoria-metrics) + 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. Enter the deployment script docker-compose directory, execute 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 38012154ea4..4c34978f414 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/README_CN.md +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/README_CN.md @@ -1,6 +1,5 @@ ## docker-compose部署 HertzBeat+Mysql+VictoriaMetrics 方案 -- 如果不想部署而是直接使用，我们提供SAAS监控云-[TanCloud探云](https://console.tancloud.cn)，即刻 **[登录注册](https://console.tancloud.cn)** 免费使用。 - 如果想自己本地快速部署的话，可以参考下面进行操作。 > docker-compose 部署方案使用了 Mysql + VictoriaMetrics 作为 Hertzbeat 依赖存储服务。 @@ -18,7 +17,7 @@ ##### docker compose部署hertzbeat及其依赖服务 1. 下载hertzbeat-docker-compose安装部署脚本文件 - 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-mysql-victoria-metrics` 链接 [script/docker-compose](https://gitee.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-mysql-mysql-victoria-metrics) + 脚本文件位于代码仓库下`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. 进入部署脚本 docker-compose 目录, 执行 diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/sureness.yml b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/sureness.yml index f7f24bf6899..0cea278a35b 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/sureness.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -## -- sureness.yml文本数据源 -- ## +## -- sureness.yml account source -- ## -# 加载到匹配字典的资源,也就是需要被保护的,设置了所支持角色访问的资源 -# 没有配置的资源也默认被认证保护,但不鉴权 -# eg: /api/v1/source1===get===[admin] 表示 /api/v2/host===post 这条资源支持 admin 这一种角色访问 -# eg: /api/v1/source2===get===[] 表示 /api/v1/source2===get 这条资源不支持任何角色访问 +# config the resource restful api that need auth protection, base rbac +# rule: api===method===role +# eg: /api/v1/source1===get===[admin] means /api/v2/host===post support role[admin] access. +# eg: /api/v1/source2===get===[] means /api/v1/source2===get can not access by any role. resourceRole: - /api/account/auth/refresh===post===[admin,user,guest] - /api/apps/**===get===[admin,user,guest] @@ -59,8 +59,9 @@ resourceRole: - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] -# 需要被过滤保护的资源,不认证鉴权直接访问 -# /api/v1/source3===get 表示 /api/v1/source3===get 可以被任何人访问 无需登录认证鉴权 +# 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/**===* @@ -68,7 +69,7 @@ excludedResource: - /api/apps/hierarchy===get - /api/push/**===* - /api/status/page/public/**===* - # web ui 前端静态资源 + # web ui resource - /===get - /dashboard/**===get - /monitors/**===get @@ -89,18 +90,17 @@ excludedResource: - /**/*.json===get - /**/*.woff===get - /**/*.eot===get - # swagger ui 资源 + # swagger ui resource - /swagger-resources/**===get - /v2/api-docs===get - /v3/api-docs===get # h2 database - /h2-console/**===* -# 用户账户信息 -# 下面有 admin tom lili 三个账户 -# eg: admin 拥有[admin,user]角色,密码为hertzbeat -# eg: tom 拥有[user],密码为hertzbeat -# eg: lili 拥有[guest],明文密码为lili, 加盐密码为1A676730B0C7F54654B0E09184448289 +# account info config +# eg: admin has role [admin,user], password is hertzbeat +# eg: tom has role [user], password is hertzbeat +# eg: lili has role [guest], plain password is lili, salt is 123, salted password is 1A676730B0C7F54654B0E09184448289 account: - appId: admin credential: hertzbeat @@ -112,9 +112,9 @@ account: credential: hertzbeat role: [guest] - appId: lili - # 注意 Digest认证不支持加盐加密的密码账户 - # 加盐加密的密码，通过 MD5(password+salt)计算 - # 此账户的原始密码为 lili + # credential = MD5(password + salt) + # plain password: lili + # attention: digest authentication does not support salted encrypted password accounts credential: 1A676730B0C7F54654B0E09184448289 salt: 123 role: [guest] 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 ab003fed9a3..1e2018b1a43 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml @@ -62,7 +62,7 @@ services: - hertzbeat hertzbeat: - image: tancloud/hertzbeat + image: apache/hertzbeat container_name: compose-hertzbeat hostname: hertzbeat restart: always diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/README.md b/script/docker-compose/hertzbeat-postgresql-iotdb/README.md index 3d5c3684e77..7588870b46f 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/README.md +++ b/script/docker-compose/hertzbeat-postgresql-iotdb/README.md @@ -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://gitee.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-postgresql-iotdb) + 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) 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-iotdb/README_CN.md index e2ef77ecdfd..653aa4cf10c 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/README_CN.md +++ b/script/docker-compose/hertzbeat-postgresql-iotdb/README_CN.md @@ -1,6 +1,5 @@ ## docker-compose部署 HertzBeat+Postgresql+IoTDB 方案 -- 如果不想部署而是直接使用，我们提供SAAS监控云-[TanCloud探云](https://console.tancloud.cn)，即刻 **[登录注册](https://console.tancloud.cn)** 免费使用。 - 如果想自己本地快速部署的话，可以参考下面进行操作。 > docker-compose 部署方案使用了 PostgreSQL + IoTDB 作为 Hertzbeat 依赖存储服务。 @@ -18,7 +17,7 @@ ##### docker compose部署hertzbeat及其依赖服务 1. 下载hertzbeat-docker-compose安装部署脚本文件 - 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-postgre-iotdb` 链接 [script/docker-compose](https://gitee.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-postgre-iotdb) + 脚本文件位于代码仓库下`script/docker-compose/hertzbeat-postgre-iotdb` 链接 [script/docker-compose](https://github.com/hertzbeat/hertzbeat/tree/master/script/docker-compose/hertzbeat-postgre-iotdb) 2. 进入部署脚本 docker-compose 目录, 执行 diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml b/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml index f7f24bf6899..0cea278a35b 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-postgresql-iotdb/conf/sureness.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -## -- sureness.yml文本数据源 -- ## +## -- sureness.yml account source -- ## -# 加载到匹配字典的资源,也就是需要被保护的,设置了所支持角色访问的资源 -# 没有配置的资源也默认被认证保护,但不鉴权 -# eg: /api/v1/source1===get===[admin] 表示 /api/v2/host===post 这条资源支持 admin 这一种角色访问 -# eg: /api/v1/source2===get===[] 表示 /api/v1/source2===get 这条资源不支持任何角色访问 +# config the resource restful api that need auth protection, base rbac +# rule: api===method===role +# eg: /api/v1/source1===get===[admin] means /api/v2/host===post support role[admin] access. +# eg: /api/v1/source2===get===[] means /api/v1/source2===get can not access by any role. resourceRole: - /api/account/auth/refresh===post===[admin,user,guest] - /api/apps/**===get===[admin,user,guest] @@ -59,8 +59,9 @@ resourceRole: - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] -# 需要被过滤保护的资源,不认证鉴权直接访问 -# /api/v1/source3===get 表示 /api/v1/source3===get 可以被任何人访问 无需登录认证鉴权 +# 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/**===* @@ -68,7 +69,7 @@ excludedResource: - /api/apps/hierarchy===get - /api/push/**===* - /api/status/page/public/**===* - # web ui 前端静态资源 + # web ui resource - /===get - /dashboard/**===get - /monitors/**===get @@ -89,18 +90,17 @@ excludedResource: - /**/*.json===get - /**/*.woff===get - /**/*.eot===get - # swagger ui 资源 + # swagger ui resource - /swagger-resources/**===get - /v2/api-docs===get - /v3/api-docs===get # h2 database - /h2-console/**===* -# 用户账户信息 -# 下面有 admin tom lili 三个账户 -# eg: admin 拥有[admin,user]角色,密码为hertzbeat -# eg: tom 拥有[user],密码为hertzbeat -# eg: lili 拥有[guest],明文密码为lili, 加盐密码为1A676730B0C7F54654B0E09184448289 +# account info config +# eg: admin has role [admin,user], password is hertzbeat +# eg: tom has role [user], password is hertzbeat +# eg: lili has role [guest], plain password is lili, salt is 123, salted password is 1A676730B0C7F54654B0E09184448289 account: - appId: admin credential: hertzbeat @@ -112,9 +112,9 @@ account: credential: hertzbeat role: [guest] - appId: lili - # 注意 Digest认证不支持加盐加密的密码账户 - # 加盐加密的密码，通过 MD5(password+salt)计算 - # 此账户的原始密码为 lili + # credential = MD5(password + salt) + # plain password: lili + # attention: digest authentication does not support salted encrypted password accounts credential: 1A676730B0C7F54654B0E09184448289 salt: 123 role: [guest] diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml index 1ea72052e28..9910f34eaeb 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml @@ -64,7 +64,7 @@ services: - hertzbeat hertzbeat: - image: tancloud/hertzbeat + image: apache/hertzbeat container_name: compose-hertzbeat hostname: hertzbeat restart: always diff --git a/script/docker/collector/README.md b/script/docker/collector/README.md index 5a8dc3f3292..b1d6f15934d 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 仓库 -$ docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat-collector:v1.0.0 . --push +# 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 -# 查看镜像信息 -$ docker buildx imagetools inspect tancloud/hertzbeat-collector:v1.0.0 +# 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 0b7da2df314..bcc5ad9555b 100644 --- a/script/docker/collector/build.sh +++ b/script/docker/collector/build.sh @@ -15,25 +15,25 @@ # 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 tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" +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" -#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" +#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t apache/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" #COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" @@ -43,4 +43,4 @@ echo "$COMMAND" $COMMAND -#docker build -t tancloud/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" +#docker build -t apache/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" diff --git a/script/docker/server/README.md b/script/docker/server/README.md index e2396b06461..4cfc50fcddb 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 仓库 -$ docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat:v1.0.0 . --push +# 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 -# 查看镜像信息 -$ docker buildx imagetools inspect tancloud/hertzbeat:v1.0.0 +# 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 a2dca654585..9ae76fdec26 100755 --- a/script/docker/server/build.sh +++ b/script/docker/server/build.sh @@ -15,25 +15,25 @@ # 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 tancloud/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push=${IMAGE_PUSH:-true} --load=${IMAGE_LOAD:-false}" +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}" -#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" +#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" #COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t quay.io/tancloud/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" --push" @@ -41,11 +41,11 @@ COMMAND="docker buildx build --platform ${IMAGE_PLATFORM:-linux/arm64,linux/amd6 # Build Local -#COMMAND="docker build -t tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION"" +#COMMAND="docker build -t apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION"" echo "$COMMAND" $COMMAND -docker tag tancloud/hertzbeat:v$VERSION tancloud/hertzbeat +docker tag apache/hertzbeat:v$VERSION apache/hertzbeat -#docker build -t tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" +#docker build -t apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" diff --git a/script/helm/hertzbeat/Chart.yaml b/script/helm/hertzbeat/Chart.yaml index 91597e354af..bce5e8ed0e5 100644 --- a/script/helm/hertzbeat/Chart.yaml +++ b/script/helm/hertzbeat/Chart.yaml @@ -16,10 +16,10 @@ # 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.com/ +home: https://hertzbeat.apache.org/ sources: - https://github.com/apache/hertzbeat - https://charts.hertzbeat.com diff --git a/script/helm/hertzbeat/README.md b/script/helm/hertzbeat/README.md index c5150e64a94..0ebff08af35 100644 --- a/script/helm/hertzbeat/README.md +++ b/script/helm/hertzbeat/README.md @@ -1,25 +1,26 @@ -# Helm Chart for HertzBeat +# Helm Chart for Apache HertzBeat (incubating) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hertzbeat)](https://artifacthub.io/packages/search?repo=hertzbeat)

hertzbeat: An open-source, real-time monitoring system with custom monitoring, high performance cluster and agentless capabilities.

— Open in Artifact Hub
-## What is HertzBeat? +## What is Apache HertzBeat (incubating)? -> An open-source, real-time monitoring system with custom monitoring, high performance cluster and agentless capabilities. | 易用友好的开源实时监控告警系统，无需Agent，高性能集群，强大自定义监控能力. +[Apache HertzBeat](https://github.com/apache/hertzbeat) (incubating) is an easy-to-use, open source, real-time monitoring system with agentless, high performance cluster, prometheus-compatible, offers powerful custom monitoring and status page building capabilities. ### Features * Combines **monitoring, alarm, and notification** features into one platform, and supports monitoring for web service, program, database, cache, os, webserver, middleware, bigdata, cloud-native, network, custom and more. -* Easy to use and agentless, offering full web-based operations for monitoring and alerting with just a few clicks, all at zero learning cost. +* Easy to use and agentless, web-based and with one-click monitoring and alerting, zero learning curve. * Makes protocols such as `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` configurable, allowing you to collect any metrics by simply configuring the template `YML` file online. Imagine being able to quickly adapt to a new monitoring type like K8s or Docker simply by configuring online with HertzBeat. +* Compatible with the `Prometheus` ecosystem and more, can monitoring what `Prometheus` can monitoring with few clicks on webui. * High performance, supports horizontal expansion of multi-collector clusters, multi-isolated network monitoring and cloud-edge collaboration. * Provides flexible alarm threshold rules and timely notifications delivered via `Discord` `Slack` `Telegram` `Email` `Dingtalk` `WeChat` `FeiShu` `Webhook` `SMS` `ServerChan`. +* Provides powerful status page building capabilities, easily communicate the real-time status of your service to users. > HertzBeat's powerful customization, multi-type support, high performance, easy expansion, and low coupling, aims to help developers and teams quickly build their own monitoring system. -> We also provide **[SaaS Monitoring Cloud](https://console.tancloud.cn)**, users no longer need to deploy a cumbersome monitoring system to monitor their resources. **[Get started online for free](https://console.tancloud.cn)**. ## Helm Chart for HertzBeat diff --git a/script/helm/hertzbeat/templates/manager/configmap.yaml b/script/helm/hertzbeat/templates/manager/configmap.yaml index 27ab8ad4bf3..0442bb3a5b7 100644 --- a/script/helm/hertzbeat/templates/manager/configmap.yaml +++ b/script/helm/hertzbeat/templates/manager/configmap.yaml @@ -214,8 +214,6 @@ data: - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] - # 需要被过滤保护的资源,不认证鉴权直接访问 - # /api/v1/source3===get 表示 /api/v1/source3===get 可以被任何人访问 无需登录认证鉴权 excludedResource: - /api/alerts/report/**===* - /api/account/auth/**===* @@ -223,7 +221,6 @@ data: - /api/apps/hierarchy===get - /api/push/**===* - /api/status/page/public/**===* - # web ui 前端静态资源 - /===get - /dashboard/**===get - /monitors/**===get @@ -244,18 +241,15 @@ data: - /**/*.json===get - /**/*.woff===get - /**/*.eot===get - # swagger ui 资源 - /swagger-resources/**===get - /v2/api-docs===get - /v3/api-docs===get - # h2 database - /h2-console/**===* - # 用户账户信息 - # 下面有 admin tom lili 三个账户 - # eg: admin 拥有[admin,user]角色,密码为hertzbeat - # eg: tom 拥有[user],密码为hertzbeat - # eg: lili 拥有[guest],明文密码为lili, 加盐密码为1A676730B0C7F54654B0E09184448289 + # account info config + # eg: admin has role [admin,user], password is hertzbeat + # eg: tom has role [user], password is hertzbeat + # eg: lili has role [guest], plain password is lili, salt is 123, salted password is 1A676730B0C7F54654B0E09184448289 account: - appId: {{ .Values.manager.account.username }} credential: {{ .Values.manager.account.password }} @@ -267,9 +261,9 @@ data: credential: hertzbeat role: [guest] - appId: lili - # 注意 Digest认证不支持加盐加密的密码账户 - # 加盐加密的密码，通过 MD5(password+salt)计算 - # 此账户的原始密码为 lili + # credential = MD5(password + salt) + # plain password: lili + # attention: digest authentication does not support salted encrypted password accounts credential: 1A676730B0C7F54654B0E09184448289 salt: 123 role: [guest] diff --git a/script/helm/hertzbeat/values.yaml b/script/helm/hertzbeat/values.yaml index db3b1435faf..844b4da98d2 100644 --- a/script/helm/hertzbeat/values.yaml +++ b/script/helm/hertzbeat/values.yaml @@ -19,7 +19,7 @@ manager: image: - repository: tancloud/hertzbeat + repository: apache/hertzbeat pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" @@ -40,7 +40,7 @@ manager: collector: image: - repository: tancloud/hertzbeat-collector + repository: apache/hertzbeat-collector pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" diff --git a/script/sureness.yml b/script/sureness.yml index f7f24bf6899..0cea278a35b 100644 --- a/script/sureness.yml +++ b/script/sureness.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -## -- sureness.yml文本数据源 -- ## +## -- sureness.yml account source -- ## -# 加载到匹配字典的资源,也就是需要被保护的,设置了所支持角色访问的资源 -# 没有配置的资源也默认被认证保护,但不鉴权 -# eg: /api/v1/source1===get===[admin] 表示 /api/v2/host===post 这条资源支持 admin 这一种角色访问 -# eg: /api/v1/source2===get===[] 表示 /api/v1/source2===get 这条资源不支持任何角色访问 +# config the resource restful api that need auth protection, base rbac +# rule: api===method===role +# eg: /api/v1/source1===get===[admin] means /api/v2/host===post support role[admin] access. +# eg: /api/v1/source2===get===[] means /api/v1/source2===get can not access by any role. resourceRole: - /api/account/auth/refresh===post===[admin,user,guest] - /api/apps/**===get===[admin,user,guest] @@ -59,8 +59,9 @@ resourceRole: - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] -# 需要被过滤保护的资源,不认证鉴权直接访问 -# /api/v1/source3===get 表示 /api/v1/source3===get 可以被任何人访问 无需登录认证鉴权 +# 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/**===* @@ -68,7 +69,7 @@ excludedResource: - /api/apps/hierarchy===get - /api/push/**===* - /api/status/page/public/**===* - # web ui 前端静态资源 + # web ui resource - /===get - /dashboard/**===get - /monitors/**===get @@ -89,18 +90,17 @@ excludedResource: - /**/*.json===get - /**/*.woff===get - /**/*.eot===get - # swagger ui 资源 + # swagger ui resource - /swagger-resources/**===get - /v2/api-docs===get - /v3/api-docs===get # h2 database - /h2-console/**===* -# 用户账户信息 -# 下面有 admin tom lili 三个账户 -# eg: admin 拥有[admin,user]角色,密码为hertzbeat -# eg: tom 拥有[user],密码为hertzbeat -# eg: lili 拥有[guest],明文密码为lili, 加盐密码为1A676730B0C7F54654B0E09184448289 +# account info config +# eg: admin has role [admin,user], password is hertzbeat +# eg: tom has role [user], password is hertzbeat +# eg: lili has role [guest], plain password is lili, salt is 123, salted password is 1A676730B0C7F54654B0E09184448289 account: - appId: admin credential: hertzbeat @@ -112,9 +112,9 @@ account: credential: hertzbeat role: [guest] - appId: lili - # 注意 Digest认证不支持加盐加密的密码账户 - # 加盐加密的密码，通过 MD5(password+salt)计算 - # 此账户的原始密码为 lili + # credential = MD5(password + salt) + # plain password: lili + # attention: digest authentication does not support salted encrypted password accounts credential: 1A676730B0C7F54654B0E09184448289 salt: 123 role: [guest] diff --git a/web-app/src/app/layout/basic/basic.component.ts b/web-app/src/app/layout/basic/basic.component.ts index 0e001a796f6..9b2ab111ff3 100644 --- a/web-app/src/app/layout/basic/basic.component.ts +++ b/web-app/src/app/layout/basic/basic.component.ts @@ -75,7 +75,7 @@ import { CONSTANTS } from '../../shared/constants';
- Apache HertzBeat {{ version }}
+ Apache HertzBeat (incubating) {{ version }}
Copyright © {{ currentYear }} Apache HertzBeat
diff --git a/web-app/src/app/layout/basic/widgets/user.component.ts b/web-app/src/app/layout/basic/widgets/user.component.ts index a1590d8837e..deb58ea3ce4 100644 --- a/web-app/src/app/layout/basic/widgets/user.component.ts +++ b/web-app/src/app/layout/basic/widgets/user.component.ts @@ -61,12 +61,14 @@ import { CONSTANTS } from '../../../shared/constants'; {{ 'about.help' | i18n }}
- Apache HertzBeat {{ version }} + + Apache HertzBeat (incubating) {{ version }} +
Copyright © {{ currentYear }} - Apache HertzBeat + Apache HertzBeat (incubating)
diff --git a/web-app/src/app/layout/passport/passport.component.html b/web-app/src/app/layout/passport/passport.component.html index f0889c0be3f..0935a5097b5 100644 --- a/web-app/src/app/layout/passport/passport.component.html +++ b/web-app/src/app/layout/passport/passport.component.html @@ -43,7 +43,7 @@
- Apache HertzBeat {{ version }}
+ Apache HertzBeat (incubating) {{ version }}
Copyright © {{ currentYear }} Apache HertzBeat
diff --git a/web-app/src/app/routes/passport/login/login.component.html b/web-app/src/app/routes/passport/login/login.component.html index 5178258f529..caf0fa8c0ce 100644 --- a/web-app/src/app/routes/passport/login/login.component.html +++ b/web-app/src/app/routes/passport/login/login.component.html @@ -47,16 +47,16 @@ - - - + + + + + + + + + +
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 2fbae1ca5a6..2a824afc73a 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 @@ {{ 'collector.deploy.package.github' | i18n }} - - {{ 'collector.deploy.package.gitee' | i18n }} -
除了使用内置采集器外，您可以注册多个采集器应用于高性能集群或云边协同场景。", "collector.help.link": "https://hertzbeat.apache.org/docs/help/guide", - "about.title": "Apache HertzBeat(赫兹跳动) 是一个开源实时监控系统，无需Agent，性能集群，兼容Prometheus，自定义监控和状态页构建能力。", + "about.title": "Apache HertzBeat (incubating) 是一个开源实时监控系统，无需Agent，性能集群，兼容Prometheus，自定义监控和状态页构建能力。", "about.point.1": "一站式监控告警通知，支持应用服务，数据库，操作系统，中间件，云原生，网络等。", "about.point.2": "易用友好，无需 Agent，全页面操作，鼠标点一点就能监控告警。", "about.point.3": "强大监控模版能力，自定义监控任何您想要的指标。", @@ -636,7 +636,7 @@ "status.public.org.state.2": "所有系统运行异常", "status.public.today": "今天", "status.public.30-day": "30天前", - "status.public.power-by": "由 HertzBeat 提供构建. Star Us !", + "status.public.power-by": "由 Apache HertzBeat 提供构建. Star Us !", "status.public.to-incident": "事件信息", "status.public.to-component": "状态页面", "status.incident": "维护事件", diff --git a/web-app/src/assets/i18n/zh-TW.json b/web-app/src/assets/i18n/zh-TW.json index 8064b283391..7f9d19108eb 100644 --- a/web-app/src/assets/i18n/zh-TW.json +++ b/web-app/src/assets/i18n/zh-TW.json @@ -581,7 +581,7 @@ "collector.deploy.docker.help.3": "# -e MANAGER_HOST=127.0.0.1 : 設置連接的主HertzBeat服務地址", "collector.deploy.docker.help.4": "# -e MODE=public : 設定運作模式(public or private), 公有叢集模式或私有雲邊模式", "collector.deploy.docker.help.5": "# --name hertzbeat-collector : 命名容器名稱 hertzbeat-collector", - "collector.deploy.docker.help.6": "# tancloud/hertzbeat-collector : 使用HertzBeat官方應用鏡像源,也可若使用quay.io/tancloud/hertzbeat-collector替換", + "collector.deploy.docker.help.6": "# apache/hertzbeat-collector : 使用HertzBeat官方應用鏡像源,也可若使用quay.io/tancloud/hertzbeat-collector替換", "collector.deploy.package": "通過 安裝包 方式部署", "collector.deploy.package.github": "下載安裝包-Github", "collector.deploy.package.gitee": "下載安裝包-Gitee", @@ -597,7 +597,7 @@ "collector.confirm.offline-batch": "請確認是否批量下線採集器!", "collector.help": "采集集群用于已注冊的監控采集器集群節點管理，展示當前采集器集群狀態和調度任務分布，支持對采集器的部署，刪除，上線，下線等批量操作。
除了使用內置采集器外，您可以注冊多個采集器應用于高性能集群或雲邊協同場景。", "collector.help.link": "https://hertzbeat.apache.org/docs/help/guide", - "about.title": "Apache HertzBeat(赫茲跳動) 是一個開源實時監控系統，無需Agent，性能集羣，兼容Prometheus，自定義監控和狀態頁構建能力。", + "about.title": "Apache HertzBeat (incubating) 是一個開源實時監控系統，無需Agent，性能集羣，兼容Prometheus，自定義監控和狀態頁構建能力。", "about.point.1": "一站式監控告警通知，支持應用服務，數據庫，操作系統，中間件，雲原生，網絡等。", "about.point.2": "易用友好，無需 Agent，全頁面操作，鼠標點一點就能監控告警。", "about.point.3": "強大監控模版能力，自定義監控任何您想要的指標。", @@ -633,7 +633,7 @@ "status.public.org.state.2": "所有系統運行異常", "status.public.today": "今天", "status.public.30-day": "30天前", - "status.public.power-by": "由 HertzBeat 提供構建. Star Us !", + "status.public.power-by": "由 Apache HertzBeat 提供構建. Star Us !", "status.public.to-incident": "事件信息", "status.public.to-component": "狀態頁面", "status.incident": "維護事件",