This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch bulletin in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 6d57704aa5d95679b067c2c458a0c55404c9243a Merge: a380e6f3b 3a2e0b3dd Author: zqr10159 <[email protected]> AuthorDate: Sun Jul 14 01:06:40 2024 +0800 Merge branch 'master' of github.com:apache/hertzbeat into bulletin README.md | 4 +- README_CN.md | 4 +- .../collector/collect/http/HttpCollectImpl.java | 59 +++-- home/blog/2024-06-11-hertzbeat-v1.6.0-update.md | 3 +- home/docs/start/mysql-change.md | 2 +- .../start/update-1.6.0.md} | 9 +- home/i18n/en/code.json | 2 +- home/i18n/zh-cn/code.json | 2 +- .../2024-06-11-hertzbeat-v1.6.0-update.md | 3 +- .../current/community/new_committer_process.md | 2 + .../current/start/mysql-change.md | 2 +- .../current/start/update-1.6.0.md} | 9 +- .../version-v1.3.x/start/package-deploy.md | 2 +- .../version-v1.3.x/start/quickstart.md | 2 +- .../version-v1.4.x/start/package-deploy.md | 4 +- .../version-v1.4.x/start/quickstart.md | 4 +- .../version-v1.4.x/start/upgrade.md | 2 +- .../version-v1.5.x/start/quickstart.md | 4 +- .../version-v1.5.x/start/upgrade.md | 2 +- home/sidebars.json | 1 + home/src/constants.js | 2 +- home/static/img/blog/multi-protocol.png | Bin 304516 -> 1007741 bytes .../version-v1.3.x/start/package-deploy.md | 2 +- .../version-v1.3.x/start/quickstart.md | 2 +- .../version-v1.4.x/start/package-deploy.md | 4 +- .../version-v1.4.x/start/quickstart.md | 4 +- .../versioned_docs/version-v1.4.x/start/upgrade.md | 2 +- .../version-v1.5.x/start/quickstart.md | 4 +- .../versioned_docs/version-v1.5.x/start/upgrade.md | 2 +- .../manager/controller/PluginController.java | 2 +- .../manager/service/impl/PluginServiceImpl.java | 63 +++-- manager/src/main/resources/define/app-api.yml | 45 ++++ manager/src/main/resources/define/app-website.yml | 45 ++++ .../manager/service/PluginServiceTest.java | 4 +- .../docker-compose/hertzbeat-mysql-iotdb/README.md | 2 +- .../hertzbeat-mysql-iotdb/README_CN.md | 2 +- .../hertzbeat-mysql-tdengine/README.md | 2 +- .../hertzbeat-mysql-tdengine/README_CN.md | 2 +- .../hertzbeat-mysql-victoria-metrics/README.md | 2 +- .../hertzbeat-mysql-victoria-metrics/README_CN.md | 2 +- .../alert-converge/alert-converge.component.ts | 25 +- .../alert-setting/alert-setting.component.html | 24 +- .../alert/alert-setting/alert-setting.component.ts | 58 +---- .../alert/alert-silence/alert-silence.component.ts | 16 +- .../monitor-form/monitor-form.component.html | 192 ++++++++------ .../monitor-form/monitor-form.component.less | 6 +- .../setting/collector/collector.component.ts | 12 +- .../routes/setting/plugins/plugin.component.html | 15 +- .../app/routes/setting/plugins/plugin.component.ts | 37 ++- .../message-server/message-server.component.html | 8 +- .../message-server/message-server.component.ts | 15 +- .../form-field/form-field.component.html | 171 ++++++++++++ .../form-field.component.less} | 0 .../form-field.component.spec.ts} | 12 +- .../components/form-field/form-field.component.ts | 81 ++++++ .../components/form-item/form-item.component.html | 286 --------------------- .../tags-select/tags-select.component.html | 78 ++++++ .../tags-select/tags-select.component.less | 4 + .../tags-select.component.spec.ts} | 12 +- .../tags-select.component.ts} | 48 +++- web-app/src/app/shared/shared.module.ts | 6 +- 61 files changed, 847 insertions(+), 574 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
