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 db3f432feb5820e7760c62ca17e1cfcc3d827319 Merge: f7de9c4b6 4b7178af0 Author: Logic <[email protected]> AuthorDate: Wed Sep 4 22:47:21 2024 +0800 Merge branch 'master' of github.com:apache/hertzbeat into script .markdownlint-cli2.jsonc | 6 +- .../collector/collect/push/PushCollectImpl.java | 3 + .../collect/script/ScriptCollectImpl.java | 2 +- .../collect/database/JdbcCommonCollectTest.java | 100 ++++++- .../collector/collect/dns/DnsCollectImplTest.java | 54 +++- .../collect/http/HttpCollectImplTest.java | 34 ++- .../collector/collect/jmx/JmxCollectImplTest.java | 39 ++- .../collect/mq/RocketmqSingleCollectTest.java | 100 +++++++ .../collector/collect/mqtt/MqttCollectTest.java | 126 +++++++++ .../nebulagraph/NebulaGraphCollectImplTest.java | 103 +++++++ .../collect/nebulagraph/NgqlCollectImplTest.java | 7 + .../collect/nginx/NginxCollectImplTest.java | 25 ++ .../collect/pop3/Pop3CollectImplTest.java | 99 +++++++ .../collect/push/PushCollectImplTest.java | 72 +++++ .../collect/redfish/RedfishCollectImplTest.java | 21 ++ .../collect/script/ScriptCollectImplTest.java | 147 ++++++++++ .../collect/smtp/SmtpCollectImplTest.java | 80 ++++++ .../collect/snmp/SnmpCollectImplTest.java | 74 ++++- .../collector/collect/ssh/SshCollectImplTest.java | 43 ++- .../collect/telnet/TelnetCollectImplTest.java | 28 ++ .../collector/collect/udp/UdpCollectImplTest.java | 19 ++ .../common/entity/grafana/GrafanaDashboard.java | 65 +++++ .../common/entity/grafana/ServiceAccount.java | 61 ++++ .../common/entity/grafana/ServiceToken.java | 50 ++-- .../hertzbeat/common/entity/manager/Monitor.java | 9 + .../common/entity/manager/bulletin/Bulletin.java | 2 +- grafana/pom.xml | 56 ++++ .../hertzbeat/grafana/common/CommonConstants.java | 77 +++++ .../grafana/config/GrafanaAutoConfiguration.java | 20 +- .../hertzbeat/grafana/config/GrafanaInit.java | 65 +++++ .../grafana/config/GrafanaProperties.java | 58 ++++ .../grafana/controller/DashboardController.java | 111 ++++++++ .../controller/ServiceAccountController.java | 119 ++++++++ .../apache/hertzbeat/grafana/dao/DashboardDao.java | 27 +- .../hertzbeat/grafana/dao/ServiceAccountDao.java | 27 +- .../hertzbeat/grafana/dao/ServiceTokenDao.java | 28 +- .../grafana/service/DashboardService.java | 181 ++++++++++++ .../grafana/service/DatasourceService.java | 134 +++++++++ .../grafana/service/ServiceAccountService.java | 309 +++++++++++++++++++++ .../src/main/resources/META-INF/spring.factories | 17 ++ home/blog/2022-06-19-hertzbeat-v1.1.0.md | 2 +- home/blog/2022-06-22-one-step-up.md | 2 +- home/blog/2022-09-10-ssl-practice.md | 22 +- home/blog/2023-01-05-monitor-iotdb.md | 16 +- home/blog/2023-01-08-monitor-shenyu.md | 18 +- home/blog/2023-02-02-monitor-dynamic-tp.md | 18 +- home/blog/2023-02-10-new-committer.md | 2 +- home/blog/2023-02-11-monitor-mysql.md | 18 +- home/blog/2023-02-15-monitor-linux.md | 22 +- home/blog/2023-03-15-hertzbeat-v1.3.0.md | 6 +- home/blog/2023-03-22-monitor-springboot2.md | 20 +- home/blog/2023-05-09-hertzbeat-v1.3.1.md | 4 +- home/blog/2023-05-11-greptimedb-store.md | 6 +- home/blog/2023-07-05-hertzbeat-v1.3.2.md | 4 +- home/blog/2023-08-14-hertzbeat-v1.4.0.md | 8 +- home/blog/2023-09-26-hertzbeat-v1.4.1.md | 4 +- home/blog/2023-11-12-hertzbeat-v1.4.2.md | 2 +- home/blog/2023-12-11-hertzbeat-v1.4.3.md | 2 +- home/blog/2024-01-18-hertzbeat-v1.4.4.md | 2 +- home/blog/2024-04-17-to-apache.md | 4 +- home/blog/2024-06-15-hertzbeat-v1.6.0.md | 2 +- home/blog/2024-07-07-new-committer.md | 2 +- home/blog/2024-07-08-new-committer.md | 2 +- home/blog/2024-07-15-new-committer.md | 2 +- home/blog/2024-07-27-new-committer.md | 2 +- home/blog/2024-07-28-new-committer.md | 2 +- home/blog/2024-07-29-new-committer.md | 2 +- .../docs/advanced/extend-http-example-hertzbeat.md | 8 +- home/docs/advanced/extend-http-example-token.md | 10 +- home/docs/advanced/extend-jmx.md | 2 +- home/docs/advanced/extend-push.md | 2 +- home/docs/advanced/extend-snmp.md | 2 +- home/docs/advanced/extend-telnet.md | 2 +- home/docs/advanced/extend-tutorial.md | 8 +- .../docs/community/code-style-and-quality-guide.md | 2 +- home/docs/help/linux_script.md | 100 +++++++ home/docs/help/nvidia.md | 37 +++ home/docs/help/plugin.md | 4 + home/docs/help/redis_cluster.md | 4 +- home/docs/help/status.md | 8 +- home/docs/help/windows_script.md | 85 ++++++ home/docs/introduce.md | 44 +-- home/docs/start/docker-deploy.md | 2 +- home/docs/start/package-deploy.md | 2 +- home/docs/start/rainbond-deploy.md | 4 +- home/docs/start/sslcert-practice.md | 22 +- home/docs/template.md | 4 +- .../2022-09-10-ssl-practice.md | 22 +- .../2023-01-05-monitor-iotdb.md | 16 +- .../2023-01-08-monitor-shenyu.md | 18 +- .../2023-02-02-monitor-dynamic-tp.md | 18 +- .../2023-02-11-monitor-mysql.md | 18 +- .../2023-02-15-monitor-linux.md | 22 +- .../2023-03-15-hertzbeat-v1.3.0.md | 6 +- .../2023-03-22-monitor-springboot2.md | 20 +- .../2023-05-09-hertzbeat-v1.3.1.md | 4 +- .../2023-07-05-hertzbeat-v1.3.2.md | 2 +- .../2023-08-14-hertzbeat-v1.4.0.md | 4 +- .../2024-04-17-to-apache.md | 4 +- .../advanced/extend-http-example-hertzbeat.md | 8 +- .../current/advanced/extend-http-example-token.md | 10 +- .../current/advanced/extend-http.md | 2 +- .../current/advanced/extend-jdbc.md | 2 +- .../current/advanced/extend-jmx.md | 2 +- .../current/advanced/extend-ngql.md | 2 +- .../current/advanced/extend-point.md | 2 +- .../current/advanced/extend-push.md | 2 +- .../current/advanced/extend-snmp.md | 2 +- .../current/advanced/extend-ssh.md | 2 +- .../current/advanced/extend-telnet.md | 2 +- .../current/advanced/extend-tutorial.md | 8 +- .../community/code-style-and-quality-guide.md | 2 +- .../current/community/new_committer_process.md | 48 ++-- .../current/help/linux_script.md | 100 +++++++ .../current/help/nvidia.md | 37 +++ .../current/help/plugin.md | 4 + .../current/help/redis_cluster.md | 4 +- .../current/help/status.md | 8 +- .../current/help/windows_script.md | 85 ++++++ .../current/introduce.md | 44 +-- .../current/start/docker-deploy.md | 2 +- .../current/start/package-deploy.md | 2 +- .../current/start/rainbond-deploy.md | 4 +- .../current/start/sslcert-practice.md | 22 +- .../current/template.md | 2 +- .../advanced/extend-http-example-hertzbeat.md | 8 +- .../advanced/extend-http-example-token.md | 10 +- .../version-v1.5.x/advanced/extend-http.md | 2 +- .../version-v1.5.x/advanced/extend-jdbc.md | 2 +- .../version-v1.5.x/advanced/extend-jmx.md | 2 +- .../version-v1.5.x/advanced/extend-ngql.md | 2 +- .../version-v1.5.x/advanced/extend-point.md | 2 +- .../version-v1.5.x/advanced/extend-push.md | 2 +- .../version-v1.5.x/advanced/extend-snmp.md | 2 +- .../version-v1.5.x/advanced/extend-ssh.md | 2 +- .../version-v1.5.x/advanced/extend-tutorial.md | 8 +- .../community/code-style-and-quality-guide.md | 2 +- .../version-v1.5.x/introduce.md | 44 +-- .../version-v1.5.x/start/rainbond-deploy.md | 4 +- .../version-v1.5.x/start/sslcert-practice.md | 22 +- .../version-v1.5.x/template.md | 4 +- home/sidebars.json | 4 +- .../advanced/extend-http-example-hertzbeat.md | 8 +- .../advanced/extend-http-example-token.md | 10 +- .../version-v1.5.x/advanced/extend-jmx.md | 2 +- .../version-v1.5.x/advanced/extend-push.md | 2 +- .../version-v1.5.x/advanced/extend-snmp.md | 2 +- .../version-v1.5.x/advanced/extend-tutorial.md | 8 +- .../community/code-style-and-quality-guide.md | 2 +- home/versioned_docs/version-v1.5.x/introduce.md | 44 +-- .../version-v1.5.x/start/rainbond-deploy.md | 4 +- .../version-v1.5.x/start/sslcert-practice.md | 22 +- home/versioned_docs/version-v1.5.x/template.md | 2 +- manager/pom.xml | 5 + .../manager/controller/BulletinController.java | 4 +- .../apache/hertzbeat/manager/dao/BulletinDao.java | 5 + .../manager/service/impl/BulletinServiceImpl.java | 9 +- .../manager/service/impl/MonitorServiceImpl.java | 23 +- .../manager/service/impl/PluginServiceImpl.java | 19 +- .../manager/service/impl/TagServiceImpl.java | 4 +- manager/src/main/resources/application-test.yml | 6 + manager/src/main/resources/application.yml | 7 +- .../main/resources/define/app-elasticsearch.yml | 9 + .../src/main/resources/define/app-linux_script.yml | 4 +- manager/src/main/resources/define/app-nvidia.yml | 198 +++++++++++++ .../main/resources/define/app-windows_script.yml | 4 +- manager/src/main/resources/sureness.yml | 4 + .../scheduler/CollectorJobSchedulerTest.java | 67 +++++ .../manager/service/BulletinServiceTest.java | 210 ++++++++++++++ .../manager/service/CollectorServiceTest.java | 32 ++- .../manager/service/DefaultPluginRunnerTest.java | 71 +++++ pom.xml | 7 + .../docker-compose.yaml | 4 +- .../src/app/pojo/GrafanaDashboard.ts | 25 +- web-app/src/app/pojo/Monitor.ts | 2 + .../src/app/routes/SafePipe.ts | 26 +- .../app/routes/bulletin/bulletin.component.html | 6 +- .../src/app/routes/bulletin/bulletin.component.ts | 6 + .../monitor-detail/monitor-detail.component.html | 9 + .../monitor-detail/monitor-detail.component.ts | 16 ++ .../monitor/monitor-edit/monitor-edit.component.ts | 17 ++ .../monitor-form/monitor-form.component.html | 33 +++ .../monitor/monitor-form/monitor-form.component.ts | 14 + .../monitor/monitor-list/monitor-list.component.ts | 19 ++ .../monitor/monitor-new/monitor-new.component.ts | 2 + web-app/src/app/routes/monitor/monitor.module.ts | 2 + web-app/src/app/service/monitor.service.ts | 9 + web-app/src/assets/i18n/en-US.json | 8 +- web-app/src/assets/i18n/zh-CN.json | 6 + web-app/src/assets/i18n/zh-TW.json | 8 +- 190 files changed, 4233 insertions(+), 603 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
