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

lynx009 pushed a change to branch feature/alibaba-cloud-monitor-integration
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git


    from 4b917e942f Merge branch 'master' into 
feature/alibaba-cloud-monitor-integration
     add 54e3154be4 [fix] bind greptime compose data-store ports to localhost 
(#4258)
     add 85dff9b36f fix(ai): handle invalid skill params and failed reports 
(#4297)
     add 6897c8720b [fix] stop jdbc connection properties injected through the 
database name (#4299)
     add 16d420a245 [fix] restrict /api/ai SOP endpoints to admin role (#4261)
     add b1a4f9630e [fix] stop exposing the jwt and aes master keys over the 
config api (#4270)
     add db72f1e402 maintenance: scope Grafana request authentication (#4288)
     add 4a4e582036 maintenance: bound alert persistence locks (#4285)
     add e6ceea94f8 maintenance: normalize Zabbix alert identity (#4284)
     add 4c9ebb7d0a maintenance: canonicalize alert label fingerprints (#4283)
     add e03e0e02e1 Generate metric scheduling intervals lazily (#4290)
     add 12463f6ab7 maintenance: derive rule-scoped notice groups (#4291)
     add 70c3966a86 Merge branch 'master' into 
feature/alibaba-cloud-monitor-integration

No new revisions were added by this update.

Summary of changes:
 .../hertzbeat/ai/tools/impl/DatabaseToolsImpl.java |  19 ++-
 .../hertzbeat/ai/tools/impl/SkillToolsImpl.java    |  14 +-
 .../ai/tools/impl/SkillToolsImplTest.java          | 124 ++++++++++++++++
 .../alert/notice/AlertNoticeDispatch.java          | 107 +++++++++++++-
 .../alert/notice/impl/DbAlertStoreHandlerImpl.java |  20 ++-
 .../service/impl/NoticeConfigServiceImpl.java      |   6 +-
 .../service/impl/ZabbixExternAlertServiceImpl.java |   1 +
 .../org/apache/hertzbeat/alert/util/AlertUtil.java |  34 +++--
 .../alert/calculate/AlarmCacheManagerTest.java     |  27 +++-
 .../alert/notice/AlertNoticeDispatchTest.java      | 162 ++++++++++++++++++++-
 .../notice/impl/DbAlertStoreHandlerImplTest.java   |  17 +++
 .../alert/reduce/AlarmCommonReduceTest.java        |  24 +++
 .../impl/ZabbixExternAlertServiceImplTest.java}    |  48 +++---
 .../apache/hertzbeat/alert/util/AlertUtilTest.java |  61 ++++++++
 .../collect/database/JdbcCommonCollect.java        |  24 +--
 .../collect/database/JdbcCommonCollectTest.java    |  23 +++
 .../apache/hertzbeat/common/entity/job/Job.java    |  76 +++++++---
 .../hertzbeat/common/util/JdbcUrlSafetyUtil.java   |  99 +++++++++++++
 .../hertzbeat/common/entity/job/JobTest.java       | 100 +++++++++++++
 .../common/util/JdbcUrlSafetyUtilTest.java         |  90 ++++++++++++
 .../src/test/resources/sureness.yml                |   4 +
 .../grafana/service/ServiceAccountService.java     |   4 -
 .../grafana/service/ServiceAccountServiceTest.java |  90 ++++++++++++
 .../controller/GeneralConfigController.java        |  21 +++
 .../controller/GeneralConfigControllerTest.java    |  14 ++
 hertzbeat-manager/src/test/resources/sureness.yml  |   4 +
 hertzbeat-startup/src/main/resources/sureness.yml  |  14 ++
 .../startup/security/SurenessConfigRuleTest.java   |  97 ++++++++++++
 .../hertzbeat-mysql-iotdb/conf/sureness.yml        |  14 ++
 .../hertzbeat-mysql-tdengine/conf/sureness.yml     |  14 ++
 .../conf/sureness.yml                              |  14 ++
 .../conf/sureness.yml                              |  14 ++
 .../docker-compose.yaml                            |  16 +-
 .../conf/sureness.yml                              |  14 ++
 script/sureness.yml                                |  14 ++
 35 files changed, 1337 insertions(+), 87 deletions(-)
 create mode 100644 
hertzbeat-ai/src/test/java/org/apache/hertzbeat/ai/tools/impl/SkillToolsImplTest.java
 copy 
hertzbeat-alerter/src/{main/java/org/apache/hertzbeat/alert/service/impl/ZabbixExternAlertServiceImpl.java
 => 
test/java/org/apache/hertzbeat/alert/service/impl/ZabbixExternAlertServiceImplTest.java}
 (50%)
 create mode 100644 
hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/util/AlertUtilTest.java
 create mode 100644 
hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JdbcUrlSafetyUtil.java
 create mode 100644 
hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/job/JobTest.java
 create mode 100644 
hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JdbcUrlSafetyUtilTest.java
 create mode 100644 
hertzbeat-grafana/src/test/java/org/apache/hertzbeat/grafana/service/ServiceAccountServiceTest.java
 create mode 100644 
hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/security/SurenessConfigRuleTest.java


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

Reply via email to