This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch doc-mysql in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit ffc4641dc9fedfbe7a2358376fafe8ffb6da45c2 Merge: d0cb9f8bf 874f7bdab Author: zqr10159 <[email protected]> AuthorDate: Tue Jul 9 15:45:37 2024 +0800 Merge branch 'master' of github.com:apache/hertzbeat .all-contributorsrc | 52 +- README.md | 13 +- README_CN.md | 13 +- .../hertzbeat/alert/calculate/CalculateAlarm.java | 1 - ...rk.boot.autoconfigure.AutoConfiguration.imports | 16 + .../collector/collect/ftp/FtpCollectImpl.java | 1 + .../collect/mongodb/MongodbSingleCollectImpl.java | 1 + .../collect/mq/RocketmqSingleCollectImpl.java | 1 + .../collect/redis/RedisCommonCollectImpl.java | 1 + ...rk.boot.autoconfigure.AutoConfiguration.imports | 16 + .../hertzbeat/common/constants/AiConstants.java | 24 +- .../hertzbeat/common/constants/PluginType.java} | 15 +- .../hertzbeat/common/entity/dto/PluginUpload.java | 34 +- .../common/entity/manager/NoticeReceiver.java | 10 + .../common/entity/manager/PluginItem.java | 94 +++ .../common/entity/manager/PluginMetadata.java | 103 +++ .../hertzbeat/common/util/ProtoJsonUtil.java | 13 + .../hertzbeat/common/util/TimePeriodUtil.java | 8 + .../apache/hertzbeat/common/util/TimeZoneUtil.java | 56 ++ ...rk.boot.autoconfigure.AutoConfiguration.imports | 16 + .../hertzbeat/common/util/LruHashMapTest.java | 50 +- ...{ProtoJsonUtilTest.java => MapCapUtilTest.java} | 29 +- .../hertzbeat/common/util/ProtoJsonUtilTest.java | 38 +- .../common/util/ResourceBundleUtilTest.java | 58 +- .../hertzbeat/common/util/TimePeriodUtilTest.java | 107 +++ .../hertzbeat/common/util/entity/PersonTest.java | 837 +++++++++++++++++++++ .../LruHashMapTest.java => proto/person.proto} | 16 +- e2e/data/monitor-ftp.json | 8 +- e2e/data/monitor-http.json | 15 - e2e/data/monitor-ping.json | 4 +- e2e/data/monitor-port.json | 6 +- e2e/data/monitor-sitemap.json | 8 +- e2e/data/monitor-ssl.json | 4 +- e2e/data/monitor-udp.json | 6 +- e2e/data/monitor-website.json | 8 +- e2e/testsuite.yaml | 166 +++- home/blog/2024-07-07-new-committer.md | 46 ++ home/blog/2024-07-08-new-committer.md | 52 ++ home/docs/help/ai_config.md | 17 + home/docs/help/prestodb.md | 66 ++ .../2024-07-07-new-committer.md | 48 ++ .../2024-07-08-new-committer.md | 52 ++ .../current/help/ai_config.md | 17 + .../current/help/prestodb.md | 64 ++ home/sidebars.json | 1 + home/src/pages/team/index.jsx | 29 +- .../manager/component/alerter/DispatcherAlarm.java | 36 +- ...pl.java => WeComAppAlertNotifyHandlerImpl.java} | 32 +- ....java => WeComRobotAlertNotifyHandlerImpl.java} | 2 +- .../component/listener/TimeZoneListener.java | 47 ++ .../manager/config/CommonCommandLineRunner.java | 23 +- .../hertzbeat/manager/config/JacksonConfig.java | 45 ++ .../hertzbeat/manager/controller/AiController.java | 15 +- .../manager/controller/PluginController.java | 110 +++ .../hertzbeat/manager/dao/PluginItemDao.java | 20 +- .../AiService.java => dao/PluginMetadataDao.java} | 31 +- .../hertzbeat/manager/pojo/dto/KimiAiResponse.java | 93 --- ...estParamDTO.java => OpenAiRequestParamDTO.java} | 4 +- .../{ZhiPuAiResponse.java => OpenAiResponse.java} | 26 +- .../manager/pojo/dto/SparkDeskRequestParamDTO.java | 64 -- .../manager/pojo/dto/SparkDeskResponse.java | 93 --- .../manager/pojo/dto/ZhiPuRequestParamDTO.java | 70 -- .../hertzbeat/manager/service/AiService.java | 3 +- .../hertzbeat/manager/service/PluginService.java | 73 ++ .../manager/service/impl/AlibabaAiServiceImpl.java | 79 +- .../service/{ => impl}/KimiAiServiceImpl.java | 66 +- .../manager/service/impl/PluginServiceImpl.java | 268 +++++++ .../service/impl/SparkDeskAiServiceImpl.java | 38 +- .../impl/SystemGeneralConfigServiceImpl.java | 26 +- .../manager/service/impl/ZhiPuServiceImpl.java | 71 +- manager/src/main/resources/application-test.yml | 3 +- manager/src/main/resources/application.yml | 9 +- manager/src/main/resources/define/app-prestodb.yml | 277 +++++++ .../main/resources/define/app-spring_gateway.yml | 66 ++ .../src/main/resources/define/app-springboot2.yml | 60 ++ .../src/main/resources/define/app-springboot3.yml | 52 ++ .../impl/WeChatAppAlertNotifyHandlerImplTest.java | 2 +- ...a => WeComRobotAlertNotifyHandlerImplTest.java} | 6 +- .../manager/controller/AppControllerTest.java | 117 +++ .../manager/controller/PluginControllerTest.java | 116 +++ .../manager/service/PluginServiceTest.java | 135 ++++ pom.xml | 14 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 16 + ...rk.boot.autoconfigure.AutoConfiguration.imports | 16 + .../app/layout/basic/widgets/notify.component.ts | 88 ++- web-app/src/app/layout/layout.module.ts | 9 +- web-app/src/app/pojo/NoticeReceiver.ts | 2 + web-app/src/app/pojo/Plugin.ts | 27 + web-app/src/app/pojo/PluginItem.ts | 22 + .../alert/alert-notice/alert-notice.component.html | 51 +- .../monitor-data-chart.component.html | 2 +- .../monitor-detail/monitor-detail.component.html | 2 +- .../monitor-detail/monitor-detail.component.less | 4 +- .../monitor-edit/monitor-edit.component.html | 7 +- .../monitor/monitor-edit/monitor-edit.component.ts | 70 +- .../monitor-form/monitor-form.component.html | 8 +- .../monitor/monitor-form/monitor-form.component.ts | 21 +- .../monitor/monitor-new/monitor-new.component.ts | 20 +- .../routes/setting/plugins/plugin.component.html | 152 ++++ .../setting/plugins/plugin.component.spec.ts | 43 ++ .../app/routes/setting/plugins/plugin.component.ts | 263 +++++++ .../app/routes/setting/setting-routing.module.ts | 2 + web-app/src/app/routes/setting/setting.module.ts | 8 +- web-app/src/app/service/plugin.service.spec.ts | 35 + web-app/src/app/service/plugin.service.ts | 89 +++ .../help-message-show.component.html | 6 +- .../help-message-show.component.ts | 8 +- web-app/src/assets/app-data.json | 6 + web-app/src/assets/i18n/en-US.json | 29 +- web-app/src/assets/i18n/zh-CN.json | 29 +- web-app/src/assets/i18n/zh-TW.json | 29 +- 111 files changed, 4683 insertions(+), 813 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
