You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@hertzbeat.apache.org by zh...@apache.org on 2024/07/02 08:55:24 UTC

(hertzbeat) 01/03: Merge branch 'master' of github.com:apache/hertzbeat

This is an automated email from the ASF dual-hosted git repository.

zhaoqingran pushed a commit to branch crossoverjie
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git

commit b0fdd5e11d98436e41d80b10e53aac88c87ad793
Merge: 9c5ea20b1 56db54072
Author: zqr10159 <zq...@126.com>
AuthorDate: Tue Jun 18 11:30:05 2024 +0800

    Merge branch 'master' of github.com:apache/hertzbeat

 .all-contributorsrc                                |   27 +
 .github/workflows/backend-build-test.yml           |    4 +
 README.md                                          |   12 +-
 README_CN.md                                       |   12 +-
 .../collector/collect/dns/DnsCollectImpl.java      |    4 +-
 .../collector/collect/http/HttpCollectImpl.java    |    2 +-
 .../collector/collect/imap/ImapCollectImpl.java    |  169 +
 .../collect/mongodb/MongodbSingleCollectImpl.java  |   20 +-
 .../dispatch/CollectorInfoProperties.java          |   49 +-
 .../collector/dispatch/DispatchConstants.java      |    4 +
 .../collector/dispatch/entrance/CollectServer.java |   33 +-
 .../hertzbeat/collector/util/CollectUtil.java      |   22 +
 ...che.hertzbeat.collector.collect.AbstractCollect |    1 +
 collector/src/main/resources/application.yml       |    3 +
 .../collector/collect/dns/DnsCollectImplTest.java  |    9 +-
 .../collect/imap/ImapCollectImplTest.java          |  142 +
 .../collect/redis/RedisSingleCollectImplTest.java  |   17 +
 common/pom.xml                                     |    7 +
 .../common/constants/CollectorConstants.java       |    6 +
 .../hertzbeat/common/entity/dto/CollectorInfo.java |    4 +-
 .../hertzbeat/common/entity/job/Metrics.java       |    9 +-
 .../{MongodbProtocol.java => ImapProtocol.java}    |   36 +-
 .../entity/job/protocol/MongodbProtocol.java       |    5 +
 .../hertzbeat/common/entity/manager/Collector.java |    3 +
 .../common/entity/manager/NoticeReceiver.java      |    5 +
 .../apache/hertzbeat/common/util/IpDomainUtil.java |    4 +
 .../CollectorConstants.java => util/StrUtil.java}  |   39 +-
 e2e/Dockerfile                                     |    2 +-
 home/blog/2024-06-15-hertzbeat-v1.6.0.md           |  395 ++
 home/docs/advanced/extend-http-default.md          |  193 +-
 .../docs/advanced/extend-http-example-hertzbeat.md |   33 +-
 home/docs/advanced/extend-http-example-token.md    |  526 +-
 home/docs/advanced/extend-http.md                  |  170 +-
 home/docs/advanced/extend-point.md                 |    8 +
 home/docs/advanced/extend-tutorial.md              |    8 +
 home/docs/community/how-to-release.md              |   18 +-
 home/docs/community/new_committer_process.md       |   30 +-
 home/docs/help/flink_on_yarn.md                    |  137 +
 home/docs/help/imap.md                             |   47 +
 home/docs/help/mongodb_atlas.md                    |   82 +
 home/docs/help/mysql.md                            |    5 +
 home/docs/start/greptime-init.md                   |    2 +-
 home/docs/start/influxdb-init.md                   |    2 +-
 home/docs/start/iotdb-init.md                      |    2 +-
 home/docs/start/mysql-change.md                    |   58 +-
 home/docs/start/postgresql-change.md               |   48 +-
 home/docs/start/quickstart.md                      |    6 +-
 home/docs/start/tdengine-init.md                   |    2 +-
 home/docs/start/victoria-metrics-init.md           |    2 +-
 home/i18n/en/code.json                             |    2 +-
 .../2024-06-15-hertzbeat-v1.6.0.md                 |  397 ++
 .../current/advanced/extend-http-default.md        |  194 +-
 .../advanced/extend-http-example-hertzbeat.md      |   60 +-
 .../current/advanced/extend-http-example-token.md  |  209 +-
 .../current/advanced/extend-http-jsonpath.md       |    3 +-
 .../current/advanced/extend-http.md                |  173 +-
 .../current/advanced/extend-point.md               |    8 +
 .../current/advanced/extend-tutorial.md            |    8 +
 .../current/community/how-to-release.md            |   18 +-
 .../current/community/new_committer_process.md     |   30 +-
 .../current/help/flink_on_yarn.md                  |  148 +
 .../current/help/imap.md                           |   47 +
 .../current/help/mongodb_atlas.md                  |   82 +
 .../current/help/mysql.md                          |    5 +
 .../current/start/greptime-init.md                 |    4 +-
 .../current/start/influxdb-init.md                 |    4 +-
 .../current/start/iotdb-init.md                    |    4 +-
 .../current/start/mysql-change.md                  |   60 +-
 .../current/start/postgresql-change.md             |   48 +-
 .../current/start/quickstart.md                    |   45 +-
 .../current/start/tdengine-init.md                 |    4 +-
 .../current/start/victoria-metrics-init.md         |    2 +-
 home/sidebars.json                                 |   15 +-
 home/src/pages/team/index.jsx                      |   14 +
 home/static/img/docs/cluster-arch.png              |  Bin 503121 -> 650776 bytes
 home/static/img/docs/custom-arch.png               |  Bin 599617 -> 645261 bytes
 home/static/img/docs/hertzbeat-arch.png            |  Bin 1405558 -> 1361003 bytes
 home/static/img/docs/hertzbeat-arch.svg            |    6 +-
 .../impl/DingTalkRobotAlertNotifyHandlerImpl.java  |  102 +-
 .../impl/FlyBookAlertNotifyHandlerImpl.java        |   62 +-
 .../impl/WeWorkRobotAlertNotifyHandlerImpl.java    |   28 +-
 .../manager/controller/MonitorController.java      |   11 -
 .../manager/scheduler/CollectorJobScheduler.java   |    3 +
 .../manager/scheduler/ConcurrentTreeMap.java       |   13 +
 .../manager/scheduler/ConsistentHash.java          |  169 +-
 .../hertzbeat/manager/scheduler/SchedulerInit.java |    4 +-
 .../manager/service/impl/MonitorServiceImpl.java   |   26 +-
 .../db/migration/mysql/V160__update_column.sql     |    3 +
 .../main/resources/define/app-flink_on_yarn.yml    |  480 ++
 .../main/resources/define/app-mongodb-atlas.yml    |  346 ++
 .../main/resources/define/app-netease_mailbox.yml  |  418 ++
 .../src/main/resources/define/app-qq_mailbox.yml   |  418 ++
 .../manager/scheduler/ConsistentHashTest.java      |  100 +
 material/licenses/LICENSE                          |    1 +
 material/licenses/backend/LICENSE                  |    1 +
 material/licenses/backend/LICENSE-jutf7.txt        |   20 +
 material/licenses/collector/LICENSE                |    1 +
 material/licenses/collector/LICENSE-jutf7.txt      |   20 +
 pom.xml                                            |   20 +
 script/docker-compose/README.md                    |    5 +-
 .../docker-compose/hertzbeat-mysql-iotdb/README.md |    6 +-
 .../hertzbeat-mysql-iotdb/README_CN.md             |    7 +-
 .../hertzbeat-mysql-iotdb/conf/application.yml     |   46 +-
 .../hertzbeat-mysql-iotdb/docker-compose.yaml      |    1 +
 .../hertzbeat-mysql-iotdb/ext-lib/.gitignore       |    2 +
 .../hertzbeat-mysql-iotdb/ext-lib/README           |   21 +
 .../hertzbeat-mysql-tdengine/README.md             |    8 +-
 .../hertzbeat-mysql-tdengine/README_CN.md          |    7 +-
 .../hertzbeat-mysql-tdengine/conf/application.yml  |   49 +-
 .../hertzbeat-mysql-tdengine/docker-compose.yaml   |    1 +
 .../hertzbeat-mysql-tdengine/ext-lib/.gitignore    |    2 +
 .../hertzbeat-mysql-tdengine/ext-lib/README        |   21 +
 .../hertzbeat-mysql-victoria-metrics/README.md     |    6 +-
 .../hertzbeat-mysql-victoria-metrics/README_CN.md  |    5 +-
 .../conf/application.yml                           |   52 +-
 .../dbdata/mysqldata/.gitignore                    |    3 +
 .../dbdata/tsdbdata/.gitignore                     |    3 +
 .../docker-compose.yaml                            |    1 +
 .../ext-lib/.gitignore                             |    2 +
 .../ext-lib/README                                 |   21 +
 .../README.md                                      |    6 +-
 .../README_CN.md                                   |    6 +-
 .../conf/application.yml                           |   65 +-
 .../conf/sql/schema.sql                            |    0
 .../conf/sureness.yml                              |    0
 .../dbdata/pgdata/.gitignore                       |    3 +
 .../dbdata/tsdbdata/.gitignore                     |    3 +
 .../docker-compose.yaml                            |   29 +-
 .../ext-lib/.gitignore                             |    2 +
 .../ext-lib/README                                 |   21 +
 script/helm/hertzbeat/Chart.yaml                   |    6 +-
 .../hertzbeat/templates/database/configmap.yaml    |   14 +-
 .../helm/hertzbeat/templates/database/service.yaml |    4 +-
 .../hertzbeat/templates/database/statefulset.yaml  |    6 +-
 .../hertzbeat/templates/manager/configmap.yaml     |   47 +-
 script/helm/hertzbeat/values.yaml                  |    6 +-
 web-app/angular.json                               |    9 +-
 web-app/package.json                               |   80 +-
 web-app/proxy.conf.json                            |    8 +
 web-app/src/app/global-config.module.ts            |    2 +-
 web-app/src/app/pojo/Collector.ts                  |    1 +
 web-app/src/app/pojo/NoticeReceiver.ts             |    1 +
 .../alert/alert-notice/alert-notice.component.html |   38 +-
 .../alert/alert-notice/alert-notice.component.ts   |   36 +-
 .../monitor/monitor-list/monitor-list.component.ts |   15 +-
 .../setting/collector/collector.component.html     |    2 +
 .../routes/setting/define/define.component.less    |    6 +
 web-app/src/assets/i18n/en-US.json                 |    3 +-
 web-app/src/assets/i18n/zh-CN.json                 |    4 +-
 web-app/src/assets/i18n/zh-TW.json                 |    3 +-
 web-app/src/environments/environment.ts            |    2 +-
 web-app/src/main.ts                                |   21 +-
 web-app/src/styles/theme.less                      |    2 +-
 web-app/yarn.lock                                  | 5908 ++++++++++----------
 154 files changed, 8927 insertions(+), 3961 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@hertzbeat.apache.org
For additional commands, e-mail: notifications-help@hertzbeat.apache.org