This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a change to branch remove-hibernate
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 67de69556 Update
common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java
add 12e45a703 [doc] add help documentation for clickhouse monitoring
(#1798)
add 38fb15177 [feature] update-checkstyle limit the java file header
(#1799)
add 0d17a4716 [improve] add external lib folder to store mysql and oracle
driver. (#1783)
add 5e155e0d4 [improve] when multiple lines are returned, each alarm is
triggered instead of only the first alarm (#1797)
add 3eb1e1999 [doc] add team page in website (#1800)
add 6f942bc60 [feature] Improve the import checkstyle (#1802)
add 42fff48e2 [doc] add help document for dns monitoring (#1804)
add 16cec10fa [improve] preventing NPE (#1808)
add b5111750f Merge branch 'master' into remove-hibernate
No new revisions were added by this update.
Summary of changes:
.../apache/hertzbeat/alert/AlerterWorkerPool.java | 5 +-
.../hertzbeat/alert/calculate/CalculateAlarm.java | 41 +++--
.../alert/controller/AlertConvergeController.java | 16 +-
.../alert/controller/AlertConvergesController.java | 20 +--
.../alert/controller/AlertDefineController.java | 21 ++-
.../alert/controller/AlertDefinesController.java | 29 ++--
.../alert/controller/AlertReportController.java | 14 +-
.../alert/controller/AlertSilenceController.java | 17 ++-
.../alert/controller/AlertSilencesController.java | 20 +--
.../alert/controller/AlertsController.java | 30 ++--
.../hertzbeat/alert/dao/AlertConvergeDao.java | 3 +-
.../org/apache/hertzbeat/alert/dao/AlertDao.java | 5 +-
.../hertzbeat/alert/dao/AlertDefineBindDao.java | 5 +-
.../apache/hertzbeat/alert/dao/AlertDefineDao.java | 5 +-
.../hertzbeat/alert/dao/AlertMonitorDao.java | 3 +-
.../hertzbeat/alert/dao/AlertSilenceDao.java | 3 +-
.../apache/hertzbeat/alert/dto/AlertSummary.java | 3 +-
.../alert/dto/CloudAlertReportAbstract.java | 3 +-
.../alert/dto/GeneralCloudAlertReport.java | 5 +-
.../hertzbeat/alert/dto/TenCloudAlertReport.java | 5 +-
.../enums/CloudServiceAlarmInformationEnum.java | 3 +-
.../hertzbeat/alert/reduce/AlarmCommonReduce.java | 7 +-
.../alert/reduce/AlarmConvergeReduce.java | 11 +-
.../hertzbeat/alert/reduce/AlarmSilenceReduce.java | 11 +-
.../alert/service/AlertConvergeService.java | 3 +-
.../alert/service/AlertDefineService.java | 9 +-
.../hertzbeat/alert/service/AlertService.java | 5 +-
.../alert/service/AlertSilenceService.java | 3 +-
.../service/impl/AlertConvergeServiceImpl.java | 3 +-
.../AlertDefineAbstractImExportServiceImpl.java | 13 +-
.../impl/AlertDefineExcelImExportServiceImpl.java | 21 ++-
.../impl/AlertDefineJsonImExportServiceImpl.java | 7 +-
.../alert/service/impl/AlertDefineServiceImpl.java | 20 ++-
.../impl/AlertDefineYamlImExportServiceImpl.java | 9 +-
.../alert/service/impl/AlertServiceImpl.java | 25 ++--
.../service/impl/AlertSilenceServiceImpl.java | 5 +-
.../hertzbeat/alert/util/AlertTemplateUtil.java | 3 +-
.../org/apache/hertzbeat/alert/util/DateUtil.java | 3 +-
.../org/apache/hertzbeat/collector/Collector.java | 3 +-
.../collect/common/cache/CacheIdentifier.java | 2 +-
.../common/cache/ConnectionCommonCache.java | 10 +-
.../collect/common/cache/JdbcConnect.java | 3 +-
.../collector/collect/common/cache/JmxConnect.java | 3 +-
.../collect/common/http/CommonHttpClient.java | 23 ++-
.../collect/database/JdbcCommonCollect.java | 23 ++-
.../collector/collect/dns/DnsCollectImpl.java | 17 +--
.../collector/collect/ftp/FtpCollectImpl.java | 15 +-
.../collector/collect/http/HttpCollectImpl.java | 46 +++---
.../collect/http/SslCertificateCollectImpl.java | 30 ++--
.../http/promethus/AbstractPrometheusParse.java | 3 +-
.../http/promethus/PrometheusLastParser.java | 9 +-
.../http/promethus/PrometheusMatrixParser.java | 9 +-
.../http/promethus/PrometheusVectorParser.java | 9 +-
.../http/promethus/exporter/ExporterParser.java | 9 +-
.../http/promethus/exporter/MetricFamily.java | 5 +-
.../collector/collect/httpsd/HttpsdImpl.java | 7 +-
.../httpsd/constant/DiscoveryClientInstance.java | 3 +-
.../collect/httpsd/discovery/DiscoveryClient.java | 3 +-
.../discovery/DiscoveryClientManagement.java | 5 +-
.../discovery/impl/ConsulDiscoveryClient.java | 7 +-
.../discovery/impl/NacosDiscoveryClient.java | 7 +-
.../collector/collect/icmp/IcmpCollectImpl.java | 13 +-
.../collector/collect/jmx/JmxCollectImpl.java | 43 ++++--
.../collect/memcached/MemcachedCollectImpl.java | 19 ++-
.../collect/mongodb/MongodbSingleCollectImpl.java | 16 +-
.../collector/collect/mq/RocketmqCollectData.java | 3 +-
.../collect/mq/RocketmqSingleCollectImpl.java | 43 +++---
.../nebulagraph/NebulaGraphCollectImpl.java | 35 +++--
.../collector/collect/nginx/NginxCollectImpl.java | 40 +++--
.../collector/collect/ntp/NtpCollectImpl.java | 23 ++-
.../collector/collect/pop3/Pop3CollectImpl.java | 22 ++-
.../prometheus/PrometheusAutoCollectImpl.java | 44 +++---
.../collect/prometheus/parser/MetricFamily.java | 3 +-
.../collect/prometheus/parser/TextParser.java | 7 +-
.../collector/collect/push/PushCollectImpl.java | 31 ++--
.../collect/redis/RedisCommonCollectImpl.java | 36 +++--
.../collector/collect/smtp/SmtpCollectImpl.java | 17 +--
.../collector/collect/snmp/SnmpCollectImpl.java | 45 ++++--
.../collector/collect/ssh/SshCollectImpl.java | 45 +++---
.../collect/strategy/CollectStrategyFactory.java | 5 +-
.../collect/telnet/TelnetCollectImpl.java | 23 +--
.../collector/collect/udp/UdpCollectImpl.java | 12 +-
.../collect/websocket/WebsocketCollectImpl.java | 21 ++-
.../collector/dispatch/CollectDataDispatch.java | 3 +-
.../collector/dispatch/CommonDispatcher.java | 17 ++-
.../collector/dispatch/MetricsCollect.java | 16 +-
.../collector/dispatch/MetricsCollectorQueue.java | 5 +-
.../hertzbeat/collector/dispatch/WorkerPool.java | 7 +-
.../collector/dispatch/entrance/CollectServer.java | 21 +--
.../entrance/internal/CollectJobService.java | 13 +-
.../internal/CollectResponseEventListener.java | 3 +-
.../processor/DeleteCyclicTaskProcessor.java | 3 +-
.../collector/dispatch/timer/HashedWheelTimer.java | 7 +-
.../collector/dispatch/timer/TimerDispatch.java | 5 +-
.../collector/dispatch/timer/TimerDispatcher.java | 11 +-
.../collector/dispatch/timer/WheelTimerTask.java | 9 +-
.../dispatch/unit/impl/DataSizeConvert.java | 5 +-
.../dispatch/unit/impl/TimeLengthConvert.java | 5 +-
.../hertzbeat/collector/util/CollectUtil.java | 20 ++-
.../hertzbeat/collector/util/JsonPathParser.java | 11 +-
.../hertzbeat/collector/util/PrivateKeyUtils.java | 5 +-
.../collect/redis/RedisClusterCollectImplTest.java | 5 +-
.../common/cache/CaffeineCacheServiceImpl.java | 2 +-
.../common/config/AviatorConfiguration.java | 6 +-
.../hertzbeat/common/entity/alerter/Alert.java | 28 ++--
.../common/entity/alerter/AlertConverge.java | 22 ++-
.../common/entity/alerter/AlertDefine.java | 24 +--
.../entity/alerter/AlertDefineMonitorBind.java | 23 ++-
.../common/entity/alerter/AlertSilence.java | 21 ++-
.../entity/alerter/JsonMapAttributeConverter.java | 2 +-
.../hertzbeat/common/entity/dto/AlertReport.java | 5 +-
.../hertzbeat/common/entity/dto/CollectorInfo.java | 2 +-
.../hertzbeat/common/entity/dto/MetricsData.java | 2 +-
.../common/entity/dto/MetricsHistoryData.java | 4 +-
.../common/entity/dto/PromVectorOrMatrix.java | 10 +-
.../hertzbeat/common/entity/dto/ValueRow.java | 4 +-
.../apache/hertzbeat/common/entity/job/Job.java | 13 +-
.../hertzbeat/common/entity/job/Metrics.java | 36 ++++-
.../common/entity/job/protocol/HttpProtocol.java | 5 +-
.../common/entity/job/protocol/NginxProtocol.java | 2 +-
.../entity/job/protocol/PrometheusProtocol.java | 3 +-
.../common/entity/job/protocol/PushProtocol.java | 3 +-
.../common/entity/job/protocol/SnmpProtocol.java | 3 +-
.../hertzbeat/common/entity/manager/Collector.java | 19 ++-
.../entity/manager/CollectorMonitorBind.java | 19 ++-
.../common/entity/manager/GeneralConfig.java | 17 ++-
.../manager/JsonByteListAttributeConverter.java | 2 +-
.../manager/JsonOptionListAttributeConverter.java | 3 +-
.../manager/JsonStringListAttributeConverter.java | 2 -
.../manager/JsonTagListAttributeConverter.java | 3 +-
.../hertzbeat/common/entity/manager/Monitor.java | 26 +++-
.../common/entity/manager/NoticeReceiver.java | 20 ++-
.../common/entity/manager/NoticeRule.java | 22 ++-
.../common/entity/manager/NoticeTemplate.java | 23 +--
.../hertzbeat/common/entity/manager/Param.java | 22 ++-
.../common/entity/manager/ParamDefine.java | 23 +--
.../common/entity/manager/StatusPageComponent.java | 13 +-
.../common/entity/manager/StatusPageHistory.java | 13 +-
.../common/entity/manager/StatusPageIncident.java | 24 ++-
.../manager/StatusPageIncidentComponentBind.java | 13 +-
.../entity/manager/StatusPageIncidentContent.java | 13 +-
.../common/entity/manager/StatusPageOrg.java | 13 +-
.../hertzbeat/common/entity/manager/Tag.java | 23 +--
.../hertzbeat/common/entity/manager/TagItem.java | 3 +-
.../common/entity/manager/TagMonitorBind.java | 16 +-
.../hertzbeat/common/entity/push/PushMetrics.java | 9 +-
.../common/entity/push/PushMetricsDto.java | 7 +-
.../hertzbeat/common/entity/warehouse/History.java | 14 +-
.../common/queue/impl/InMemoryCommonDataQueue.java | 11 +-
.../common/queue/impl/KafkaCommonDataQueue.java | 13 +-
.../common/serialize/AlertDeserializer.java | 5 +-
.../common/serialize/AlertSerializer.java | 7 +-
.../serialize/KafkaMetricsDataDeserializer.java | 5 +-
.../serialize/KafkaMetricsDataSerializer.java | 5 +-
.../hertzbeat/common/service/AliYunSmsClient.java | 9 +-
.../hertzbeat/common/service/TencentSmsClient.java | 4 +-
.../hertzbeat/common/support/CommonThreadPool.java | 7 +-
.../common/support/ResourceBundleUtf8Control.java | 3 +-
.../common/support/valid/EmailParamValidator.java | 3 +-
.../hertzbeat/common/support/valid/EmailValid.java | 7 +-
.../common/support/valid/HostParamValidator.java | 3 +-
.../hertzbeat/common/support/valid/HostValid.java | 7 +-
.../support/valid/PhoneNumParamValidator.java | 3 +-
.../common/support/valid/PhoneNumValid.java | 7 +-
.../org/apache/hertzbeat/common/util/AesUtil.java | 10 +-
.../apache/hertzbeat/common/util/CommonUtil.java | 6 +-
.../apache/hertzbeat/common/util/IpDomainUtil.java | 8 +-
.../org/apache/hertzbeat/common/util/JsonUtil.java | 2 +-
.../hertzbeat/common/util/ResourceBundleUtil.java | 5 +-
.../common/util/SnowFlakeIdGenerator.java | 6 +
.../hertzbeat/common/util/SnowFlakeIdWorker.java | 2 +-
.../hertzbeat/common/util/prometheus/Metric.java | 2 +-
.../docs/community/code-style-and-quality-guide.md | 15 ++
home/docs/help/clickhouse.md | 73 +++++++++
home/docs/help/dns.md | 69 +++++++++
home/docs/help/guide.md | 4 +
home/docusaurus.config.js | 5 +
.../community/code-style-and-quality-guide.md | 15 ++
.../current/help/clickhouse.md | 73 +++++++++
.../current/help/dns.md | 68 +++++++++
.../current/help/guide.md | 5 +
home/sidebars.json | 6 +-
.../2024-04-17-to-apache.md => team/team.md} | 166 ++++++++++-----------
manager/pom.xml | 1 -
.../java/org/apache/hertzbeat/manager/Manager.java | 3 +-
.../manager/component/alerter/DispatcherAlarm.java | 7 +-
.../impl/AbstractAlertNotifyHandlerImpl.java | 19 ++-
.../alerter/impl/AliYunAlertNotifyHandlerImpl.java | 3 +-
.../alerter/impl/DbAlertStoreHandlerImpl.java | 5 +-
.../impl/DingTalkRobotAlertNotifyHandlerImpl.java | 6 +-
.../impl/DiscordBotAlertNotifyHandlerImpl.java | 3 +-
.../alerter/impl/EmailAlertNotifyHandlerImpl.java | 11 +-
.../impl/FlyBookAlertNotifyHandlerImpl.java | 11 +-
.../alerter/impl/GotifyAlertNotifyHandlerImpl.java | 6 +-
.../impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java | 7 +-
.../impl/ServerChanAlertNotifyHandlerImpl.java | 6 +-
.../alerter/impl/SlackAlertNotifyHandlerImpl.java | 3 +-
.../alerter/impl/SmsAlertNotifyHandlerImpl.java | 3 +-
.../impl/TelegramBotAlertNotifyHandlerImpl.java | 6 +-
.../alerter/impl/WeChatAlertNotifyHandlerImpl.java | 12 +-
.../impl/WeWorkAppAlertNotifyHandlerImpl.java | 9 +-
.../impl/WeWorkRobotAlertNotifyHandlerImpl.java | 12 +-
.../impl/WebHookAlertNotifyHandlerImpl.java | 5 +-
.../manager/component/status/CalculateStatus.java | 37 +++--
.../manager/config/AngularErrorViewResolver.java | 10 +-
.../manager/config/CommonCommandLineRunner.java | 9 +-
.../manager/config/HeaderRequestInterceptor.java | 3 +-
.../hertzbeat/manager/config/JpaAuditorConfig.java | 3 +-
.../manager/config/RestTemplateConfig.java | 5 +-
.../manager/config/SecurityCorsConfiguration.java | 3 +-
.../manager/controller/AccountController.java | 23 +--
.../manager/controller/AppController.java | 22 ++-
.../manager/controller/CollectorController.java | 24 +--
.../controller/GeneralConfigController.java | 21 +--
.../manager/controller/I18nController.java | 8 +-
.../manager/controller/MetricsController.java | 12 +-
.../manager/controller/MonitorController.java | 19 ++-
.../manager/controller/MonitorsController.java | 28 ++--
.../manager/controller/NoticeConfigController.java | 24 +--
.../manager/controller/StatusPageController.java | 17 ++-
.../controller/StatusPagePublicController.java | 11 +-
.../manager/controller/SummaryController.java | 8 +-
.../manager/controller/TagController.java | 27 ++--
.../apache/hertzbeat/manager/dao/CollectorDao.java | 3 +-
.../manager/dao/CollectorMonitorBindDao.java | 7 +-
.../apache/hertzbeat/manager/dao/MonitorDao.java | 9 +-
.../hertzbeat/manager/dao/NoticeRuleDao.java | 3 +-
.../org/apache/hertzbeat/manager/dao/ParamDao.java | 5 +-
.../hertzbeat/manager/dao/ParamDefineDao.java | 3 +-
.../manager/dao/StatusPageComponentDao.java | 3 +-
.../manager/dao/StatusPageHistoryDao.java | 3 +-
.../org/apache/hertzbeat/manager/dao/TagDao.java | 7 +-
.../hertzbeat/manager/dao/TagMonitorBindDao.java | 3 +-
.../nativex/HertzbeatRuntimeHintsRegistrar.java | 5 +-
.../manager/pojo/dto/ComponentStatus.java | 3 +-
.../hertzbeat/manager/pojo/dto/Dashboard.java | 3 +-
.../manager/pojo/dto/EmailNoticeSender.java | 7 +-
.../apache/hertzbeat/manager/pojo/dto/FileDTO.java | 3 +-
.../hertzbeat/manager/pojo/dto/Hierarchy.java | 6 +-
.../hertzbeat/manager/pojo/dto/LoginDto.java | 6 +-
.../manager/pojo/dto/MonitorDefineDto.java | 6 +-
.../hertzbeat/manager/pojo/dto/MonitorDto.java | 12 +-
.../pojo/dto/ObjectStoreConfigChangeEvent.java | 3 +-
.../hertzbeat/manager/pojo/dto/ParamDefineDto.java | 5 +-
.../hertzbeat/manager/pojo/dto/TemplateConfig.java | 3 +-
.../hertzbeat/manager/scheduler/AssignJobs.java | 5 +-
.../manager/scheduler/CollectJobScheduling.java | 3 +-
.../scheduler/CollectorAndJobScheduler.java | 25 ++--
.../manager/scheduler/ConsistentHash.java | 14 +-
.../hertzbeat/manager/scheduler/SchedulerInit.java | 13 +-
.../manager/scheduler/netty/ManageServer.java | 11 +-
.../CollectOneTimeDataResponseProcessor.java | 5 +-
.../hertzbeat/manager/service/AppService.java | 7 +-
.../manager/service/AvailableAlertDefineInit.java | 7 +-
.../manager/service/CollectorService.java | 3 +-
.../hertzbeat/manager/service/MailService.java | 3 +-
.../hertzbeat/manager/service/MonitorService.java | 9 +-
.../manager/service/NoticeConfigService.java | 5 +-
.../manager/service/ObjectStoreService.java | 5 +-
.../manager/service/StatusPageService.java | 3 +-
.../hertzbeat/manager/service/TagService.java | 7 +-
.../service/impl/AbstractImExportServiceImpl.java | 24 +--
.../manager/service/impl/AppServiceImpl.java | 29 ++--
.../manager/service/impl/CollectorServiceImpl.java | 5 +-
.../service/impl/ExcelImExportServiceImpl.java | 25 +++-
.../service/impl/JsonImExportServiceImpl.java | 7 +-
.../service/impl/MailGeneralConfigServiceImpl.java | 3 +-
.../manager/service/impl/MailServiceImpl.java | 21 ++-
.../manager/service/impl/MonitorServiceImpl.java | 38 +++--
.../service/impl/NoticeConfigServiceImpl.java | 20 ++-
.../service/impl/ObjectStoreConfigServiceImpl.java | 5 +-
.../service/impl/ObsObjectStoreServiceImpl.java | 9 +-
.../service/impl/StatusPageServiceImpl.java | 15 +-
.../impl/SystemGeneralConfigServiceImpl.java | 9 +-
.../manager/service/impl/TagServiceImpl.java | 13 +-
.../service/impl/TemplateConfigServiceImpl.java | 5 +-
.../service/impl/YamlImExportServiceImpl.java | 9 +-
.../manager/support/GlobalExceptionHandler.java | 13 +-
.../hertzbeat/push/controller/PushController.java | 10 +-
.../push/controller/PushGatewayController.java | 5 +-
.../hertzbeat/push/service/PushGatewayService.java | 3 +-
.../apache/hertzbeat/push/service/PushService.java | 2 +-
.../push/service/impl/PushGatewayServiceImpl.java | 7 +-
.../push/service/impl/PushServiceImpl.java | 9 +-
.../apache/hertzbeat/remoting/RemotingClient.java | 6 +-
.../apache/hertzbeat/remoting/RemotingServer.java | 9 +-
.../remoting/netty/NettyRemotingAbstract.java | 7 +-
.../remoting/netty/NettyRemotingClient.java | 3 +-
.../remoting/netty/NettyRemotingServer.java | 5 +-
.../hertzbeat/remoting/netty/ResponseFuture.java | 3 +-
script/assembly/collector/assembly-linux-amd64.xml | 9 ++
script/assembly/collector/assembly-linux-arm64.xml | 9 ++
script/assembly/collector/assembly-macos-amd64.xml | 9 ++
script/assembly/collector/assembly-macos-arm64.xml | 9 ++
script/assembly/collector/assembly-windows-64.xml | 9 ++
script/assembly/collector/assembly.xml | 10 +-
script/assembly/collector/bin/entrypoint.sh | 6 +-
script/assembly/collector/bin/startup.bat | 8 +-
script/assembly/collector/bin/startup.sh | 8 +-
script/assembly/server/assembly-linux-amd64.xml | 9 ++
script/assembly/server/assembly-linux-arm64.xml | 9 ++
script/assembly/server/assembly-macos-amd64.xml | 9 ++
script/assembly/server/assembly-macos-arm64.xml | 9 ++
script/assembly/server/assembly-windows-64.xml | 9 ++
script/assembly/server/assembly.xml | 9 ++
script/assembly/server/bin/entrypoint.sh | 6 +-
script/assembly/server/bin/startup.bat | 8 +-
script/assembly/server/bin/startup.sh | 10 +-
script/checkstyle/checkstyle.xml | 50 ++++++-
.../spring.factories => script/ext-lib/README | 7 +-
.../hertzbeat/warehouse/WarehouseWorkerPool.java | 5 +-
.../warehouse/config/WarehouseProperties.java | 5 +-
.../controller/MetricsDataController.java | 24 ++-
.../warehouse/service/WarehouseService.java | 3 +-
.../warehouse/service/WarehouseServiceImpl.java | 5 +-
.../store/AbstractHistoryDataStorage.java | 7 +-
.../store/AbstractRealTimeDataStorage.java | 5 +-
.../warehouse/store/DataStorageDispatch.java | 5 +-
.../store/HistoryGrepTimeDbDataStorage.java | 42 ++++--
.../store/HistoryInfluxdbDataStorage.java | 27 ++--
.../warehouse/store/HistoryIotDbDataStorage.java | 15 +-
.../store/HistoryJpaDatabaseDataStorage.java | 27 ++--
.../store/HistoryTdEngineDataStorage.java | 25 ++--
.../store/HistoryVictoriaMetricsDataStorage.java | 30 ++--
.../warehouse/store/MetricsDataRedisCodec.java | 5 +-
.../warehouse/store/RealTimeMemoryDataStorage.java | 11 +-
.../warehouse/store/RealTimeRedisDataStorage.java | 15 +-
327 files changed, 2412 insertions(+), 1663 deletions(-)
create mode 100644 home/docs/help/clickhouse.md
create mode 100644 home/docs/help/dns.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/clickhouse.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/dns.md
copy home/{i18n/zh-cn/docusaurus-plugin-content-blog/2024-04-17-to-apache.md
=> team/team.md} (92%)
copy common/src/main/resources/META-INF/spring.factories =>
script/ext-lib/README (86%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
