This is an automated email from the ASF dual-hosted git repository.
Duansg pushed a change to branch fix/008-questdb-sql-injection
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 358fbc0c28 Merge branch 'master' into fix/008-questdb-sql-injection
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 76d28add2e maintenance: bound SMS client failure details (#4282)
add bf3bb4fa45 Define bulletin write fields explicitly (#4292)
add 7eb4b1cd44 maintenance: preserve metric string values (#4287)
add df843942cc fix(ai): improve SOP schedule error handling (#4301)
add e3cb203d37 [fix] restore dropped rbac rule for single monitor deletion
(#4269)
add c4b4e859e6 docs(help): add alert notification overview page (#4300)
add 06078adc60 [fix] stop silent SSL-to-plaintext downgrade in R2DBC MySQL
route (#4260)
add 1a7b45ec26 [fix] restrict monitoring template writes to admin (#4278)
add 4566f62de3 [fix] restrict the actuator endpoints to admin (#4277)
add a5496d6804 [fix] validate the metric history query inputs (#4274)
add 68ecb7118b [fix] add missing alert.setting.window i18n keys for
non-zh-CN locales (#4298)
add fd8056b066 [fix] keep zero-row metrics data in redis queue codec
(#4305)
add 3a73a34daf Merge branch 'master' into fix/008-questdb-sql-injection
No new revisions were added by this update.
Summary of changes:
.../hertzbeat/ai/controller/SopController.java | 3 +-
.../hertzbeat/ai/schedule/SopScheduleExecutor.java | 5 +-
.../ai/service/impl/SopScheduleServiceImpl.java | 15 +-
.../hertzbeat/ai/tools/impl/DatabaseToolsImpl.java | 19 +-
.../hertzbeat/ai/tools/impl/SkillToolsImpl.java | 14 +-
.../hertzbeat/ai/controller/SopControllerTest.java | 61 +++++
.../ai/schedule/SopScheduleExecutorTest.java | 17 ++
.../service/impl/SopScheduleServiceImplTest.java | 58 ++++
.../ai/tools/impl/SkillToolsImplTest.java | 124 +++++++++
.../alert/notice/AlertNoticeDispatch.java | 107 +++++++-
.../alert/notice/impl/DbAlertStoreHandlerImpl.java | 20 +-
.../alert/service/impl/AlibabaSmsClientImpl.java | 30 ++-
.../alert/service/impl/AwsSmsClientImpl.java | 27 +-
.../service/impl/NoticeConfigServiceImpl.java | 6 +-
.../alert/service/impl/SmsFailureMessages.java | 55 ++++
.../alert/service/impl/SmsLocalSmsClientImpl.java | 34 ++-
.../alert/service/impl/TencentSmsClientImpl.java | 47 ++--
.../alert/service/impl/TwilioSmsClientImpl.java | 37 ++-
.../alert/service/impl/UniSmsClientImpl.java | 25 +-
.../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 ++
.../alert/service/impl/SmsClientLoggingTest.java | 300 +++++++++++++++++++++
.../impl/ZabbixExternAlertServiceImplTest.java} | 48 ++--
.../apache/hertzbeat/alert/util/AlertUtilTest.java | 61 +++++
.../collect/database/JdbcCommonCollect.java | 24 +-
.../collect/database/JdbcCommonCollectTest.java | 23 ++
.../mysql/r2dbc/MysqlR2dbcQueryExecutor.java | 33 +--
.../apache/hertzbeat/common/entity/job/Job.java | 76 ++++--
.../common/entity/message/CollectRep.java | 9 +-
.../common/serialize/RedisMetricsDataCodec.java | 8 +-
.../hertzbeat/common/util/JdbcUrlSafetyUtil.java | 99 +++++++
.../hertzbeat/common/entity/job/JobTest.java | 100 +++++++
.../common/entity/message/CollectRepTest.java | 43 +++
.../serialize/KafkaMetricsDataSerializerTest.java | 25 ++
.../serialize/RedisMetricsDataCodecTest.java | 104 +++++++
.../common/util/JdbcUrlSafetyUtilTest.java | 90 +++++++
.../hertzbeat/common/entity/manager/Bulletin.java | 16 +-
.../src/test/resources/sureness.yml | 12 +-
.../grafana/service/ServiceAccountService.java | 4 -
.../grafana/service/ServiceAccountServiceTest.java | 90 +++++++
.../manager/controller/BulletinController.java | 4 +-
.../controller/GeneralConfigController.java | 21 ++
.../hertzbeat/manager/service/BulletinService.java | 2 +-
.../manager/service/impl/BulletinServiceImpl.java | 22 +-
.../manager/controller/BulletinControllerTest.java | 8 +-
.../controller/GeneralConfigControllerTest.java | 14 +
.../manager/service/BulletinServiceTest.java | 85 +++++-
hertzbeat-manager/src/test/resources/sureness.yml | 12 +-
hertzbeat-startup/src/main/resources/sureness.yml | 24 +-
.../startup/security/SurenessActuatorRuleTest.java | 86 ++++++
.../startup/security/SurenessConfigRuleTest.java | 97 +++++++
.../startup/security/SurenessResourceRuleTest.java | 227 ++++++++++++++++
.../service/impl/MetricsDataServiceImpl.java | 57 ++++
.../service/impl/MetricsDataServiceImplTest.java | 150 +++++++++++
home/docs/help/guide.md | 10 +-
.../current/start/mysql-change.md | 2 +-
.../current/start/postgresql-change.md | 2 +-
.../hertzbeat-mysql-iotdb/conf/sureness.yml | 24 +-
.../hertzbeat-mysql-tdengine/conf/sureness.yml | 24 +-
.../conf/sureness.yml | 24 +-
.../conf/sureness.yml | 24 +-
.../docker-compose.yaml | 16 +-
.../conf/sureness.yml | 24 +-
script/sureness.yml | 22 ++
web-app/src/assets/i18n/en-US.json | 3 +
web-app/src/assets/i18n/ja-JP.json | 3 +
web-app/src/assets/i18n/ko-KR.json | 3 +
web-app/src/assets/i18n/pt-BR.json | 3 +
web-app/src/assets/i18n/zh-TW.json | 3 +
73 files changed, 2883 insertions(+), 247 deletions(-)
create mode 100644
hertzbeat-ai/src/test/java/org/apache/hertzbeat/ai/controller/SopControllerTest.java
create mode 100644
hertzbeat-ai/src/test/java/org/apache/hertzbeat/ai/service/impl/SopScheduleServiceImplTest.java
create mode 100644
hertzbeat-ai/src/test/java/org/apache/hertzbeat/ai/tools/impl/SkillToolsImplTest.java
create mode 100644
hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SmsFailureMessages.java
create mode 100644
hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/impl/SmsClientLoggingTest.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/serialize/RedisMetricsDataCodecTest.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/SurenessActuatorRuleTest.java
create mode 100644
hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/security/SurenessConfigRuleTest.java
create mode 100644
hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/security/SurenessResourceRuleTest.java
create mode 100644
hertzbeat-warehouse/src/test/java/org/apache/hertzbeat/warehouse/service/impl/MetricsDataServiceImplTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
