This is an automated email from the ASF dual-hosted git repository.
shown pushed a change to branch 0309-yuluo/update-nacos
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 7dd898b85a feat: update nacos client to 3.1.1
add 9e1a460dc7 refactor: update to Springboot4 and Hibernate 7 (#4057)
add e271faf50c Merge branch 'master' into 0309-yuluo/update-nacos
No new revisions were added by this update.
Summary of changes:
.gitpod.Dockerfile | 4 +-
CONTRIBUTING.md | 4 +-
README.md | 2 +-
README_CN.md | 2 +-
README_JP.md | 30 +-
hertzbeat-ai/pom.xml | 7 +-
.../hertzbeat/ai/controller/ChatController.java | 2 +-
.../hertzbeat/ai/sop/registry/SkillRegistry.java | 6 +-
.../hertzbeat/ai/sop/registry/SopYamlLoader.java | 10 +-
.../ai/tools/impl/AlertDefineToolsImpl.java | 58 +-
.../apache/hertzbeat/ai/utils/UtilityClass.java | 12 +-
hertzbeat-alerter/pom.xml | 5 +
.../WindowedLogRealTimeAlertCalculator.java | 20 +-
.../calculate/realtime/window/TimeService.java | 48 +-
.../realtime/window/WindowAggregator.java | 60 +-
.../notice/impl/EmailAlertNotifyHandlerImpl.java | 15 +-
.../impl/FeiShuAppAlertNotifyHandlerImpl.java | 15 +-
.../hertzbeat/alert/service/SmsClientFactory.java | 8 +-
.../impl/AlertDefineExcelImExportServiceImpl.java | 2 +-
.../impl/AlertDefineJsonImExportServiceImpl.java | 25 +-
.../alert/service/impl/AlertDefineServiceImpl.java | 16 +-
.../impl/AlibabaCloudSlsExternAlertService.java | 4 +-
.../alert/service/impl/AlibabaSmsClientImpl.java | 8 +-
.../alert/service/impl/AwsSmsClientImpl.java | 8 +-
.../impl/HuaweiCloudExternAlertService.java | 4 +-
.../service/impl/PrometheusExternAlertService.java | 4 +-
.../service/impl/SkyWalkingExternAlertService.java | 4 +-
.../alert/service/impl/SmsLocalSmsClientImpl.java | 2 +-
.../alert/service/impl/TencentSmsClientImpl.java | 16 +-
.../alert/service/impl/TwilioSmsClientImpl.java | 2 +-
.../alert/service/impl/UniSmsClientImpl.java | 34 +-
.../service/impl/VolcEngineExternAlertService.java | 12 +-
.../impl/EmailAlertNotifyHandlerImplTest.java | 34 +-
.../AlertDefineJsonImExportServiceTest.java | 75 +--
.../alert/service/SmsClientFactoryTest.java | 8 +-
.../collector/collect/push/PushCollectImpl.java | 2 +-
.../collector/collect/sd/HttpSdCollectImpl.java | 2 +-
.../hertzbeat/collector/util/CollectUtilTest.java | 24 +-
.../hertzbeat-collector-common/pom.xml | 6 +-
.../processor/DeleteCyclicTaskProcessor.java | 4 +-
.../hertzbeat/collector/util/CollectUtil.java | 2 +-
hertzbeat-collector/pom.xml | 2 +-
hertzbeat-common-core/pom.xml | 20 +-
.../common/entity/dto/PromVectorOrMatrix.java | 29 +-
.../entity/sd/EurekaDiscoveryResponseEntity.java | 7 +-
.../serialize/KafkaLogEntryDeserializer.java | 22 +-
.../common/serialize/KafkaLogEntrySerializer.java | 20 +-
.../common/serialize/RedisLogEntryCodec.java | 30 +-
.../common/util/JexlExpressionRunner.java | 10 +-
.../org/apache/hertzbeat/common/util/JsonUtil.java | 114 ++--
.../org/apache/hertzbeat/common/util/XmlUtil.java | 77 +++
.../apache/hertzbeat/common/util/JsonUtilTest.java | 6 +-
hertzbeat-common-spring/pom.xml | 18 +-
.../common/config/EclipseLinkCustomizer.java | 68 ---
.../common/config/EclipseLinkJpaConfiguration.java | 61 --
.../common/entity/ai/ChatConversation.java | 6 +-
.../hertzbeat/common/entity/ai/ChatMessage.java | 10 +-
.../entity/alerter/JsonMapAttributeConverter.java | 2 +-
.../manager/JsonByteListAttributeConverter.java | 2 +-
.../manager/JsonLongListAttributeConverter.java | 2 +-
.../manager/JsonMapListAttributeConverter.java | 2 +-
.../manager/JsonOptionListAttributeConverter.java | 2 +-
.../manager/JsonStringListAttributeConverter.java | 2 +-
.../org/apache/hertzbeat/common/util/XmlUtil.java | 78 ---
.../collector/collect/AbstractCollectE2eTest.java | 3 +-
hertzbeat-e2e/hertzbeat-log-e2e/pom.xml | 7 +-
.../log/alert/LogPeriodicAlertE2eTest.java | 50 +-
.../log/alert/LogRealTimeAlertE2eTest.java | 20 +-
.../log/ingestion/LogIngestionE2eTest.java | 7 +-
.../log/storage/GreptimeLogStorageE2eTest.java | 47 +-
.../src/test/resources/vector.yml | 15 +-
hertzbeat-grafana/pom.xml | 5 +
.../grafana/service/DashboardService.java | 10 +-
.../grafana/service/ServiceAccountService.java | 2 +-
hertzbeat-manager/pom.xml | 10 +-
.../SurenessJakartaServletFilter.java | 147 +++++
.../component/listener/TimeZoneListener.java | 47 --
.../validator/impl/JsonParamValidator.java | 2 +-
.../manager/config/AngularErrorViewResolver.java | 2 +-
.../manager/config/ConfigInitializer.java | 29 +-
.../manager/config/FlywayConfiguration.java | 22 +-
.../hertzbeat/manager/config/JacksonConfig.java | 37 +-
.../manager/config/RestTemplateConfig.java | 39 +-
.../impl/AbstractGeneralConfigServiceImpl.java | 59 +-
.../manager/service/impl/AppServiceImpl.java | 279 ++++-----
.../service/impl/ExcelImExportServiceImpl.java | 4 +-
.../service/impl/JsonImExportServiceImpl.java | 33 +-
.../service/impl/MailGeneralConfigServiceImpl.java | 19 +-
.../impl/ModelProviderConfigServiceImpl.java | 18 +-
.../service/impl/MuteGeneralConfigServiceImpl.java | 13 +-
.../service/impl/ObjectStoreConfigServiceImpl.java | 20 +-
.../manager/service/impl/PluginServiceImpl.java | 2 +-
.../service/impl/SmsGeneralConfigServiceImpl.java | 19 +-
.../impl/SystemGeneralConfigServiceImpl.java | 22 +-
.../service/impl/SystemSecretServiceImpl.java | 18 +-
.../service/impl/TemplateConfigServiceImpl.java | 22 +-
.../manager/support/GlobalExceptionHandler.java | 4 +-
.../component/listener/TimeZoneListenerTest.java | 75 ---
.../controller/GeneralConfigControllerTest.java | 2 +-
.../controller/StatusPageControllerTest.java | 4 +-
.../manager/service/JsonImExportServiceTest.java | 68 +--
.../service/MailGeneralConfigServiceTest.java | 12 +-
.../service/ObjectStoreConfigServiceTest.java | 18 +-
.../service/SmsGeneralConfigServiceTest.java | 18 +-
.../service/SystemGeneralConfigServiceTest.java | 16 +-
.../manager/service/SystemSecretServiceTest.java | 14 +-
.../manager/service/TemplateConfigServiceTest.java | 12 +-
hertzbeat-startup/pom.xml | 14 +-
.../hertzbeat/startup/HertzBeatApplication.java | 4 +-
.../src/main/resources/application-test.yml | 9 +-
.../src/main/resources/application.yml | 17 +-
.../org/apache/hertzbeat/startup/ContextTest.java | 4 +-
.../hertzbeat/startup/dao/CollectorDaoTest.java | 2 +-
.../startup/dao/MetricsFavoriteDaoTest.java | 11 +
.../hertzbeat/startup/dao/NoticeRuleDaoTest.java | 3 +-
.../warehouse/db/GreptimeSqlQueryExecutor.java | 5 +-
.../history/tsdb/doris/DorisStreamLoadWriter.java | 2 +-
.../tsdb/greptime/GreptimeSqlQueryContent.java | 8 +-
.../tsdb/vm/VictoriaMetricsClusterDataStorage.java | 2 +-
.../warehouse/service/WarehouseServiceTest.java | 7 +-
home/docs/community/contribution.md | 2 +-
home/docs/community/development.md | 8 +-
home/docs/community/how-to-release.md | 2 +-
home/docs/download.md | 6 +-
home/docs/help/risc-v.md | 8 +-
home/docs/start/mysql-change.md | 18 +-
home/docs/start/package-deploy.md | 26 +-
home/docs/start/postgresql-change.md | 18 +-
home/docs/start/quickstart.md | 4 +-
.../current/community/contribution.md | 2 +-
.../current/community/development.md | 8 +-
.../current/community/how-to-release.md | 2 +-
.../current/download.md | 6 +-
.../current/help/risc-v.md | 8 +-
.../current/start/mysql-change.md | 18 +-
.../current/start/package-deploy.md | 37 +-
.../current/start/postgresql-change.md | 24 +-
.../current/start/quickstart.md | 4 +-
home/src/components/StructuredData.js | 2 +-
home/src/pages/faq.js | 2 +-
home/src/pages/zh-cn/faq.js | 2 +-
home/static/llms-zh.txt | 2 +-
home/static/llms.txt | 2 +-
material/licenses/LICENSE | 6 +-
material/licenses/backend/LICENSE | 5 -
material/licenses/backend/LICENSE-eclipselink.txt | 637 ---------------------
.../LICENSE-org.eclipse.persistence.asm.txt | 637 ---------------------
.../LICENSE-org.eclipse.persistence.core.txt | 637 ---------------------
.../LICENSE-org.eclipse.persistence.jpa.txt | 637 ---------------------
.../LICENSE-org.eclipse.persistence.jpql.txt | 637 ---------------------
.../backend/LICENSE-org.eclipse.persistence.txt | 637 ---------------------
.../LICENSE-org.eclipse.persistence.asm.txt | 637 ---------------------
.../LICENSE-org.eclipse.persistence.core.txt | 637 ---------------------
.../LICENSE-org.eclipse.persistence.jpa.txt | 637 ---------------------
.../LICENSE-org.eclipse.persistence.jpql.txt | 637 ---------------------
.../collector/LICENSE-org.eclipse.persistence.txt | 637 ---------------------
pom.xml | 59 +-
script/application.yml | 49 +-
script/assembly/collector/bin/startup.sh | 2 +-
script/assembly/server/bin/startup.sh | 2 +-
script/ci/github-actions/setup-deps/action.yml | 4 +-
.../hertzbeat-mysql-iotdb/conf/application.yml | 9 +-
.../hertzbeat-mysql-tdengine/conf/application.yml | 9 +-
.../conf/application.yml | 9 +-
.../conf/application.yml | 9 +-
.../conf/application.yml | 9 +-
166 files changed, 1340 insertions(+), 8606 deletions(-)
create mode 100644
hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java
delete mode 100644
hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java
delete mode 100644
hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java
delete mode 100644
hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java
create mode 100644
hertzbeat-manager/src/main/java/com/usthe/sureness/configuration/SurenessJakartaServletFilter.java
delete mode 100644
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListener.java
delete mode 100644
hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListenerTest.java
delete mode 100644 material/licenses/backend/LICENSE-eclipselink.txt
delete mode 100644
material/licenses/backend/LICENSE-org.eclipse.persistence.asm.txt
delete mode 100644
material/licenses/backend/LICENSE-org.eclipse.persistence.core.txt
delete mode 100644
material/licenses/backend/LICENSE-org.eclipse.persistence.jpa.txt
delete mode 100644
material/licenses/backend/LICENSE-org.eclipse.persistence.jpql.txt
delete mode 100644
material/licenses/backend/LICENSE-org.eclipse.persistence.txt
delete mode 100644
material/licenses/collector/LICENSE-org.eclipse.persistence.asm.txt
delete mode 100644
material/licenses/collector/LICENSE-org.eclipse.persistence.core.txt
delete mode 100644
material/licenses/collector/LICENSE-org.eclipse.persistence.jpa.txt
delete mode 100644
material/licenses/collector/LICENSE-org.eclipse.persistence.jpql.txt
delete mode 100644
material/licenses/collector/LICENSE-org.eclipse.persistence.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
