This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a change to branch feature#grafana
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from efb83dc20 Merge branch 'master' into feature#grafana
add 2ffdda8f2 [improve] optimize the monitoring editing form. (#2172)
add 1cb293ac0 [bugfix] fixed issue of monitor-select-menu-modal (#2177)
add b4d0e77c9 [feature] : support kimi Ai (#2171)
add eeba46af9 Fixed issue of acions in list-page. (#2181)
add b5c7705f4 [bugfix] fixed issue of status-page (#2182)
add ccbc7c698 [doc] add status page doc (#2186)
add 6222c51f4 [doc] add kimiAi doc (#2184)
add 0699e8934 [Improve] Refactor the notification sending logic. (#2180)
add 6cdffbefa Optimize the visual experience of the monitoring details
page. (#2189)
add 9260bca05 Optimize the dashboard. (#2193)
add 20f3b0125 Optimize the [Threshold Rule] Form. (#2190)
add 7ee227196 [bugfix] fixed "Alert Threshold Association with Monitors"
is invalid bug #2105 (#2191)
add f9b04ceb0 Add a missing multi-language translation. (#2194)
add 19a59004d Optimize the detail-page of monitor. (#2196)
add f6fcd52a5 Optimize the tags-selection. (#2198)
add 9b31fe785 [improve]add zookeeper envi monitor (#2202)
add 97e543529 [chore] update community contribution.md files (#2199)
add 5b44a9529 [Improve] add IpDomainUtil & IntervaiExpressionUtil unit
test (#2204)
add b9f8b7de7 Unified the search interaction of the list page. (#2207)
add 336eaffd2 Optimize the user experience of monitoring list pages.
(#2209)
add cbf653692 Optimize the user experience of monitoring list pages.
(#2211)
add f3cecea30 [doc] add redis-cluster help document[New] (#2210)
add a86fc85ff [feature] : add SparkDesk Ai (#2185)
add 2fd0090e8 [Chore] translate zh -> en in pom.xml (#2213)
add e992da78c Two new functions are added to the notification center
(#2214)
add 5e2e78fe9 Hide the area when there are no advanced settings (#2215)
add 65d69eb19 Fixed style issue of chart in detail-page (#2219)
add 4149a027a [Improve] add @Override (#2224)
add c3faea07c [improve] WeCom app supports sending to specific users,
departments, tags (#2220)
add 753ea44d2 [improve] optimize code structure and doc modify (#2222)
add 12230b47c [doc] update new contributors wall (#2225)
add 78ce1cdc1 [refactor] remove chinese in application.yml (#2226)
add c7d192996 [Improve] add MapCap & LruMap unit test (#2227)
add 21a778852 [Improve] add ProtoJsonUtil unit test (#2228)
add d884278fe [fix] add springboot3.0 autoconfig (#2230)
add 53787cc21 [bugfix] auto config timezone for Jackson (#2122)
add 044c6d4ba [e2e] complete e2e test case (#2231)
add a618ff00e [doc] Introduce Committer (#2232)
add 78621f2f1 [Improve] add TimePeriodUtil & ResourceBundleUtil unit test
(#2233)
add 84c435cf2 Merge branch 'refs/heads/master' into feature#grafana
No new revisions were added by this update.
Summary of changes:
.all-contributorsrc | 52 +-
README.md | 13 +-
README_CN.md | 13 +-
.../apache/hertzbeat/alert/AlerterWorkerPool.java | 31 +
.../hertzbeat/alert/calculate/CalculateAlarm.java | 1 -
.../alert/service/impl/AlertDefineServiceImpl.java | 25 +-
...rk.boot.autoconfigure.AutoConfiguration.imports | 4 +-
.../collector/collect/ftp/FtpCollectImpl.java | 1 +
.../collect/mongodb/MongodbSingleCollectImpl.java | 1 +
.../collect/mq/RocketmqSingleCollectImpl.java | 1 +
.../collect/redis/RedisCommonCollectImpl.java | 1 +
.../collect/telnet/TelnetCollectImpl.java | 9 +-
...k.boot.autoconfigure.AutoConfiguration.imports} | 3 +-
.../hertzbeat/common/constants/AiConstants.java | 61 ++
.../hertzbeat/common/constants/AiTypeEnum.java | 13 +-
.../common/constants/CollectorConstants.java | 4 +
.../common/entity/manager/NoticeReceiver.java | 10 +
.../common/util/IntervalExpressionUtil.java | 6 +-
.../apache/hertzbeat/common/util/IpDomainUtil.java | 14 +-
.../hertzbeat/common/util/ProtoJsonUtil.java | 13 +
.../hertzbeat/common/util/TimePeriodUtil.java | 8 +
.../apache/hertzbeat/common/util/TimeZoneUtil.java | 56 ++
...k.boot.autoconfigure.AutoConfiguration.imports} | 4 +-
.../common/util/IntervalExpressionUtilTest.java | 49 +-
.../hertzbeat/common/util/IpDomainUtilTest.java | 76 +-
.../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 +++++++++++++++++++++
.../src/test/proto/person.proto | 13 +-
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/docs/help/ai_config.md | 6 +
home/docs/help/redis_cluster.md | 164 ++++
home/docs/help/status.md | 76 ++
.../2024-06-07-new-committer.md | 48 ++
.../current/community/contribution.md | 24 +-
.../current/help/ai_config.md | 6 +
.../current/help/redis_cluster.md | 164 ++++
.../current/help/status.md | 73 ++
home/src/pages/team/index.jsx | 29 +-
home/static/img/docs/help/redis-cluster-add.png | Bin 0 -> 385160 bytes
home/static/img/docs/help/redis-cluster-view.png | Bin 0 -> 560677 bytes
home/static/img/docs/help/status-1.png | Bin 0 -> 34202 bytes
home/static/img/docs/help/status-2.png | Bin 0 -> 49314 bytes
home/static/img/docs/help/status-3.png | Bin 0 -> 81039 bytes
home/static/img/docs/help/status-4.png | Bin 0 -> 24153 bytes
.../manager/component/alerter/DispatcherAlarm.java | 56 +-
.../impl/AbstractAlertNotifyHandlerImpl.java | 7 -
...pl.java => WeComAppAlertNotifyHandlerImpl.java} | 32 +-
....java => WeComRobotAlertNotifyHandlerImpl.java} | 2 +-
.../component/listener/TimeZoneListener.java | 33 +-
.../manager/config/CommonCommandLineRunner.java | 23 +-
.../{SchedulerConfig.java => JacksonConfig.java} | 27 +-
.../manager/controller/MonitorsController.java | 4 +-
...estParamDTO.java => KimiAiRequestParamDTO.java} | 10 +-
.../{ZhiPuAiResponse.java => KimiAiResponse.java} | 4 +-
...ParamDTO.java => SparkDeskRequestParamDTO.java} | 12 +-
...ZhiPuAiResponse.java => SparkDeskResponse.java} | 4 +-
.../manager/pojo/dto/ZhiPuRequestParamDTO.java | 2 +-
...hiPuServiceImpl.java => KimiAiServiceImpl.java} | 46 +-
.../manager/service/impl/MailServiceImpl.java | 6 -
...erviceImpl.java => SparkDeskAiServiceImpl.java} | 74 +-
.../impl/SystemGeneralConfigServiceImpl.java | 26 +-
.../manager/service/impl/ZhiPuServiceImpl.java | 2 +-
manager/src/main/resources/application-test.yml | 4 +-
manager/src/main/resources/application.yml | 12 +-
.../src/main/resources/define/app-zookeeper.yml | 116 +++
.../impl/WeChatAppAlertNotifyHandlerImplTest.java | 2 +-
...a => WeComRobotAlertNotifyHandlerImplTest.java} | 6 +-
pom.xml | 14 +-
...rk.boot.autoconfigure.AutoConfiguration.imports | 4 +-
...rk.boot.autoconfigure.AutoConfiguration.imports | 4 +-
.../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 +
.../alert/alert-center/alert-center.component.html | 70 +-
.../alert-converge/alert-converge.component.html | 54 +-
.../alert/alert-notice/alert-notice.component.html | 157 ++--
.../alert-setting/alert-setting.component.html | 157 ++--
.../alert/alert-setting/alert-setting.component.ts | 76 --
.../alert-silence/alert-silence.component.html | 48 +-
.../app/routes/dashboard/dashboard.component.html | 241 +++---
.../app/routes/dashboard/dashboard.component.less | 21 +
.../app/routes/dashboard/dashboard.component.ts | 122 +--
.../monitor-data-chart.component.html | 2 +-
.../monitor-data-table.component.html | 7 +-
.../monitor-data-table.component.less | 3 +
.../monitor-data-table.component.ts | 55 +-
.../monitor-detail/monitor-detail.component.html | 7 +-
.../monitor-detail/monitor-detail.component.less | 4 +-
.../monitor-detail/monitor-detail.component.ts | 10 +-
.../monitor-edit/monitor-edit.component.html | 501 +-----------
.../monitor/monitor-edit/monitor-edit.component.ts | 161 +---
.../monitor-form/monitor-form.component.html | 143 ++++
.../monitor-form/monitor-form.component.less | 11 +
.../monitor-form/monitor-form.component.spec.ts} | 12 +-
.../monitor/monitor-form/monitor-form.component.ts | 156 ++++
.../monitor-list/monitor-list.component.html | 154 ++--
.../monitor-list/monitor-list.component.less | 11 +-
.../monitor/monitor-list/monitor-list.component.ts | 46 +-
.../monitor/monitor-new/monitor-new.component.html | 510 +------------
.../monitor/monitor-new/monitor-new.component.ts | 200 +----
web-app/src/app/routes/monitor/monitor.module.ts | 2 +
.../setting/collector/collector.component.html | 82 +-
.../routes/setting/status/status.component.html | 96 +--
.../app/routes/setting/status/status.component.ts | 25 +-
.../app/routes/setting/tags/tags.component.html | 28 +-
.../components/form-item/form-item.component.html | 286 +++++++
.../components/form-item/form-item.component.less | 0
.../form-item.component.spec.ts} | 12 +-
.../components/form-item/form-item.component.ts | 123 +++
.../multi-func-input.component.html | 9 +-
.../multi-func-input/multi-func-input.component.ts | 25 +-
.../components/toolbar/toolbar.component.less | 5 +
web-app/src/app/shared/shared.module.ts | 9 +-
web-app/src/app/shared/utils/common-util.ts | 17 +
web-app/src/assets/i18n/en-US.json | 17 +-
web-app/src/assets/i18n/zh-CN.json | 17 +-
web-app/src/assets/i18n/zh-TW.json | 17 +-
web-app/src/styles/theme.less | 6 +
131 files changed, 4355 insertions(+), 2453 deletions(-)
copy common/src/main/resources/META-INF/spring.factories =>
alerter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
(87%)
copy collector/src/main/resources/META-INF/{spring.factories =>
spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (92%)
create mode 100644
common/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java
copy common/src/main/resources/META-INF/{spring.factories =>
spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (87%)
copy
common/src/test/java/org/apache/hertzbeat/common/util/{ProtoJsonUtilTest.java
=> MapCapUtilTest.java} (64%)
create mode 100644
common/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java
create mode 100644
common/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java
copy
manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeDispatchService.java
=> common/src/test/proto/person.proto (81%)
create mode 100644 home/blog/2024-07-07-new-committer.md
create mode 100644 home/docs/help/redis_cluster.md
create mode 100644 home/docs/help/status.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-06-07-new-committer.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/redis_cluster.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/status.md
create mode 100644 home/static/img/docs/help/redis-cluster-add.png
create mode 100644 home/static/img/docs/help/redis-cluster-view.png
create mode 100644 home/static/img/docs/help/status-1.png
create mode 100644 home/static/img/docs/help/status-2.png
create mode 100644 home/static/img/docs/help/status-3.png
create mode 100644 home/static/img/docs/help/status-4.png
rename
manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/{WeWorkAppAlertNotifyHandlerImpl.java
=> WeComAppAlertNotifyHandlerImpl.java} (83%)
rename
manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/{WeWorkRobotAlertNotifyHandlerImpl.java
=> WeComRobotAlertNotifyHandlerImpl.java} (98%)
copy
warehouse/src/main/java/org/apache/hertzbeat/warehouse/listener/WareHouseApplicationReadyListener.java
=>
manager/src/main/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListener.java
(52%)
copy
manager/src/main/java/org/apache/hertzbeat/manager/config/{SchedulerConfig.java
=> JacksonConfig.java} (60%)
copy
manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/{ZhiPuRequestParamDTO.java
=> KimiAiRequestParamDTO.java} (95%)
copy
manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/{ZhiPuAiResponse.java
=> KimiAiResponse.java} (97%)
copy
manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/{ZhiPuRequestParamDTO.java
=> SparkDeskRequestParamDTO.java} (95%)
copy
manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/{ZhiPuAiResponse.java
=> SparkDeskResponse.java} (97%)
copy
manager/src/main/java/org/apache/hertzbeat/manager/service/impl/{ZhiPuServiceImpl.java
=> KimiAiServiceImpl.java} (76%)
copy
manager/src/main/java/org/apache/hertzbeat/manager/service/impl/{ZhiPuServiceImpl.java
=> SparkDeskAiServiceImpl.java} (58%)
rename
manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/{WeWorkRobotAlertNotifyHandlerImplTest.java
=> WeComRobotAlertNotifyHandlerImplTest.java} (93%)
copy common/src/main/resources/META-INF/spring.factories =>
push/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
(87%)
copy common/src/main/resources/META-INF/spring.factories =>
warehouse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
(87%)
mode change 100644 => 100755
web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
create mode 100644
web-app/src/app/routes/monitor/monitor-form/monitor-form.component.html
create mode 100644
web-app/src/app/routes/monitor/monitor-form/monitor-form.component.less
copy web-app/src/app/routes/{alert/alert-notice/alert-notice.component.spec.ts
=> monitor/monitor-form/monitor-form.component.spec.ts} (79%)
create mode 100644
web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts
mode change 100755 => 100644
web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
create mode 100644
web-app/src/app/shared/components/form-item/form-item.component.html
copy home/static/.nojekyll =>
web-app/src/app/shared/components/form-item/form-item.component.less (100%)
copy web-app/src/app/shared/components/{toolbar/toolbar.component.spec.ts =>
form-item/form-item.component.spec.ts} (80%)
mode change 100755 => 100644
create mode 100644
web-app/src/app/shared/components/form-item/form-item.component.ts
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
