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

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

commit 0217cbb7f9e545635e0537dbc0b4c3d2464af7b1
Merge: 9f5df95f2 d49cb37c6
Author: zqr10159 <[email protected]>
AuthorDate: Fri Aug 30 08:54:44 2024 +0800

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

 .../hertzbeat/common/constants/PluginType.java     |   6 +-
 .../hertzbeat/common/entity/manager/Collector.java |   6 +-
 .../common/entity/manager/GeneralConfig.java       |   4 +-
 .../common/entity/manager/NoticeReceiver.java      |   5 +-
 .../common/entity/manager/NoticeRule.java          |   7 +-
 .../hertzbeat/common/entity/manager/Param.java     |   4 +-
 .../hertzbeat/common/entity/manager/Tag.java       |   6 +-
 .../common/entity/plugin/PluginConfig.java         |  36 ++++
 .../common/entity/plugin/PluginContext.java        |  40 ++++
 home/docs/help/bulletin.md                         |  28 +++
 home/docs/help/oceanbase.md                        |  59 +++++
 home/docs/help/valkey.md                           | 234 ++++++++++++++++++++
 .../current/help/bulletin.md                       |  28 +++
 .../current/help/oceanbase.md                      |  59 +++++
 .../current/help/valkey.md                         | 239 +++++++++++++++++++++
 home/sidebars.json                                 |  11 +-
 home/static/img/docs/help/bulletin-1.png           | Bin 0 -> 79792 bytes
 home/static/img/docs/help/bulletin-2.png           | Bin 0 -> 31781 bytes
 .../manager/component/alerter/DispatcherAlarm.java |  16 +-
 .../manager/controller/PluginController.java       |  17 ++
 .../manager/controller/TagController.java          |  18 +-
 .../hertzbeat/manager/dao/PluginParamDao.java      |  48 +++++
 .../hertzbeat/manager/pojo/dto/MonitorDto.java     |   3 +-
 .../hertzbeat/manager/pojo/dto/PluginParam.java    |  16 +-
 .../manager/pojo/dto/PluginParametersVO.java       |  24 ++-
 .../hertzbeat/manager/service/PluginService.java   |  28 +++
 .../manager/service/impl/DefaultPluginRunner.java  |  57 +++++
 .../manager/service/impl/PluginServiceImpl.java    | 157 ++++++++++++--
 .../manager/service/impl/TagServiceImpl.java       |   8 +
 .../src/main/resources/define/app-oceanbase.yml    |   6 +-
 .../component/alerter/DispatcherAlarmTest.java     |   6 +-
 .../manager/controller/TagControllerTest.java      |   7 +-
 .../manager/service/PluginServiceTest.java         |   7 +-
 .../hertzbeat/manager/service/TagServiceTest.java  |   7 +-
 .../apache/hertzbeat/plugin/PostAlertPlugin.java   |  14 +-
 .../apache/hertzbeat/plugin/PostCollectPlugin.java |  14 +-
 .../hertzbeat/plugin/runner/PluginRunner.java      |  27 ++-
 .../org.apache.hertzbeat.plugin.PostAlertPlugin    |  16 ++
 .../org.apache.hertzbeat.plugin.PostCollectPlugin  |  16 ++
 plugin/src/main/resources/define/define.yml        |  14 ++
 script/assembly/server/bin/entrypoint.sh           |   6 +-
 script/docker/collector/Dockerfile                 |   1 +
 warehouse/pom.xml                                  |   6 +
 .../warehouse/store/DataStorageDispatch.java       |   9 +-
 .../routes/setting/plugins/plugin.component.html   |  24 +++
 .../app/routes/setting/plugins/plugin.component.ts |  62 ++++++
 web-app/src/app/service/plugin.service.ts          |  27 ++-
 .../form-field/form-field.component.html           |   2 +-
 web-app/src/assets/i18n/en-US.json                 |   6 +-
 web-app/src/assets/i18n/zh-CN.json                 |   4 +-
 web-app/src/assets/i18n/zh-TW.json                 |   4 +-
 51 files changed, 1331 insertions(+), 118 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to